diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-13 21:57:07 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-13 21:57:07 +0200 |
commit | 236cd9bb1dd022e64d690c9b0080d1a15c5f61c7 (patch) | |
tree | 2bcb891a85a64b2a4dfb7be457ea0bbbf519ccb9 /qt/common/containers/basics/makefile | |
parent | 2b03a8fa879bd583c889b101f567927a959cdc0f (diff) |
Handle --database option directly in automake and VC++ projects
Diffstat (limited to 'qt/common/containers/basics/makefile')
-rw-r--r-- | qt/common/containers/basics/makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qt/common/containers/basics/makefile b/qt/common/containers/basics/makefile index a992a2f..a14a29f 100644 --- a/qt/common/containers/basics/makefile +++ b/qt/common/containers/basics/makefile @@ -43,13 +43,14 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) \ ---profile qt/containers --profile qt/basic --generate-schema \ ---table-prefix qt_cont_bs_ +$(gen) $(dist): export odb_options += --generate-schema \ +--profile qt/containers --profile qt/basic --table-prefix qt_cont_bs_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \ $(qt_core.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -60,7 +61,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/qt/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std |