From dbd1c72bda8f7808724b80434dede49462c03231 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 25 Feb 2014 10:46:38 +0200 Subject: Rename skel to gen for consistency --- tests/cxx/serializer/error-handling/exceptions/makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/cxx/serializer/error-handling/exceptions/makefile') 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) -- cgit v1.1