From 6cd8b9f561b912f264ba4f723845935c40a3cb95 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 21 Jun 2013 10:39:59 +0200
Subject: Add support for running tests in dynamic multi-database mode

Only possible in the development build system at this stage.
---
 evolution/add-column/makefile       | 34 ++++++++++++----------------------
 evolution/add-foreign-key/makefile  | 34 ++++++++++++----------------------
 evolution/add-index/makefile        | 34 ++++++++++++----------------------
 evolution/add-table/makefile        | 34 ++++++++++++----------------------
 evolution/alter-column/makefile     | 34 ++++++++++++----------------------
 evolution/combined/makefile         | 34 ++++++++++++----------------------
 evolution/data/makefile             | 30 ++++++++++--------------------
 evolution/drop-column/makefile      | 34 ++++++++++++----------------------
 evolution/drop-foreign-key/makefile | 34 ++++++++++++----------------------
 evolution/drop-index/makefile       | 34 ++++++++++++----------------------
 evolution/drop-table/makefile       | 34 ++++++++++++----------------------
 evolution/embedded/makefile         | 30 ++++++++++--------------------
 evolution/makefile                  |  5 -----
 evolution/template/makefile         | 34 ++++++++++++----------------------
 evolution/version/makefile          | 34 ++++++++++++----------------------
 15 files changed, 164 insertions(+), 309 deletions(-)

(limited to 'evolution')

diff --git a/evolution/add-column/makefile b/evolution/add-column/makefile
index 7da8b71..9c397b9 100644
--- a/evolution/add-column/makefile
+++ b/evolution/add-column/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
index 3446e5b..295598f 100644
--- a/evolution/add-foreign-key/makefile
+++ b/evolution/add-foreign-key/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -76,7 +67,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -114,7 +104,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/add-index/makefile b/evolution/add-index/makefile
index 50a6673..07b817b 100644
--- a/evolution/add-index/makefile
+++ b/evolution/add-index/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/add-table/makefile b/evolution/add-table/makefile
index a57e56e..88c4cde 100644
--- a/evolution/add-table/makefile
+++ b/evolution/add-table/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/alter-column/makefile b/evolution/alter-column/makefile
index 998c915..bbfa0bf 100644
--- a/evolution/alter-column/makefile
+++ b/evolution/alter-column/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/combined/makefile b/evolution/combined/makefile
index 33c5176..f49d1a7 100644
--- a/evolution/combined/makefile
+++ b/evolution/combined/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/data/makefile b/evolution/data/makefile
index 6787527..8023594 100644
--- a/evolution/data/makefile
+++ b/evolution/data/makefile
@@ -6,17 +6,20 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,18 +32,6 @@ $(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)
 
-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)
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -73,7 +64,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -111,7 +101,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
 	$(call message,,rm -f $(out_base)/model.xml) # Changelog.
 
 # Generated .gitignore.
diff --git a/evolution/drop-column/makefile b/evolution/drop-column/makefile
index 26b31ac..244181c 100644
--- a/evolution/drop-column/makefile
+++ b/evolution/drop-column/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/drop-foreign-key/makefile b/evolution/drop-foreign-key/makefile
index 78d1602..9a12aa8 100644
--- a/evolution/drop-foreign-key/makefile
+++ b/evolution/drop-foreign-key/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -76,7 +67,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -114,7 +104,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/drop-index/makefile b/evolution/drop-index/makefile
index 2e849c1..5d90d38 100644
--- a/evolution/drop-index/makefile
+++ b/evolution/drop-index/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/drop-table/makefile b/evolution/drop-table/makefile
index ff6014f..99339d7 100644
--- a/evolution/drop-table/makefile
+++ b/evolution/drop-table/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/embedded/makefile b/evolution/embedded/makefile
index 8503ce7..3639f85 100644
--- a/evolution/embedded/makefile
+++ b/evolution/embedded/makefile
@@ -6,17 +6,20 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,18 +32,6 @@ $(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)
 
-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)
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -73,7 +64,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -103,7 +93,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
 	$(call message,,rm -f $(out_base)/model.xml) # Changelog.
 
 # Generated .gitignore.
diff --git a/evolution/makefile b/evolution/makefile
index d83995e..fddde1b 100644
--- a/evolution/makefile
+++ b/evolution/makefile
@@ -20,11 +20,6 @@ version          \
 data             \
 template
 
-default   := $(out_base)/
-dist      := $(out_base)/.dist
-test      := $(out_base)/.test
-clean     := $(out_base)/.clean
-
 all_tests := $(tests)
 build_tests := $(tests)
 
diff --git a/evolution/template/makefile b/evolution/template/makefile
index 88bf49a..c7777b1 100644
--- a/evolution/template/makefile
+++ b/evolution/template/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
diff --git a/evolution/version/makefile b/evolution/version/makefile
index bcb4819..63bbe72 100644
--- a/evolution/version/makefile
+++ b/evolution/version/makefile
@@ -6,17 +6,22 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
 cxx_tun := driver.cxx
 odb_hdr := test1.hxx test2.hxx test3.hxx
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+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
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Import.
 #
 $(call import,\
@@ -29,20 +34,6 @@ $(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)
 
-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
-
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): odb_common_options = --generate-query \
@@ -75,7 +66,6 @@ $(out_base)/: $(driver)
 #
 name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
 
-
 $(dist): sources := $(cxx_tun)
 $(dist): headers := $(odb_hdr)
 $(dist): export extra_headers := model.hxx
@@ -113,7 +103,7 @@ $(clean):                            \
   $(driver).o.clean                  \
   $(addsuffix .cxx.clean,$(cxx_obj)) \
   $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+  $(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.
 
-- 
cgit v1.1