From 921c4c14c2999a03b9e649b5c9adec73b5cae0de Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 6 Sep 2010 14:26:25 +0200
Subject: Add automake build support

---
 common/makefile | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'common/makefile')

diff --git a/common/makefile b/common/makefile
index 1e56ecb..ef085e9 100644
--- a/common/makefile
+++ b/common/makefile
@@ -12,14 +12,30 @@ template      \
 lifecycle     \
 query
 
-tests += threads
+thread_tests := threads
+
+all_tests := $(tests) $(thread_tests)
+build_tests := $(tests) $(thread_tests)
 
 default   := $(out_base)/
+dist      := $(out_base)/.dist
 test      := $(out_base)/.test
 clean     := $(out_base)/.clean
 
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
-$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
+$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
+
+$(dist): export dirs := $(tests)
+$(dist): export thread_dirs := $(thread_tests)
+$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
+	$(call meta-automake)
+
+$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests)))
+
+$(call include,$(bld_root)/dist.make)
 
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
+ifneq ($(filter $(MAKECMDGOALS),dist clean),)
+$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile))
+else
+$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile))
+endif
-- 
cgit v1.1