Switch to build2

22 files changed, 0 insertions, 2644 deletions

diff --git a/evolution/Makefile.am b/evolution/Makefile.am
deleted file mode 100644
index 2459530..0000000
--- a/evolution/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# file      : evolution/Makefile.am
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-SUBDIRS = __path__(dirs)
-EXTRA_DIST = __file__(extra_dist)
diff --git a/evolution/add-column/makefile b/evolution/add-column/makefile
deleted file mode 100644
index b05edab..0000000
--- a/evolution/add-column/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/add-column/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_add_c_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
deleted file mode 100644
index 701ba43..0000000
--- a/evolution/add-foreign-key/makefile
+++ /dev/null
@@ -1,146 +0,0 @@
-# file      : evolution/add-foreign-key/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --fkeys-deferrable-mode not_deferrable \
---table-prefix evo_add_fk_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/add-index/makefile b/evolution/add-index/makefile
deleted file mode 100644
index c0e0289..0000000
--- a/evolution/add-index/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/add-index/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_add_i_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/add-table/makefile b/evolution/add-table/makefile
deleted file mode 100644
index d7d8cc9..0000000
--- a/evolution/add-table/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/add-table/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_add_t_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/alter-column/makefile b/evolution/alter-column/makefile
deleted file mode 100644
index f92842a..0000000
--- a/evolution/alter-column/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/alter-column/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_alter_c_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/combined/makefile b/evolution/combined/makefile
deleted file mode 100644
index 3e44dd1..0000000
--- a/evolution/combined/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/combined/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --sqlite-override-null --table-prefix evo_comb_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/data/makefile b/evolution/data/makefile
deleted file mode 100644
index 20e3501..0000000
--- a/evolution/data/makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-# file      : evolution/data/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_data_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml) # Changelog.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/drop-column/makefile b/evolution/drop-column/makefile
deleted file mode 100644
index a4bb228..0000000
--- a/evolution/drop-column/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/drop-column/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --sqlite-override-null --table-prefix evo_drop_c_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/drop-foreign-key/makefile b/evolution/drop-foreign-key/makefile
deleted file mode 100644
index 2cad4b8..0000000
--- a/evolution/drop-foreign-key/makefile
+++ /dev/null
@@ -1,146 +0,0 @@
-# file      : evolution/drop-foreign-key/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --fkeys-deferrable-mode not_deferrable \
---table-prefix evo_drop_fk_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/drop-index/makefile b/evolution/drop-index/makefile
deleted file mode 100644
index 775834b..0000000
--- a/evolution/drop-index/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/drop-index/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_drop_i_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/drop-table/makefile b/evolution/drop-table/makefile
deleted file mode 100644
index c6a5f65..0000000
--- a/evolution/drop-table/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/drop-table/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_drop_t_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/embedded/makefile b/evolution/embedded/makefile
deleted file mode 100644
index 372cecd..0000000
--- a/evolution/embedded/makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-# file      : evolution/embedded/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --schema-format embedded --at-once --table-prefix evo_embedded_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Base schema.
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml) # Changelog.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/makefile b/evolution/makefile
deleted file mode 100644
index 3d9cdb1..0000000
--- a/evolution/makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# file      : evolution/makefile
-# license   : GNU GPL; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
-
-tests :=         \
-add-table        \
-drop-table       \
-add-column       \
-drop-column      \
-alter-column     \
-add-foreign-key  \
-drop-foreign-key \
-add-index        \
-drop-index       \
-combined         \
-embedded         \
-soft-add         \
-soft-delete      \
-version          \
-data             \
-template
-
-all_tests := $(tests)
-build_tests := $(tests)
-
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
-
-name := evolution
-$(dist): name := $(name)
-$(dist): data_dist := tester.bat
-$(dist): exec_dist := tester.in
-$(dist): export dirs := $(filter-out $(no_dist_tests),$(tests))
-$(dist): export extra_dist := $(data_dist) $(exec_dist) test.bat \
-$(call vc8slns,$(name)) $(call vc9slns,$(name)) $(call vc10slns,$(name)) \
-$(call vc11slns,$(name)) $(call vc12slns,$(name))
-$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
-	$(call dist-data,$(data_dist))
-	$(call dist-exec,$(exec_dist))
-	$(call meta-automake)
-	$(call meta-vc8slns,$(name))
-	$(call meta-vc9slns,$(name))
-	$(call meta-vc10slns,$(name))
-	$(call meta-vc11slns,$(name))
-	$(call meta-vc12slns,$(name))
-	$(call meta-vctest,$(name)-mysql-vc10.sln,test.bat)
-
-$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests)))
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests)))
-
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/vc8sln.make)
-$(call include,$(bld_root)/meta/vc9sln.make)
-$(call include,$(bld_root)/meta/vc10sln.make)
-$(call include,$(bld_root)/meta/vc11sln.make)
-$(call include,$(bld_root)/meta/vc12sln.make)
-$(call include,$(bld_root)/meta/vctest.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-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
diff --git a/evolution/soft-add/makefile b/evolution/soft-add/makefile
deleted file mode 100644
index 7455c98..0000000
--- a/evolution/soft-add/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/soft-add/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query --generate-prepared \
---generate-schema --at-once --table-prefix evo_soft_a_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/soft-delete/makefile b/evolution/soft-delete/makefile
deleted file mode 100644
index 92815bc..0000000
--- a/evolution/soft-delete/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/soft-delete/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query --generate-prepared \
---generate-schema --at-once --sqlite-override-null --table-prefix evo_soft_d_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/template/Makefile.am b/evolution/template/Makefile.am
deleted file mode 100644
index dddb6b9..0000000
--- a/evolution/template/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-# file      : evolution/template/Makefile.am
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-EXTRA_DIST = __file__(extra_dist)
-
-noinst_PROGRAMS = driver
-driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers)
-LDADD = $(top_builddir)/libcommon/common/libcommon.la
-AM_CPPFLAGS = -I'$(top_builddir)/libcommon' -I'$(top_srcdir)/libcommon'
-AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)'
-
-TESTS=$(top_builddir)/evolution/tester
-TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir;
-
-ODB = @ODB@
-ODBFLAGS = @ODBFLAGS@
-ODBCPPFLAGS = @ODBCPPFLAGS@
-
-if HAVE_CXX11
-ODBFLAGS += --std c++11
-endif
-
-# test1.hxx
-#
-driver_SOURCES += test1.hxx
-nodist_driver_SOURCES = test1-odb.cxx
-BUILT_SOURCES = test1-odb.hxx
-CLEANFILES = test1-odb.hxx test1-odb.ixx test1-odb.cxx test1.sql model.xml
-
-test1-odb.hxx: test1.hxx
-	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options1) --changelog model.xml $<
-
-# test2.hxx
-#
-driver_SOURCES += test2.hxx
-nodist_driver_SOURCES += test2-odb.cxx
-BUILT_SOURCES += test2-odb.hxx
-CLEANFILES += test2-odb.hxx test2-odb.ixx test2-odb.cxx test2.sql
-
-test2-odb.hxx: test2.hxx
-	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options2) --changelog model.xml $<
-
-# test3.hxx
-#
-driver_SOURCES += test3.hxx
-nodist_driver_SOURCES += test3-odb.cxx
-BUILT_SOURCES += test3-odb.hxx
-CLEANFILES += test3-odb.hxx test3-odb.ixx test3-odb.cxx test3.sql \
-test3-002-pre.sql test3-002-post.sql test3-003-pre.sql test3-003-post.sql
-
-test3-odb.hxx: test3.hxx
-	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) --database @database@ __value__(odb_options3) --changelog model.xml $<
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-test2-odb.hxx: test1-odb.hxx
-test3-odb.hxx: test2-odb.hxx
-test1-odb.hxx test2-odb.hxx test3-odb.hxx: model.hxx
diff --git a/evolution/template/makefile b/evolution/template/makefile
deleted file mode 100644
index 474145c..0000000
--- a/evolution/template/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/template/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_template_ #@@ CHANGE THIS
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)
diff --git a/evolution/test.bat b/evolution/test.bat
deleted file mode 100644
index 953965c..0000000
--- a/evolution/test.bat
+++ /dev/null
@@ -1,79 +0,0 @@
-@echo off
-rem file      : evolution/test.bat
-rem license   : GNU GPL v2; see accompanying LICENSE file
-
-setlocal
-
-set "tests=__path__(dirs) __path__(thread_dirs)"
-set "confs=__path__(configurations)"
-set "plats=__path__(platforms)"
-set "curdir=%CD%"
-set "topdir=%curdir%\.."
-set "failed="
-
-if "_%1_" == "__" (
-  echo no database specified
-  goto usage
-)
-
-goto start
-
-rem
-rem %1 - test directory
-rem %2 - configuration
-rem %3 - platform
-rem %4 - database
-rem
-:run_test
-  cd %1
-
-  if "_%3_" == "_Win32_" (
-    set "dir=%2"
-  ) else (
-    set "dir=%3\%2"
-  )
-
-  if exist %dir%\driver.exe (
-    echo %1\%3\%2
-    call %topdir%\evolution\tester.bat %4 %2 %3
-    if errorlevel 1 (
-      set "failed=%failed% %1\%3\%2"
-    )
-  )
-
-  cd %curdir%
-goto :eof
-
-:start
-
-for %%t in (%tests%) do (
-  for %%c in (%confs%) do (
-    for %%p in (%plats%) do (
-      call :run_test %%t %%c %%p %1
-    )
-  )
-)
-
-if not "_%failed%_" == "__" goto error
-
-echo.
-echo ALL TESTS PASSED
-echo.
-goto end
-
-:usage
-echo.
-echo usage: test.bat database
-echo.
-
-:error
-if not "_%failed%_" == "__" (
-  echo.
-  for %%t in (%failed%) do echo FAILED: %%t
-  echo.
-)
-endlocal
-exit /b 1
-
-:end
-endlocal
diff --git a/evolution/tester.bat b/evolution/tester.bat
deleted file mode 100644
index 3b7401f..0000000
--- a/evolution/tester.bat
+++ /dev/null
@@ -1,87 +0,0 @@
-@echo off
-rem file      : evolution/tester.bat
-rem license   : GNU GPL v2; see accompanying LICENSE file
-
-rem
-rem Run an evolution test. The test directory is the current directory.
-rem
-rem %1     database
-rem %2     configuration, for example, Debug or Release
-rem %3     platform, for example Win32 or x64
-rem topdir variable containing the path to top project directory
-rem
-
-setlocal
-
-set "PATH=%topdir%\libcommon\bin64;%topdir%\libcommon\bin;%PATH%"
-
-if "_%3_" == "_Win32_" (
-  set "dir=%2"
-) else (
-  set "dir=%3\%2"
-)
-
-if exist test*.sql (
-  rem Standalone schema.
-  rem
-
-  rem Drop everything.
-  rem
-  call %topdir%\%1-driver.bat test3.sql
-  if errorlevel 1 goto error
-
-  call %topdir%\%1-driver.bat test2.sql
-  if errorlevel 1 goto error
-
-  call %topdir%\%1-driver.bat test1.sql
-  if errorlevel 1 goto error
-
-  rem Base schema.
-  rem
-  call %topdir%\%1-driver.bat test3-002-pre.sql
-  if errorlevel 1 goto error
-
-  call %topdir%\%1-driver.bat test3-002-post.sql
-  if errorlevel 1 goto error
-
-  %dir%\driver.exe --options-file %topdir%\%1.options 1
-  if errorlevel 1 goto error
-
-  rem Migration.
-  rem
-  call %topdir%\%1-driver.bat test3-003-pre.sql
-  if errorlevel 1 goto error
-
-  %dir%\driver.exe --options-file %topdir%\%1.options 2
-  if errorlevel 1 goto error
-
-  call %topdir%\%1-driver.bat test3-003-post.sql
-  if errorlevel 1 goto error
-
-  rem Current schema.
-  rem
-  %dir%\driver.exe --options-file %topdir%\%1.options 3
-  if errorlevel 1 goto error
-
-) else (
-
-  rem Embedded schema. Just run the driver.
-  rem
-  %dir%\driver.exe --options-file %topdir%\%1.options 1
-  if errorlevel 1 goto error
-
-  %dir%\driver.exe --options-file %topdir%\%1.options 2
-  if errorlevel 1 goto error
-
-  %dir%\driver.exe --options-file %topdir%\%1.options 3
-  if errorlevel 1 goto error
-)
-
-goto end
-
-:error
-endlocal
-exit /b 1
-
-:end
-endlocal
diff --git a/evolution/tester.in b/evolution/tester.in
deleted file mode 100755
index 1fef1c2..0000000
--- a/evolution/tester.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-
-# file      : evolution/tester.in
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-#
-# Run an evolution test. The test driver is in the current directory. The
-# data files, if any, are in $srcdir.
-#
-
-db_driver="$top_builddir/@database@-driver"
-db_options="$top_builddir/@database@.options"
-
-if test -f test1.sql; then
-  # Standalone schema.
-  #
-
-  # Drop everything.
-  $db_driver test3.sql || exit 1
-  $db_driver test2.sql || exit 1
-  $db_driver test1.sql || exit 1
-
-  # Base schema.
-  $db_driver test3-002-pre.sql || exit 1
-  $db_driver test3-002-post.sql || exit 1
-  ./driver --options-file "$db_options" 1 || exit 1
-
-  # Migration.
-  $db_driver test3-003-pre.sql || exit 1
-  ./driver --options-file "$db_options" 2 || exit 1
-  $db_driver test3-003-post.sql || exit 1
-
-  # Current schema.
-  ./driver --options-file "$db_options" 3 || exit 1
-
-else
-  # Embedded schema. Just run the driver.
-  #
-  ./driver --options-file "$db_options" 1 || exit 1
-  ./driver --options-file "$db_options" 2 || exit 1
-  ./driver --options-file "$db_options" 3 || exit 1
-fi
diff --git a/evolution/version/makefile b/evolution/version/makefile
deleted file mode 100644
index eb63ffc..0000000
--- a/evolution/version/makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# file      : evolution/version/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx test3.hxx
-genf1   := test1-odb.hxx test1-odb.ixx test1-odb.cxx
-gen1    := $(addprefix $(out_base)/,$(genf1))
-genf2   := test2-odb.hxx test2-odb.ixx test2-odb.cxx
-gen2    := $(addprefix $(out_base)/,$(genf2))
-genf3   := test3-odb.hxx test3-odb.ixx test3-odb.cxx
-gen3    := $(addprefix $(out_base)/,$(genf3))
-genf    := $(genf1) $(genf2) $(genf3)
-gen     := $(gen1) $(gen2) $(gen3)
-gens    := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
-test3-003-pre.sql test3-003-post.sql
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-common.l             := $(out_root)/libcommon/common/common.l
-common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/odb/stub.make,\
-  odb: odb,odb-rules: odb_rules)
-
-# Build.
-#
-$(driver): $(cxx_obj) $(common.l)
-$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base) -I$(src_base)
-$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
-
-$(gen): $(odb)
-$(gen): odb := $(odb)
-$(gen) $(dist): odb_common_options = --generate-query \
---generate-schema --at-once --table-prefix evo_version_
-$(gen): odb_common_options += --database $(db_id)
-$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
-$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
---suppress-migration
-$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
-$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
-$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
-$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
-$(gen): cpp_options := -I$(src_base)
-$(gen): $(common.l.cpp-options)
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
-
-# Make sure testN.hxx are compiled serially since they share the
-# changelog. Also add dependency on model.hxx
-#
-$(gen2): $(gen1)
-$(gen3): $(gen2)
-$(gen): $(src_base)/model.hxx
-
-# Alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Dist
-#
-name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
-
-$(dist): sources := $(cxx_tun)
-$(dist): headers := $(odb_hdr)
-$(dist): export extra_headers := model.hxx
-$(dist): export name := $(name)
-$(dist): export extra_dist := $(call vc8projs,$(name)) \
-$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
-$(call vc12projs,$(name))
-$(dist):
-	$(call dist-data,$(sources) $(headers) $(extra_headers))
-	$(call meta-automake,../template/Makefile.am)
-	$(call meta-vc8projs,../template/template,$(name))
-	$(call meta-vc9projs,../template/template,$(name))
-	$(call meta-vc10projs,../template/template,$(name))
-	$(call meta-vc11projs,../template/template,$(name))
-	$(call meta-vc12projs,../template/template,$(name))
-
-# Test.
-#
-$(test): $(driver)
-        # Drop everything.
-	$(call schema,$(out_base)/test3.sql)
-	$(call schema,$(out_base)/test2.sql)
-	$(call schema,$(out_base)/test1.sql)
-        # Base schema.
-	$(call schema,$(out_base)/test3-002-pre.sql)
-	$(call schema,$(out_base)/test3-002-post.sql)
-	$(call message,test $< base,$< --options-file $(dcf_root)/$(db_id).options 1)
-        # Migration.
-	$(call schema,$(out_base)/test3-003-pre.sql)
-	$(call message,test $< migration,$< --options-file $(dcf_root)/$(db_id).options 2)
-	$(call schema,$(out_base)/test3-003-post.sql)
-        # Current schema.
-	$(call message,test $< current,$< --options-file $(dcf_root)/$(db_id).options 3)
-
-# Clean.
-#
-$(clean):                            \
-  $(driver).o.clean                  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
-	$(call message,,rm -f $(out_base)/model.xml)   # Changelog.
-	$(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
-$(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/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): odb_options += --std $(cxx_standard)
-$(call include,$(odb_rules))
-endif
-
-$(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)