From 91f45e1948c2bfdd9083a0fd22c6ed6d49e7fed0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 13 Jun 2013 21:52:14 +0200
Subject: Handle --database option directly in automake and VC++ projects

---
 inheritance/polymorphism/makefile | 7 ++++---
 inheritance/reuse/makefile        | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'inheritance')

diff --git a/inheritance/polymorphism/makefile b/inheritance/polymorphism/makefile
index 88456ae..51bc5c4 100644
--- a/inheritance/polymorphism/makefile
+++ b/inheritance/polymorphism/makefile
@@ -45,11 +45,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 inh_poly_
+$(gen) $(dist): export odb_options += --generate-schema --generate-query \
+--table-prefix inh_poly_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options)
 
+$(gen): odb_options += --database $(db_id)
+
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
 
 # Alias for default target.
@@ -60,7 +62,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)
diff --git a/inheritance/reuse/makefile b/inheritance/reuse/makefile
index b47b703..46e786e 100644
--- a/inheritance/reuse/makefile
+++ b/inheritance/reuse/makefile
@@ -45,11 +45,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 inh_reuse_
+$(gen) $(dist): export odb_options += --generate-schema --generate-query \
+--table-prefix inh_reuse_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(odb.l.cpp-options)
 
+$(gen): odb_options += --database $(db_id)
+
 $(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
 
 # Alias for default target.
@@ -60,7 +62,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)
-- 
cgit v1.1