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 /common/inheritance | |
| parent | 2b03a8fa879bd583c889b101f567927a959cdc0f (diff) | |
Handle --database option directly in automake and VC++ projects
Diffstat (limited to 'common/inheritance')
| -rw-r--r-- | common/inheritance/polymorphism/makefile | 7 | ||||
| -rw-r--r-- | common/inheritance/reuse/makefile | 7 | ||||
| -rw-r--r-- | common/inheritance/transient/makefile | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/common/inheritance/polymorphism/makefile b/common/inheritance/polymorphism/makefile index 2be6810..d7a8e2f 100644 --- a/common/inheritance/polymorphism/makefile +++ b/common/inheritance/polymorphism/makefile @@ -36,11 +36,13 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ ---generate-query --generate-prepared --table-prefix inhrt_p_ +$(gen) $(dist): export odb_options += --generate-schema --generate-query \ +--generate-prepared --table-prefix inhrt_p_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -51,7 +53,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std diff --git a/common/inheritance/reuse/makefile b/common/inheritance/reuse/makefile index f116b0d..874d48b 100644 --- a/common/inheritance/reuse/makefile +++ b/common/inheritance/reuse/makefile @@ -34,11 +34,13 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ ---generate-query --table-prefix inhrt_r_ +$(gen) $(dist): export odb_options += --generate-schema --generate-query \ +--table-prefix inhrt_r_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -49,7 +51,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std diff --git a/common/inheritance/transient/makefile b/common/inheritance/transient/makefile index 65b1afa..f20894e 100644 --- a/common/inheritance/transient/makefile +++ b/common/inheritance/transient/makefile @@ -34,11 +34,13 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ ---generate-query --table-prefix inhrt_t_ +$(gen) $(dist): export odb_options += --generate-schema --generate-query \ +--table-prefix inhrt_t_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -49,7 +51,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std |