diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-13 21:52:14 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-13 21:52:14 +0200 |
| commit | 91f45e1948c2bfdd9083a0fd22c6ed6d49e7fed0 (patch) | |
| tree | cae5f21d55adf9c48d4f6eeac248f0a5a6f19307 /c++11 | |
| parent | aaf4c660e0882566a2855a634c39ffe6f8816ece (diff) | |
Handle --database option directly in automake and VC++ projects
Diffstat (limited to 'c++11')
| -rw-r--r-- | c++11/makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/c++11/makefile b/c++11/makefile index a68032d..c2c59ab 100644 --- a/c++11/makefile +++ b/c++11/makefile @@ -58,8 +58,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) \ ---generate-query --generate-schema --table-prefix boost_ +$(gen) $(dist): export odb_options += --generate-query --generate-schema \ +--table-prefix boost_ $(gen): cpp_options := -I$(src_base) $(gen): $(odb.l.cpp-options) $(odb_boost.l.cpp-options) $(boost.l.cpp-options) @@ -68,6 +68,8 @@ $(gen): $(odb.l.cpp-options) $(odb_boost.l.cpp-options) $(boost.l.cpp-options) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard ifeq ($(cxx_standard),c++11) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) endif @@ -79,7 +81,6 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/,,$(src_base))) -$(dist): db_id := @database@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): export name := $(name) |