diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-10-29 10:04:47 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-10-29 10:04:47 +0200 |
| commit | c9b3d19c3e1771cb1f0a3d93552e48e5f1d47025 (patch) | |
| tree | 714be71aec621f4a4bfa2b00d27839332bd1f9a1 /sqlite | |
| parent | e43ec751d10b8346e1450781d64595b6fb7e1185 (diff) | |
Don't make database default in database-specific tests
Diffstat (limited to 'sqlite')
| -rw-r--r-- | sqlite/custom/makefile | 4 | ||||
| -rw-r--r-- | sqlite/template/makefile | 4 | ||||
| -rw-r--r-- | sqlite/truncation/makefile | 4 | ||||
| -rw-r--r-- | sqlite/types/makefile | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sqlite/custom/makefile b/sqlite/custom/makefile index de52742..d61dc95 100644 --- a/sqlite/custom/makefile +++ b/sqlite/custom/makefile @@ -34,8 +34,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database sqlite --generate-schema \ ---generate-query --table-prefix sqlitex_custom_ +$(gen) $(dist): export odb_options += --database sqlite --default-database \ +common --generate-schema --generate-query --table-prefix sqlitex_custom_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/sqlite/template/makefile b/sqlite/template/makefile index 65bc159..4341cc8 100644 --- a/sqlite/template/makefile +++ b/sqlite/template/makefile @@ -34,8 +34,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database sqlite --generate-schema \ ---table-prefix sqlitex_template_ #@@ CHANGE THIS +$(gen) $(dist): export odb_options += --database sqlite --default-database \ +common --generate-schema --table-prefix sqlitex_template_ #@@ CHANGE THIS $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/sqlite/truncation/makefile b/sqlite/truncation/makefile index 3dfae0e..9fedbd1 100644 --- a/sqlite/truncation/makefile +++ b/sqlite/truncation/makefile @@ -34,8 +34,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database sqlite --generate-query \ ---generate-schema --table-prefix sqlitex_truncation_ +$(gen) $(dist): export odb_options += --database sqlite --default-database \ +common --generate-schema --generate-query --table-prefix sqlitex_truncation_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/sqlite/types/makefile b/sqlite/types/makefile index 4e78f0a..0dbdee4 100644 --- a/sqlite/types/makefile +++ b/sqlite/types/makefile @@ -34,9 +34,9 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database sqlite --generate-schema \ ---generate-query --cxx-prologue '\#include "traits.hxx"' \ ---table-prefix sqlitex_types_ +$(gen) $(dist): export odb_options += --database sqlite --default-database \ +common --generate-schema --generate-query --cxx-prologue \ +'\#include "traits.hxx"' --table-prefix sqlitex_types_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) |