aboutsummaryrefslogtreecommitdiff
path: root/common/threads
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-09-08 21:23:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-09-08 21:23:37 +0200
commitff5bb2accee87c24ee64e8fdcf5169e674c4b7b4 (patch)
tree321a74c1f48331cb44e3b90943501646c5024836 /common/threads
parentb3b1fac433a20e5ab6abb3729ecc5473a658718b (diff)
Add suppor for VC++ build
Diffstat (limited to 'common/threads')
-rw-r--r--common/threads/driver.cxx2
-rw-r--r--common/threads/makefile21
2 files changed, 17 insertions, 6 deletions
diff --git a/common/threads/driver.cxx b/common/threads/driver.cxx
index c883bba..dd2d9f6 100644
--- a/common/threads/driver.cxx
+++ b/common/threads/driver.cxx
@@ -17,7 +17,7 @@
#include <odb/details/shared-ptr.hxx>
#include <odb/details/thread.hxx>
-#include <common.hxx>
+#include <common/common.hxx>
#include "test.hxx"
#include "test-odb.hxx"
diff --git a/common/threads/makefile b/common/threads/makefile
index 6a8c802..73174d9 100644
--- a/common/threads/makefile
+++ b/common/threads/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,11 +48,20 @@ $(out_base)/: $(driver)
# Dist
#
-$(dist): data_dist := $(cxx_tun) $(odb_hdr) test.std
+name := $(notdir $(src_base))
+
$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(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) $(data_dist))
+ $(call meta-automake,../template/Makefile.am)
+ $(call meta-vc9projs,../template/template,$(name))
+ $(call meta-vc10projs,../template/template,$(name))
# Test.
#
@@ -83,6 +92,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))