aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-02-25 10:46:38 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-02-25 10:46:38 +0200
commitdbd1c72bda8f7808724b80434dede49462c03231 (patch)
tree9ce8757bae16fa7472c54257c21511be047cf2d3
parentd489a18bfbd9ae81a7bcb06fa5c0e0cd22031b43 (diff)
Rename skel to gen for consistency
-rw-r--r--tests/cxx/parser/built-in/makefile16
-rw-r--r--tests/cxx/parser/enumeration/makefile16
-rw-r--r--tests/cxx/parser/error-handling/codes/makefile16
-rw-r--r--tests/cxx/parser/error-handling/exceptions/makefile16
-rw-r--r--tests/cxx/parser/list/makefile16
-rw-r--r--tests/cxx/parser/name-clash/inheritance/makefile16
-rw-r--r--tests/cxx/parser/polymorphism/makefile16
-rw-r--r--tests/cxx/parser/polyrecur/makefile16
-rw-r--r--tests/cxx/parser/recursive/makefile16
-rw-r--r--tests/cxx/parser/reset/makefile16
-rw-r--r--tests/cxx/parser/test-template/makefile16
-rw-r--r--tests/cxx/parser/union/makefile16
-rw-r--r--tests/cxx/parser/validation/all/makefile16
-rw-r--r--tests/cxx/parser/validation/any/makefile16
-rw-r--r--tests/cxx/parser/validation/attribute/makefile16
-rw-r--r--tests/cxx/parser/validation/built-in/any-type/makefile16
-rw-r--r--tests/cxx/parser/validation/choice/makefile16
-rw-r--r--tests/cxx/parser/validation/restriction/makefile16
-rw-r--r--tests/cxx/parser/validation/sequence/makefile16
-rw-r--r--tests/cxx/serializer/all/makefile16
-rw-r--r--tests/cxx/serializer/built-in/makefile16
-rw-r--r--tests/cxx/serializer/choice/makefile16
-rw-r--r--tests/cxx/serializer/complex/makefile16
-rw-r--r--tests/cxx/serializer/enumeration/makefile16
-rw-r--r--tests/cxx/serializer/error-handling/codes/makefile16
-rw-r--r--tests/cxx/serializer/error-handling/exceptions/makefile16
-rw-r--r--tests/cxx/serializer/list/makefile16
-rw-r--r--tests/cxx/serializer/polymorphism/makefile16
-rw-r--r--tests/cxx/serializer/recursive/makefile16
-rw-r--r--tests/cxx/serializer/reset/makefile16
-rw-r--r--tests/cxx/serializer/restriction/makefile16
-rw-r--r--tests/cxx/serializer/sequence/makefile16
-rw-r--r--tests/cxx/serializer/test-template/makefile16
-rw-r--r--tests/cxx/serializer/union/makefile16
-rw-r--r--tests/cxx/serializer/validation/any/makefile16
-rw-r--r--tests/cxx/serializer/validation/attribute/makefile16
-rw-r--r--tests/cxx/serializer/validation/choice/makefile16
-rw-r--r--tests/cxx/serializer/validation/element/makefile16
-rw-r--r--tests/cxx/serializer/validation/sequence/makefile16
-rw-r--r--tests/cxx/serializer/wildcard/makefile16
40 files changed, 320 insertions, 320 deletions
diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile
index d99b6ee..d00a101 100644
--- a/tests/cxx/parser/built-in/makefile
+++ b/tests/cxx/parser/built-in/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -58,7 +58,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -78,10 +78,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/parser/enumeration/makefile b/tests/cxx/parser/enumeration/makefile
index 0a845d2..22f8a35 100644
--- a/tests/cxx/parser/enumeration/makefile
+++ b/tests/cxx/parser/enumeration/makefile
@@ -29,13 +29,13 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
+gen := $(addprefix $(out_base)/,$(genf))
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options += --type-map $(src_base)/test.map
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options += --type-map $(src_base)/test.map
-$(skel): $(out_root)/xsde/xsde $(src_base)/test.map
+$(gen): $(out_root)/xsde/xsde $(src_base)/test.map
$(call include-dep,$(dep),$(obj),$(gen))
@@ -55,7 +55,7 @@ $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \
--cxx "$(cxx)" -hxx "$(hxx)" -gen "$(skelf)" -opt "$(xsde_options)" \
+-cxx "$(cxx)" -hxx "$(hxx)" -gen "$(genf)" -opt "$(xsde_options)" \
-out $(dist_prefix)
$(dist):
@@ -76,10 +76,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/parser/error-handling/codes/makefile b/tests/cxx/parser/error-handling/codes/makefile
index 1aed633..e584253 100644
--- a/tests/cxx/parser/error-handling/codes/makefile
+++ b/tests/cxx/parser/error-handling/codes/makefile
@@ -27,13 +27,13 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
+gen := $(addprefix $(out_base)/,$(genf))
-$(skel): xsde := $(out_root)/xsde/xsde
-$(skel) $(dist) $(dist-win): xsde_options += --no-exceptions \
+$(gen): xsde := $(out_root)/xsde/xsde
+$(gen) $(dist) $(dist-win): xsde_options += --no-exceptions \
--type-map $(src_base)/test.map
-$(skel): $(out_root)/xsde/xsde $(src_base)/test.map
+$(gen): $(out_root)/xsde/xsde $(src_base)/test.map
$(call include-dep,$(dep),$(obj),$(gen))
@@ -52,7 +52,7 @@ $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -72,10 +72,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/parser/error-handling/exceptions/makefile b/tests/cxx/parser/error-handling/exceptions/makefile
index a0ed479..340e8a1 100644
--- a/tests/cxx/parser/error-handling/exceptions/makefile
+++ b/tests/cxx/parser/error-handling/exceptions/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -52,7 +52,7 @@ $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -72,10 +72,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/parser/list/makefile b/tests/cxx/parser/list/makefile
index 6a8a3b3..c119fb6 100644
--- a/tests/cxx/parser/list/makefile
+++ b/tests/cxx/parser/list/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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/parser/name-clash/inheritance/makefile b/tests/cxx/parser/name-clash/inheritance/makefile
index f6491cc..66f2afa 100644
--- a/tests/cxx/parser/name-clash/inheritance/makefile
+++ b/tests/cxx/parser/name-clash/inheritance/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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/parser/polymorphism/makefile b/tests/cxx/parser/polymorphism/makefile
index 47ab76c..89d8132 100644
--- a/tests/cxx/parser/polymorphism/makefile
+++ b/tests/cxx/parser/polymorphism/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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/parser/polyrecur/makefile b/tests/cxx/parser/polyrecur/makefile
index 90dcf26..99f05c6 100644
--- a/tests/cxx/parser/polyrecur/makefile
+++ b/tests/cxx/parser/polyrecur/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile
index 63ae625..7591ebd 100644
--- a/tests/cxx/parser/recursive/makefile
+++ b/tests/cxx/parser/recursive/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -58,7 +58,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -78,10 +78,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/parser/reset/makefile b/tests/cxx/parser/reset/makefile
index 2861423..cfc0a22 100644
--- a/tests/cxx/parser/reset/makefile
+++ b/tests/cxx/parser/reset/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -58,7 +58,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -78,10 +78,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/parser/test-template/makefile b/tests/cxx/parser/test-template/makefile
index 1ac0e07..dc1408d 100644
--- a/tests/cxx/parser/test-template/makefile
+++ b/tests/cxx/parser/test-template/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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/parser/union/makefile b/tests/cxx/parser/union/makefile
index 0fc6040..6091208 100644
--- a/tests/cxx/parser/union/makefile
+++ b/tests/cxx/parser/union/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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/parser/validation/all/makefile b/tests/cxx/parser/validation/all/makefile
index 1cb1868..75fc879 100644
--- a/tests/cxx/parser/validation/all/makefile
+++ b/tests/cxx/parser/validation/all/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -59,7 +59,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -79,10 +79,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/parser/validation/any/makefile b/tests/cxx/parser/validation/any/makefile
index b513f3a..b582e2c 100644
--- a/tests/cxx/parser/validation/any/makefile
+++ b/tests/cxx/parser/validation/any/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -59,7 +59,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -79,10 +79,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/parser/validation/attribute/makefile b/tests/cxx/parser/validation/attribute/makefile
index b104043..d2fb34c 100644
--- a/tests/cxx/parser/validation/attribute/makefile
+++ b/tests/cxx/parser/validation/attribute/makefile
@@ -27,12 +27,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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.xml $(src_base)/test-000.std
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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/parser/validation/built-in/any-type/makefile b/tests/cxx/parser/validation/built-in/any-type/makefile
index 79b4466..62c5b38 100644
--- a/tests/cxx/parser/validation/built-in/any-type/makefile
+++ b/tests/cxx/parser/validation/built-in/any-type/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -59,7 +59,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -79,10 +79,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/parser/validation/choice/makefile b/tests/cxx/parser/validation/choice/makefile
index ddf45f4..4db3bed 100644
--- a/tests/cxx/parser/validation/choice/makefile
+++ b/tests/cxx/parser/validation/choice/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -58,7 +58,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -78,10 +78,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/parser/validation/restriction/makefile b/tests/cxx/parser/validation/restriction/makefile
index f9adfbb..2876b1d 100644
--- a/tests/cxx/parser/validation/restriction/makefile
+++ b/tests/cxx/parser/validation/restriction/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -58,7 +58,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -78,10 +78,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/parser/validation/sequence/makefile b/tests/cxx/parser/validation/sequence/makefile
index 08682d2..e619df8 100644
--- a/tests/cxx/parser/validation/sequence/makefile
+++ b/tests/cxx/parser/validation/sequence/makefile
@@ -29,12 +29,12 @@ $(driver): $(obj) $(xsde.l)
$(obj) $(dep): $(xsde.l.cpp-options)
-skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
-skel := $(addprefix $(out_base)/,$(skelf))
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.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))
@@ -58,7 +58,7 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src
# Dist.
#
$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -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))
@@ -78,10 +78,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/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)