aboutsummaryrefslogtreecommitdiff
path: root/common/query/makefile
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-11-08 13:40:31 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-11-08 13:40:31 +0200
commit28a08724fc9e2ac494596711990206c64ca36b1d (patch)
tree5f382e92fe0810a5b93522f92f26ea33f179c8d3 /common/query/makefile
parent37a2585ce1d0801bab5d0aba50012c3bcd451739 (diff)
Get rid of custom value_traits specialization in query test
auto_ptr<string> is now handled automatically as a wrapper.
Diffstat (limited to 'common/query/makefile')
-rw-r--r--common/query/makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/common/query/makefile b/common/query/makefile
index f1f2fa9..63c0e77 100644
--- a/common/query/makefile
+++ b/common/query/makefile
@@ -36,8 +36,7 @@ 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 t_query_
+--generate-query --table-prefix t_query_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options)
@@ -54,13 +53,12 @@ name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := traits.hxx $(databases:%=traits-%.hxx)
$(dist): data_dist := test.std
$(dist): export name := $(name)
$(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \
$(call vc10projs,$(name))
$(dist):
- $(call dist-data,$(sources) $(headers) $(extra_headers) $(data_dist))
+ $(call dist-data,$(sources) $(headers) $(data_dist))
$(call meta-automake,../template/Makefile.am)
$(call meta-vc9projs,../template/template,$(name))
$(call meta-vc10projs,../template/template,$(name))