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

---
 evolution/embedded/makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'evolution/embedded/makefile')

diff --git a/evolution/embedded/makefile b/evolution/embedded/makefile
index e8f5892..8503ce7 100644
--- a/evolution/embedded/makefile
+++ b/evolution/embedded/makefile
@@ -43,8 +43,9 @@ gen  := $(gen1) $(gen2) $(gen3)
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+$(gen) $(dist): odb_common_options = --generate-query \
 --generate-schema --schema-format embedded --at-once --table-prefix evo_embedded_
+$(gen): odb_common_options += --database $(db_id)
 $(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
 $(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
 --schema-name 2 --suppress-migration
@@ -72,7 +73,7 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-$(dist): db_id := @database@
+
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
-- 
cgit v1.1