aboutsummaryrefslogtreecommitdiff
path: root/common/query
diff options
context:
space:
mode:
Diffstat (limited to 'common/query')
-rw-r--r--common/query/driver.cxx2
-rw-r--r--common/query/makefile23
2 files changed, 18 insertions, 7 deletions
diff --git a/common/query/driver.cxx b/common/query/driver.cxx
index 2573d7e..eede6d8 100644
--- a/common/query/driver.cxx
+++ b/common/query/driver.cxx
@@ -13,7 +13,7 @@
#include <odb/database.hxx>
#include <odb/transaction.hxx>
-#include <common.hxx>
+#include <common/common.hxx>
#include "test.hxx"
#include "test-odb.hxx"
diff --git a/common/query/makefile b/common/query/makefile
index 27e19e8..08eb33d 100644
--- a/common/query/makefile
+++ b/common/query/makefile
@@ -10,8 +10,8 @@ odb_hdr := test.hxx
cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
cxx_od := $(cxx_obj:.o=.o.d)
-common.l := $(out_root)/libcommon/common.l
-common.l.cpp-options := $(out_root)/libcommon/common.l.cpp-options
+common.l := $(out_root)/libcommon/common/common.l
+common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
driver := $(out_base)/driver
dist := $(out_base)/.dist
@@ -48,12 +48,21 @@ $(out_base)/: $(driver)
# Dist
#
-$(dist): data_dist := $(cxx_tun) $(odb_hdr) traits.hxx test.std
-$(dist): export extra_headers := traits.hxx
+name := $(notdir $(src_base))
+
$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): export extra_headers := 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,$(data_dist))
- $(call meta-automake,$(src_root)/common/template/Makefile.am)
+ $(call dist-data,$(sources) $(headers) $(extra_headers) $(data_dist))
+ $(call meta-automake,../template/Makefile.am)
+ $(call meta-vc9projs,../template/template,$(name))
+ $(call meta-vc10projs,../template/template,$(name))
# Test.
#
@@ -84,6 +93,8 @@ endif
# How to.
#
$(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
$(call include,$(bld_root)/meta/automake.make)
$(call include,$(odb_rules))