aboutsummaryrefslogtreecommitdiff
path: root/inverse/makefile
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-06-13 21:52:14 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-06-13 21:52:14 +0200
commit91f45e1948c2bfdd9083a0fd22c6ed6d49e7fed0 (patch)
treecae5f21d55adf9c48d4f6eeac248f0a5a6f19307 /inverse/makefile
parentaaf4c660e0882566a2855a634c39ffe6f8816ece (diff)
Handle --database option directly in automake and VC++ projects
Diffstat (limited to 'inverse/makefile')
-rw-r--r--inverse/makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/inverse/makefile b/inverse/makefile
index 848aeb3..d7d8680 100644
--- a/inverse/makefile
+++ b/inverse/makefile
@@ -45,12 +45,14 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-query \
---generate-schema --generate-session --default-pointer std::tr1::shared_ptr \
+$(gen) $(dist): export odb_options += --generate-query --generate-schema \
+--generate-session --default-pointer std::tr1::shared_ptr \
--table-prefix inverse_
$(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.
@@ -61,7 +63,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)