From e85ad89263dbb2365ef84a86a31932eea1ef1cdc Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 26 Feb 2014 08:29:15 +0200 Subject: Rename skel to gen for consistency, also in examples --- examples/cxx/parser/hello/makefile | 12 ++++++------ examples/cxx/parser/library/makefile | 14 +++++++------- examples/cxx/parser/minimal/makefile | 14 +++++++------- examples/cxx/parser/mixed/makefile | 14 +++++++------- examples/cxx/parser/multiroot/makefile | 14 +++++++------- examples/cxx/parser/polymorphism/makefile | 14 +++++++------- examples/cxx/parser/polyroot/makefile | 14 +++++++------- examples/cxx/parser/wildcard/makefile | 12 ++++++------ examples/cxx/serializer/hello/makefile | 12 ++++++------ examples/cxx/serializer/library/makefile | 14 +++++++------- examples/cxx/serializer/minimal/makefile | 14 +++++++------- examples/cxx/serializer/polymorphism/makefile | 14 +++++++------- examples/cxx/serializer/polyroot/makefile | 14 +++++++------- examples/cxx/serializer/wildcard/makefile | 14 +++++++------- 14 files changed, 95 insertions(+), 95 deletions(-) diff --git a/examples/cxx/parser/hello/makefile b/examples/cxx/parser/hello/makefile index ccf7a81..fbcee2b 100644 --- a/examples/cxx/parser/hello/makefile +++ b/examples/cxx/parser/hello/makefile @@ -27,11 +27,11 @@ $(driver): $(obj) $(xsde.l) $(obj) $(dep): cpp_options := -I$(out_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): $(out_root)/xsde/xsde +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): $(out_root)/xsde/xsde $(call include-dep,$(dep),$(obj),$(gen)) @@ -69,10 +69,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/examples/cxx/parser/library/makefile b/examples/cxx/parser/library/makefile index bc39cb8..21ff015 100644 --- a/examples/cxx/parser/library/makefile +++ b/examples/cxx/parser/library/makefile @@ -33,13 +33,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): xsde_options += --generate-inline --type-map $(src_base)/library.map +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --generate-inline --type-map $(src_base)/library.map -$(skel): $(out_root)/xsde/xsde $(src_base)/library.map +$(gen): $(out_root)/xsde/xsde $(src_base)/library.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -83,10 +83,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/examples/cxx/parser/minimal/makefile b/examples/cxx/parser/minimal/makefile index befe0a8..c0ea6dc 100644 --- a/examples/cxx/parser/minimal/makefile +++ b/examples/cxx/parser/minimal/makefile @@ -27,13 +27,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): xsde_options += --type-map $(src_base)/people.map +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --type-map $(src_base)/people.map -$(skel): $(out_root)/xsde/xsde $(src_base)/people.map +$(gen): $(out_root)/xsde/xsde $(src_base)/people.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -75,10 +75,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/examples/cxx/parser/mixed/makefile b/examples/cxx/parser/mixed/makefile index 9dcfc94..87a3c6f 100644 --- a/examples/cxx/parser/mixed/makefile +++ b/examples/cxx/parser/mixed/makefile @@ -27,13 +27,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): xsde_options += --type-map $(src_base)/text.map +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --type-map $(src_base)/text.map -$(skel): $(out_root)/xsde/xsde $(src_base)/text.map +$(gen): $(out_root)/xsde/xsde $(src_base)/text.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -73,10 +73,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/examples/cxx/parser/multiroot/makefile b/examples/cxx/parser/multiroot/makefile index f03de6e..16368b0 100644 --- a/examples/cxx/parser/multiroot/makefile +++ b/examples/cxx/parser/multiroot/makefile @@ -33,12 +33,12 @@ $(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): xsde_options += --type-map $(src_base)/protocol.map -$(skel): $(out_root)/xsde/xsde $(src_base)/protocol.map +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --type-map $(src_base)/protocol.map +$(gen): $(out_root)/xsde/xsde $(src_base)/protocol.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -84,10 +84,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/examples/cxx/parser/polymorphism/makefile b/examples/cxx/parser/polymorphism/makefile index e1a2da4..b59d0ba 100644 --- a/examples/cxx/parser/polymorphism/makefile +++ b/examples/cxx/parser/polymorphism/makefile @@ -33,12 +33,12 @@ $(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): xsde_options += --generate-polymorphic -$(skel): $(out_root)/xsde/xsde +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --generate-polymorphic +$(gen): $(out_root)/xsde/xsde $(call include-dep,$(dep),$(obj),$(gen)) @@ -80,10 +80,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/examples/cxx/parser/polyroot/makefile b/examples/cxx/parser/polyroot/makefile index 3b10e28..926dd0c 100644 --- a/examples/cxx/parser/polyroot/makefile +++ b/examples/cxx/parser/polyroot/makefile @@ -33,12 +33,12 @@ $(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): xsde_options += --generate-polymorphic -$(skel): $(out_root)/xsde/xsde +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --generate-polymorphic +$(gen): $(out_root)/xsde/xsde $(call include-dep,$(dep),$(obj),$(gen)) @@ -82,10 +82,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/examples/cxx/parser/wildcard/makefile b/examples/cxx/parser/wildcard/makefile index 6debecf..15aac2b 100644 --- a/examples/cxx/parser/wildcard/makefile +++ b/examples/cxx/parser/wildcard/makefile @@ -27,11 +27,11 @@ $(driver): $(obj) $(xsde.l) $(obj) $(dep): cpp_options := -I$(out_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): $(out_root)/xsde/xsde +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): $(out_root)/xsde/xsde $(call include-dep,$(dep),$(obj),$(gen)) @@ -69,10 +69,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/examples/cxx/serializer/hello/makefile b/examples/cxx/serializer/hello/makefile index cac7771..2b657c8 100644 --- a/examples/cxx/serializer/hello/makefile +++ b/examples/cxx/serializer/hello/makefile @@ -27,11 +27,11 @@ $(driver): $(obj) $(xsde.l) $(obj) $(dep): cpp_options := -I$(out_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): $(out_root)/xsde/xsde +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): $(out_root)/xsde/xsde $(call include-dep,$(dep),$(obj),$(gen)) @@ -68,10 +68,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/examples/cxx/serializer/library/makefile b/examples/cxx/serializer/library/makefile index 37e2af2..dce3ec9 100644 --- a/examples/cxx/serializer/library/makefile +++ b/examples/cxx/serializer/library/makefile @@ -33,13 +33,13 @@ $(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): xsde_options += --generate-inline --type-map $(src_base)/library.map +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --generate-inline --type-map $(src_base)/library.map -$(skel): $(out_root)/xsde/xsde $(src_base)/library.map +$(gen): $(out_root)/xsde/xsde $(src_base)/library.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -82,10 +82,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/examples/cxx/serializer/minimal/makefile b/examples/cxx/serializer/minimal/makefile index c71f680..fcc85a4 100644 --- a/examples/cxx/serializer/minimal/makefile +++ b/examples/cxx/serializer/minimal/makefile @@ -27,13 +27,13 @@ $(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): xsde_options += --type-map $(src_base)/people.map +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --type-map $(src_base)/people.map -$(skel): $(out_root)/xsde/xsde $(src_base)/people.map +$(gen): $(out_root)/xsde/xsde $(src_base)/people.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -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/examples/cxx/serializer/polymorphism/makefile b/examples/cxx/serializer/polymorphism/makefile index a8fdaf4..ee4b458 100644 --- a/examples/cxx/serializer/polymorphism/makefile +++ b/examples/cxx/serializer/polymorphism/makefile @@ -33,14 +33,14 @@ $(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): xsde_options += --generate-polymorphic \ +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --generate-polymorphic \ --type-map $(src_base)/supermen.map -$(skel): $(out_root)/xsde/xsde $(src_base)/supermen.map +$(gen): $(out_root)/xsde/xsde $(src_base)/supermen.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -83,10 +83,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/examples/cxx/serializer/polyroot/makefile b/examples/cxx/serializer/polyroot/makefile index c511a61..cf5e09a 100644 --- a/examples/cxx/serializer/polyroot/makefile +++ b/examples/cxx/serializer/polyroot/makefile @@ -33,14 +33,14 @@ $(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): xsde_options += --generate-polymorphic \ +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --generate-polymorphic \ --type-map $(src_base)/supermen.map -$(skel): $(out_root)/xsde/xsde $(src_base)/supermen.map +$(gen): $(out_root)/xsde/xsde $(src_base)/supermen.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -83,10 +83,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/examples/cxx/serializer/wildcard/makefile b/examples/cxx/serializer/wildcard/makefile index 35deda6..969d8ba 100644 --- a/examples/cxx/serializer/wildcard/makefile +++ b/examples/cxx/serializer/wildcard/makefile @@ -27,13 +27,13 @@ $(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): xsde_options += --type-map $(src_base)/email.map +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --type-map $(src_base)/email.map -$(skel): $(out_root)/xsde/xsde $(src_base)/email.map +$(gen): $(out_root)/xsde/xsde $(src_base)/email.map $(call include-dep,$(dep),$(obj),$(gen)) @@ -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) -- cgit v1.1