1 files changed, 23 insertions, 101 deletions
diff --git a/qt/mysql/makefile b/qt/mysql/makefile
index 69b70aa..5c7fffc 100644
--- a/qt/mysql/makefile
+++ b/qt/mysql/makefile
@@ -1,114 +1,36 @@
 # file      : qt/mysql/makefile
 # author    : Constantin Michael <constantin@codesynthesis.com>
 # copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
+# license   : GNU GPL; see accompanying LICENSE file
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
-cxx_tun := driver.cxx
-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)
+tests := \
+core     \
+template
 
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
+default   := $(out_base)/
+dist      := $(out_base)/.dist
+test      := $(out_base)/.test
+clean     := $(out_base)/.clean
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
+$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
 
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
+$(dist): name := qt-mysql
+$(dist): export dirs := $(tests)
+$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat
+$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests)))
+	$(call meta-automake)
+	$(call meta-vc9sln,$(name)-vc9.sln)
+	$(call meta-vc10sln,$(name)-vc10.sln)
+	$(call meta-vctest,$(name)-vc10.sln,test.bat)
 
-$(call import,\
-  $(scf_root)/import/libodb-qt/stub.make,\
-  l: odb_qt.l,cpp-options: odb_qt.l.cpp-options)
+$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
 
-$(call import,\
-  $(scf_root)/import/libqt/core/stub.make,\
-  l: qt_core.l)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(odb_qt.l) $(common.l) $(qt_core.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options) $(odb_qt.l.cpp-options)
-
-genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql)
-gen  := $(addprefix $(out_base)/,$(genf))
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database mysql --profile qt \
---generate-schema
-$(gen): cpp_options := -I$(out_base)
-$(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): data_dist := test.std
-$(dist): export name := $(subst /,-,$(subst $(src_root)/qt/mysql/,,$(src_base)))
-$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \
-$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(data_dist))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj)
-	$(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj)
-
-# Test.
-#
-$(test): $(driver) $(src_base)/test.std
-	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
-	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
->$(out_base)/test.out)
-	$(call message,,diff -u $(src_base)/test.std $(out_base)/test.out)
-	$(call message,,rm -f $(out_base)/test.out)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
-	$(call message,,rm -f $(out_base)/test.out)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-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/vc9sln.make)
+$(call include,$(bld_root)/meta/vc10sln.make)
+$(call include,$(bld_root)/meta/vctest.make)
 $(call include,$(bld_root)/meta/automake.make)
 
-$(call include,$(odb_rules))
-$(call include,$(bld_root)/cxx/cxx-d.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/o-e.make)
-
-# Dependencies.
-#
-$(call import,$(src_root)/libcommon/makefile)
+$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))