Rename skel to gen for consistency

21 files changed, 168 insertions, 168 deletions

diff --git a/tests/cxx/serializer/all/makefile b/tests/cxx/serializer/all/makefile
index ed66f85..e88b079 100644
--- a/tests/cxx/serializer/all/makefile
+++ b/tests/cxx/serializer/all/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/built-in/makefile b/tests/cxx/serializer/built-in/makefile
index 84a9757..e946350 100644
--- a/tests/cxx/serializer/built-in/makefile
+++ b/tests/cxx/serializer/built-in/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -61,7 +61,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -81,10 +81,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/choice/makefile b/tests/cxx/serializer/choice/makefile
index 9a5ed8f..ef1ca20 100644
--- a/tests/cxx/serializer/choice/makefile
+++ b/tests/cxx/serializer/choice/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/complex/makefile b/tests/cxx/serializer/complex/makefile
index 862604b..55b5eb8 100644
--- a/tests/cxx/serializer/complex/makefile
+++ b/tests/cxx/serializer/complex/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/enumeration/makefile b/tests/cxx/serializer/enumeration/makefile
index 16d5416..0f00a05 100644
--- a/tests/cxx/serializer/enumeration/makefile
+++ b/tests/cxx/serializer/enumeration/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
 $(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base)
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options += --type-map $(src_base)/test.map
-$(skel): $(out_root)/xsde/xsde $(src_base)/test.map
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options += --type-map $(src_base)/test.map
+$(gen): $(out_root)/xsde/xsde $(src_base)/test.map
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -53,7 +53,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer \
--xsd "$(xsd)" -cxx "$(cxx)" -hxx "$(hxx)" -gen "$(skelf)" \
+-xsd "$(xsd)" -cxx "$(cxx)" -hxx "$(hxx)" -gen "$(genf)" \
 -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
@@ -74,10 +74,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/error-handling/codes/makefile b/tests/cxx/serializer/error-handling/codes/makefile
index e3438de..f84f214 100644
--- a/tests/cxx/serializer/error-handling/codes/makefile
+++ b/tests/cxx/serializer/error-handling/codes/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/error-handling/exceptions/makefile b/tests/cxx/serializer/error-handling/exceptions/makefile
index 9b34da6..3854d24 100644
--- a/tests/cxx/serializer/error-handling/exceptions/makefile
+++ b/tests/cxx/serializer/error-handling/exceptions/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/list/makefile b/tests/cxx/serializer/list/makefile
index d1cc72a..520963b 100644
--- a/tests/cxx/serializer/list/makefile
+++ b/tests/cxx/serializer/list/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/polymorphism/makefile b/tests/cxx/serializer/polymorphism/makefile
index 5e3c543..14f1cbe 100644
--- a/tests/cxx/serializer/polymorphism/makefile
+++ b/tests/cxx/serializer/polymorphism/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options += --generate-polymorphic
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options += --generate-polymorphic
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/recursive/makefile b/tests/cxx/serializer/recursive/makefile
index d2a9af6..f82aec5 100644
--- a/tests/cxx/serializer/recursive/makefile
+++ b/tests/cxx/serializer/recursive/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/reset/makefile b/tests/cxx/serializer/reset/makefile
index 27dcee8..1455ee2 100644
--- a/tests/cxx/serializer/reset/makefile
+++ b/tests/cxx/serializer/reset/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/restriction/makefile b/tests/cxx/serializer/restriction/makefile
index cb97114..6700d11 100644
--- a/tests/cxx/serializer/restriction/makefile
+++ b/tests/cxx/serializer/restriction/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/sequence/makefile b/tests/cxx/serializer/sequence/makefile
index 88bbdf3..e424dbd 100644
--- a/tests/cxx/serializer/sequence/makefile
+++ b/tests/cxx/serializer/sequence/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/test-template/makefile b/tests/cxx/serializer/test-template/makefile
index 8b4be80..bf62d8e 100644
--- a/tests/cxx/serializer/test-template/makefile
+++ b/tests/cxx/serializer/test-template/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/union/makefile b/tests/cxx/serializer/union/makefile
index 6461ac4..5b98e8a 100644
--- a/tests/cxx/serializer/union/makefile
+++ b/tests/cxx/serializer/union/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/validation/any/makefile b/tests/cxx/serializer/validation/any/makefile
index 321d2b8..44f0495 100644
--- a/tests/cxx/serializer/validation/any/makefile
+++ b/tests/cxx/serializer/validation/any/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/validation/attribute/makefile b/tests/cxx/serializer/validation/attribute/makefile
index 7e3b6b9..a7660d8 100644
--- a/tests/cxx/serializer/validation/attribute/makefile
+++ b/tests/cxx/serializer/validation/attribute/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/validation/choice/makefile b/tests/cxx/serializer/validation/choice/makefile
index 439e0ab..5c0277e 100644
--- a/tests/cxx/serializer/validation/choice/makefile
+++ b/tests/cxx/serializer/validation/choice/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/validation/element/makefile b/tests/cxx/serializer/validation/element/makefile
index 5fbfcad..995e676 100644
--- a/tests/cxx/serializer/validation/element/makefile
+++ b/tests/cxx/serializer/validation/element/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/validation/sequence/makefile b/tests/cxx/serializer/validation/sequence/makefile
index ddec170..c0c3cec 100644
--- a/tests/cxx/serializer/validation/sequence/makefile
+++ b/tests/cxx/serializer/validation/sequence/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)
diff --git a/tests/cxx/serializer/wildcard/makefile b/tests/cxx/serializer/wildcard/makefile
index d7e9e94..5a23530 100644
--- a/tests/cxx/serializer/wildcard/makefile
+++ b/tests/cxx/serializer/wildcard/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
 
 $(obj) $(dep): $(xsde.l.cpp-options)
 
-skelf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
-skel  := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.ixx) $(xsd:.xsd=-sskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
 
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel): $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options +=
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen): $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options +=
 
 $(call include-dep,$(dep),$(obj),$(gen))
 
@@ -51,7 +51,7 @@ $(test): $(driver) $(src_base)/test-000.std
 # Dist.
 #
 $(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-serializer -xsd "$(xsd)" \
--cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix)
 
 $(dist):
 	$(call message,install $(src_base),$(scf_root)/dist $(opt))
@@ -71,10 +71,10 @@ $(clean): $(driver).o.clean                                \
 # Generated .gitignore.
 #
 ifeq ($(out_base),$(src_base))
-$(skel): | $(out_base)/.gitignore
+$(gen): | $(out_base)/.gitignore
 $(driver): | $(out_base)/.gitignore
 
-$(out_base)/.gitignore: files := driver $(skelf)
+$(out_base)/.gitignore: files := driver $(genf)
 $(clean): $(out_base)/.gitignore.clean
 
 $(call include,$(bld_root)/git/gitignore.make)