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/circular | |
| parent | 2b03a8fa879bd583c889b101f567927a959cdc0f (diff) | |
Handle --database option directly in automake and VC++ projects
Diffstat (limited to 'common/circular')
| -rw-r--r-- | common/circular/multiple/makefile | 7 | ||||
| -rw-r--r-- | common/circular/single/makefile | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/common/circular/multiple/makefile b/common/circular/multiple/makefile index 026d6db..92784d1 100644 --- a/common/circular/multiple/makefile +++ b/common/circular/multiple/makefile @@ -34,8 +34,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ ---schema-format embedded --generate-query --table-prefix circular_m_ +$(gen) $(dist): export odb_options += --generate-schema --generate-query \ +--schema-format embedded --table-prefix circular_m_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) @@ -43,6 +43,8 @@ $(gen): $(common.l.cpp-options) # $(gen): $(addprefix $(src_base)/,$(odb_hdr)) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -53,7 +55,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/circular/single/makefile b/common/circular/single/makefile index e5f645e..1708b6c 100644 --- a/common/circular/single/makefile +++ b/common/circular/single/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 circular_s_ +$(gen) $(dist): export odb_options += --generate-schema --generate-query \ +--table-prefix circular_s_ $(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 |