From 242363e630f2f541bcf1b7133f21ab2730587c4f Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Fri, 25 Mar 2011 17:52:14 +0200
Subject: Update directory structure for Qt test

---
 qt/makefile | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'qt/makefile')

diff --git a/qt/makefile b/qt/makefile
index edbb5dc..5520b8a 100644
--- a/qt/makefile
+++ b/qt/makefile
@@ -5,30 +5,33 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
 
-tests := mysql
+all_dirs := mysql
+dirs :=
 
-default   := $(out_base)/
-dist      := $(out_base)/.dist
-test      := $(out_base)/.test
-clean     := $(out_base)/.clean
+ifeq ($(db_id),mysql)
+dirs += mysql
+endif
 
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
+default := $(out_base)/
+dist    := $(out_base)/.dist
+test    := $(out_base)/.test
+clean   := $(out_base)/.clean
 
-$(dist): name := qt
-$(dist): export dirs := $(tests)
-$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat
-$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests)))
+$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs)))
+
+$(dist): export extra_dist := build.bat
+$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_dirs)))
 	$(call meta-automake)
-	$(call meta-vc9sln,$(name)-vc9.sln)
-	$(call meta-vc10sln,$(name)-vc10.sln)
-	$(call meta-vctest,$(name)-vc10.sln,test.bat)
 
-$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
+$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(dirs)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_dirs)))
 
-$(call include,$(bld_root)/meta/vc9sln.make)
-$(call include,$(bld_root)/meta/vc10sln.make)
+$(call include,$(bld_root)/dist.make)
 $(call include,$(bld_root)/meta/vctest.make)
 $(call include,$(bld_root)/meta/automake.make)
 
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
+ifneq ($(filter $(MAKECMDGOALS),dist clean),)
+$(foreach d,$(all_dirs),$(call import,$(src_base)/$d/makefile))
+else
+$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile))
+endif
-- 
cgit v1.1