diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2014-02-25 10:46:38 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-02-25 10:46:38 +0200 |
commit | dbd1c72bda8f7808724b80434dede49462c03231 (patch) | |
tree | 9ce8757bae16fa7472c54257c21511be047cf2d3 /tests/cxx/serializer/validation | |
parent | d489a18bfbd9ae81a7bcb06fa5c0e0cd22031b43 (diff) |
Rename skel to gen for consistency
Diffstat (limited to 'tests/cxx/serializer/validation')
-rw-r--r-- | tests/cxx/serializer/validation/any/makefile | 16 | ||||
-rw-r--r-- | tests/cxx/serializer/validation/attribute/makefile | 16 | ||||
-rw-r--r-- | tests/cxx/serializer/validation/choice/makefile | 16 | ||||
-rw-r--r-- | tests/cxx/serializer/validation/element/makefile | 16 | ||||
-rw-r--r-- | tests/cxx/serializer/validation/sequence/makefile | 16 |
5 files changed, 40 insertions, 40 deletions
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) |