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

---
 common/session/cache/makefile  | 7 ++++---
 common/session/custom/makefile | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'common/session')

diff --git a/common/session/cache/makefile b/common/session/cache/makefile
index c26b394..3219565 100644
--- a/common/session/cache/makefile
+++ b/common/session/cache/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-session --table-prefix session_cache_
+$(gen) $(dist): export odb_options += --generate-schema --generate-session \
+--table-prefix session_cache_
 $(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
diff --git a/common/session/custom/makefile b/common/session/custom/makefile
index e822b7a..2342b04 100644
--- a/common/session/custom/makefile
+++ b/common/session/custom/makefile
@@ -34,12 +34,14 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
---generate-session --session-type ::session --hxx-prologue \
-'\#include "session.hxx"' --table-prefix session_custom_
+$(gen) $(dist): export odb_options += --generate-schema --generate-session \
+--session-type ::session --hxx-prologue '\#include "session.hxx"' \
+--table-prefix session_custom_
 $(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.
@@ -50,7 +52,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): export extra_headers := session.hxx session.txx
-- 
cgit v1.1