diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-13 21:52:14 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-13 21:52:14 +0200 |
| commit | 91f45e1948c2bfdd9083a0fd22c6ed6d49e7fed0 (patch) | |
| tree | cae5f21d55adf9c48d4f6eeac248f0a5a6f19307 /mapping | |
| parent | aaf4c660e0882566a2855a634c39ffe6f8816ece (diff) | |
Handle --database option directly in automake and VC++ projects
Diffstat (limited to 'mapping')
| -rw-r--r-- | mapping/makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mapping/makefile b/mapping/makefile index ff5b1f2..80bdd86 100644 --- a/mapping/makefile +++ b/mapping/makefile @@ -45,12 +45,13 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \ ---generate-query --hxx-prologue '\#include "traits.hxx"' \ ---table-prefix mapping_ +$(gen) $(dist): export odb_options += --generate-schema --generate-query \ +--hxx-prologue '\#include "traits.hxx"' --table-prefix mapping_ $(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 +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) |