Handle --database option directly in automake and VC++ projects

10 files changed, 28 insertions, 28 deletions

diff --git a/boost/common/multi-index/makefile b/boost/common/multi-index/makefile
index bde0ebb..fabf4b7 100644
--- a/boost/common/multi-index/makefile
+++ b/boost/common/multi-index/makefile
@@ -43,13 +43,14 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/multi-index --generate-schema \
---table-prefix boost_multi_index_
+$(gen) $(dist): export odb_options += --generate-schema \
+--profile boost/multi-index --table-prefix boost_multi_index_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.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)/boost/common/,,$(src_base)))
 
-$(dist): db_id := @database@
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): data_dist := test.std
diff --git a/boost/common/optional/makefile b/boost/common/optional/makefile
index 6dc5c31..5502501 100644
--- a/boost/common/optional/makefile
+++ b/boost/common/optional/makefile
@@ -43,13 +43,14 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/optional --generate-schema --generate-query \
---table-prefix boost_optional_
+$(gen) $(dist): export odb_options += --generate-schema --generate-query \
+--profile boost/optional --table-prefix boost_optional_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.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)/boost/common/,,$(src_base)))
 
-$(dist): db_id := @database@
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): data_dist := test.std
diff --git a/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile
index 9225155..4574160 100644
--- a/boost/common/smart-ptr/makefile
+++ b/boost/common/smart-ptr/makefile
@@ -43,13 +43,14 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/smart-ptr --generate-schema --generate-session \
---table-prefix boost_smart_ptr_
+$(gen) $(dist): export odb_options += --generate-schema --generate-session \
+--profile boost/smart-ptr --table-prefix boost_smart_ptr_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.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)/boost/common/,,$(src_base)))
 
-$(dist): db_id := @database@
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): data_dist := test.std
diff --git a/boost/common/template/Makefile.am b/boost/common/template/Makefile.am
index f136cff..fcaa178 100644
--- a/boost/common/template/Makefile.am
+++ b/boost/common/template/Makefile.am
@@ -29,4 +29,4 @@ ODBFLAGS += --std c++11
 endif
 
 test-odb.hxx: test.hxx
-	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS)  __value__(odb_options) $<
+	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options) $<
diff --git a/boost/common/template/makefile b/boost/common/template/makefile
index 133177e..ee924b1 100644
--- a/boost/common/template/makefile
+++ b/boost/common/template/makefile
@@ -43,13 +43,14 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/version --generate-schema \
---table-prefix boost_template_ #@@ CHANGE table prefix, boost/version
+$(gen) $(dist): export odb_options += --generate-schema \
+--profile boost/version --table-prefix boost_template_ #@@ CHANGE prefix, profile
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.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)/boost/common/,,$(src_base)))
 
-$(dist): db_id := @database@
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): data_dist := test.std
diff --git a/boost/common/template/template-vc10.vcxproj b/boost/common/template/template-vc10.vcxproj
index af7987e..3c606f9 100644
--- a/boost/common/template/template-vc10.vcxproj
+++ b/boost/common/template/template-vc10.vcxproj
@@ -158,7 +158,7 @@
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>
   <ItemGroup>
diff --git a/boost/common/template/template-vc11.vcxproj b/boost/common/template/template-vc11.vcxproj
index 72fb7e3..59da6d0 100644
--- a/boost/common/template/template-vc11.vcxproj
+++ b/boost/common/template/template-vc11.vcxproj
@@ -162,7 +162,7 @@
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>
   <ItemGroup>
diff --git a/boost/common/template/template-vc9.vcproj b/boost/common/template/template-vc9.vcproj
index bf900d0..b8bf4bc 100644
--- a/boost/common/template/template-vc9.vcproj
+++ b/boost/common/template/template-vc9.vcproj
@@ -348,7 +348,7 @@ __source_entries__(extra_sources)
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx)
diff --git a/boost/common/unordered/makefile b/boost/common/unordered/makefile
index c88a8ec..88cad51 100644
--- a/boost/common/unordered/makefile
+++ b/boost/common/unordered/makefile
@@ -43,13 +43,14 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/unordered --generate-schema \
---table-prefix boost_unordered_
+$(gen) $(dist): export odb_options += --generate-schema \
+--profile boost/unordered --table-prefix boost_unordered_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.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)/boost/common/,,$(src_base)))
 
-$(dist): db_id := @database@
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): data_dist := test.std
diff --git a/boost/common/uuid/makefile b/boost/common/uuid/makefile
index 7d39469..dbb3016 100644
--- a/boost/common/uuid/makefile
+++ b/boost/common/uuid/makefile
@@ -43,13 +43,14 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/uuid --generate-schema --generate-query \
---table-prefix boost_uuid_
+$(gen) $(dist): export odb_options += --generate-schema --generate-query \
+--profile boost/uuid --table-prefix boost_uuid_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
 $(boost.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)/boost/common/,,$(src_base)))
 
-$(dist): db_id := @database@
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): data_dist := test.std