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

---
 c++11/makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'c++11')

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)
-- 
cgit v1.1