From c34af468acc94691d0a5954eae38a89506bc620e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 17 Sep 2009 18:56:22 +0200 Subject: Generate .gitignore in compiler, test and example makefiles --- examples/cxx/tree/binary/boost/makefile | 31 ++++++++++++++--------- examples/cxx/tree/binary/cdr/makefile | 30 ++++++++++++---------- examples/cxx/tree/binary/xdr/makefile | 40 ++++++++++++++---------------- examples/cxx/tree/caching/makefile | 26 +++++++++++-------- examples/cxx/tree/custom/calendar/makefile | 26 ++++++++++++------- examples/cxx/tree/custom/comments/makefile | 26 ++++++++++++------- examples/cxx/tree/custom/contacts/makefile | 26 ++++++++++++------- examples/cxx/tree/custom/double/makefile | 26 ++++++++++++------- examples/cxx/tree/custom/taxonomy/makefile | 26 ++++++++++++------- examples/cxx/tree/custom/wildcard/makefile | 26 ++++++++++++------- examples/cxx/tree/dbxml/makefile | 27 ++++++++++++-------- examples/cxx/tree/hello/makefile | 26 +++++++++++-------- examples/cxx/tree/library/makefile | 29 +++++++++++++--------- examples/cxx/tree/messaging/makefile | 26 ++++++++++++------- examples/cxx/tree/mixed/makefile | 26 +++++++++++-------- examples/cxx/tree/multiroot/makefile | 26 +++++++++++-------- examples/cxx/tree/performance/makefile | 27 ++++++++++++-------- examples/cxx/tree/polymorphism/makefile | 27 ++++++++++++-------- examples/cxx/tree/streaming/makefile | 29 +++++++++++++--------- examples/cxx/tree/wildcard/makefile | 28 +++++++++++++-------- examples/cxx/tree/xpath/makefile | 22 +++++++++++----- 21 files changed, 354 insertions(+), 222 deletions(-) (limited to 'examples/cxx/tree') diff --git a/examples/cxx/tree/binary/boost/makefile b/examples/cxx/tree/binary/boost/makefile index f40c6d6..de332f8 100644 --- a/examples/cxx/tree/binary/boost/makefile +++ b/examples/cxx/tree/binary/boost/makefile @@ -33,21 +33,17 @@ $(driver): $(obj) $(xerces_c.l) $(boost_serialization.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd -I$(src_root) $(obj) $(dep): $(xerces_c.l.cpp-options) $(boost_serialization.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ ---generate-ostream \ +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): xsd := $(out_root)/xsd/xsd + +$(gen): xsd_options := --generate-ostream \ --hxx-prologue-file $(src_base)/library-prologue.hxx \ ---generate-insertion boost::archive::text_oarchive \ +--generate-insertion boost::archive::text_oarchive \ --generate-extraction boost::archive::text_iarchive -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -66,6 +62,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/binary/cdr/makefile b/examples/cxx/tree/binary/cdr/makefile index e811695..25e88e7 100644 --- a/examples/cxx/tree/binary/cdr/makefile +++ b/examples/cxx/tree/binary/cdr/makefile @@ -33,20 +33,13 @@ $(driver): $(obj) $(xerces_c.l) $(ace.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) $(ace.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ ---generate-ostream \ ---generate-insertion ACE_OutputCDR \ ---generate-extraction ACE_InputCDR - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-ostream \ +--generate-insertion ACE_OutputCDR --generate-extraction ACE_InputCDR +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -65,6 +58,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/binary/xdr/makefile b/examples/cxx/tree/binary/xdr/makefile index 6414fe9..cd61637 100644 --- a/examples/cxx/tree/binary/xdr/makefile +++ b/examples/cxx/tree/binary/xdr/makefile @@ -14,39 +14,26 @@ dep := $(obj:.o=.o.d) driver := $(out_base)/driver clean := $(out_base)/.clean - # Import. # $(call import,\ $(scf_root)/import/libxerces-c/stub.make,\ l: xerces_c.l,cpp-options: xerces_c.l.cpp-options) -$(call import,\ - $(scf_root)/import/libace/stub.make,\ - l: ace.l,cpp-options: ace.l.cpp-options) - - # Build. # -$(driver): $(obj) $(xerces_c.l) $(ace.l) -lnsl +$(driver): $(obj) $(xerces_c.l) -lnsl $(obj) $(dep): cpp_options := -I$(src_root)/libxsd -$(obj) $(dep): $(xerces_c.l.cpp-options) $(ace.l.cpp-options) +$(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ ---generate-ostream \ ---generate-insertion XDR \ ---generate-extraction XDR - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-ostream \ +--generate-insertion XDR --generate-extraction XDR +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -65,6 +52,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/caching/makefile b/examples/cxx/tree/caching/makefile index 2f4beaa..45587a9 100644 --- a/examples/cxx/tree/caching/makefile +++ b/examples/cxx/tree/caching/makefile @@ -29,17 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -58,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/custom/calendar/makefile b/examples/cxx/tree/custom/calendar/makefile index 36525aa..129333f 100644 --- a/examples/cxx/tree/custom/calendar/makefile +++ b/examples/cxx/tree/custom/calendar/makefile @@ -42,22 +42,19 @@ $(out_root)/xsd/xsd cxx-tree --output-dir $(out_base) --generate-xml-schema \ # # -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ +$(gen): xsd_options := \ --generate-inline \ --extern-xml-schema xml-schema.xsd -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -77,6 +74,17 @@ $(clean): $(driver).o.clean \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) $(call message,rm $$1,rm -f $$1,$(out_base)/xml-schema.hxx) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver xml-schema.hxx $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/custom/comments/makefile b/examples/cxx/tree/custom/comments/makefile index a12b3fe..f1074ec 100644 --- a/examples/cxx/tree/custom/comments/makefile +++ b/examples/cxx/tree/custom/comments/makefile @@ -38,20 +38,17 @@ $(out_root)/xsd/xsd cxx-tree --output-dir $(out_base) --generate-xml-schema \ # # -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ +$(gen): xsd := $(out_root)/xsd/xsd + +$(gen): xsd_options := \ --generate-inline \ --generate-serialization \ --extern-xml-schema xml-schema.xsd -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -71,6 +68,17 @@ $(clean): $(driver).o.clean \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) $(call message,rm $$1,rm -f $$1,$(out_base)/xml-schema.hxx) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver xml-schema.hxx $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/custom/contacts/makefile b/examples/cxx/tree/custom/contacts/makefile index 9a8dc89..d4ddbe5 100644 --- a/examples/cxx/tree/custom/contacts/makefile +++ b/examples/cxx/tree/custom/contacts/makefile @@ -29,23 +29,20 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ +$(gen): xsd_options := \ --generate-inline \ --custom-type contact=/contact_base \ --hxx-epilogue '\\\#include "contacts-custom.hxx"' -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -64,6 +61,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/custom/double/makefile b/examples/cxx/tree/custom/double/makefile index 249ed01..e8bec43 100644 --- a/examples/cxx/tree/custom/double/makefile +++ b/examples/cxx/tree/custom/double/makefile @@ -35,18 +35,15 @@ $(out_root)/xsd/xsd cxx-tree --output-dir $(out_base) --generate-xml-schema \ --generate-serialization --custom-type double=double \ --hxx-epilogue '\#include "double-custom.hxx"' xml-schema.xsd) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ +$(gen): xsd := $(out_root)/xsd/xsd + +$(gen): xsd_options := \ --generate-serialization --extern-xml-schema xml-schema.xsd -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -66,6 +63,17 @@ $(clean): $(driver).o.clean \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) $(call message,rm $$1,rm -f $$1,$(out_base)/xml-schema.hxx) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver xml-schema.hxx $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/custom/taxonomy/makefile b/examples/cxx/tree/custom/taxonomy/makefile index a5fa4a3..02ea144 100644 --- a/examples/cxx/tree/custom/taxonomy/makefile +++ b/examples/cxx/tree/custom/taxonomy/makefile @@ -29,16 +29,15 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=-fwd.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ +$(gen): xsd_options := \ --generate-inline \ --generate-forward \ --generate-polymorphic \ @@ -48,9 +47,7 @@ $(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ --fwd-prologue '\\\#include "people-custom-fwd.hxx"' \ --hxx-prologue '\\\#include "people-custom.hxx"' -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -69,6 +66,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/custom/wildcard/makefile b/examples/cxx/tree/custom/wildcard/makefile index 87f95ea..49c5306 100644 --- a/examples/cxx/tree/custom/wildcard/makefile +++ b/examples/cxx/tree/custom/wildcard/makefile @@ -29,25 +29,22 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ +$(gen): xsd_options := \ --generate-inline \ --generate-ostream \ --generate-serialization \ --custom-type data=/data_base \ --hxx-epilogue '\\\#include "wildcard-custom.hxx"' -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -66,6 +63,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/dbxml/makefile b/examples/cxx/tree/dbxml/makefile index 2a5ba4e..424a6b8 100644 --- a/examples/cxx/tree/dbxml/makefile +++ b/examples/cxx/tree/dbxml/makefile @@ -33,18 +33,12 @@ $(driver): $(obj) $(xerces_c.l) $(dbxml.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd -DDBXML_DOM $(obj) $(dep): $(xerces_c.l.cpp-options) $(dbxml.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := --generate-serialization \ - --generate-ostream - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-serialization --generate-ostream +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -63,6 +57,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/hello/makefile b/examples/cxx/tree/hello/makefile index 95288f5..6994941 100644 --- a/examples/cxx/tree/hello/makefile +++ b/examples/cxx/tree/hello/makefile @@ -29,17 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -58,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/library/makefile b/examples/cxx/tree/library/makefile index ceecbb2..83446c3 100644 --- a/examples/cxx/tree/library/makefile +++ b/examples/cxx/tree/library/makefile @@ -29,19 +29,13 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := --generate-inline \ - --generate-ostream \ - --generate-serialization - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-inline --generate-ostream \ +--generate-serialization +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -60,6 +54,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/messaging/makefile b/examples/cxx/tree/messaging/makefile index 2f4c7fe..7f7ced1 100644 --- a/examples/cxx/tree/messaging/makefile +++ b/examples/cxx/tree/messaging/makefile @@ -29,18 +29,15 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := --root-element-all \ +$(gen): xsd := $(out_root)/xsd/xsd + +$(gen): xsd_options := --root-element-all \ --generate-element-type --generate-element-map --generate-serialization -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -59,6 +56,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/mixed/makefile b/examples/cxx/tree/mixed/makefile index cc81bca..b2e6338 100644 --- a/examples/cxx/tree/mixed/makefile +++ b/examples/cxx/tree/mixed/makefile @@ -29,17 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -59,6 +54,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/multiroot/makefile b/examples/cxx/tree/multiroot/makefile index 37e2722..0a6be1f 100644 --- a/examples/cxx/tree/multiroot/makefile +++ b/examples/cxx/tree/multiroot/makefile @@ -29,17 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := --root-element-all - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --root-element-all +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -58,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/performance/makefile b/examples/cxx/tree/performance/makefile index f60e281..46cd783 100644 --- a/examples/cxx/tree/performance/makefile +++ b/examples/cxx/tree/performance/makefile @@ -29,18 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := \ ---generate-inline --generate-serialization - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-inline --generate-serialization +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -59,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/polymorphism/makefile b/examples/cxx/tree/polymorphism/makefile index f4e0b16..f9319d0 100644 --- a/examples/cxx/tree/polymorphism/makefile +++ b/examples/cxx/tree/polymorphism/makefile @@ -29,17 +29,13 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := --generate-polymorphic --generate-serialization --root-element-last - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-polymorphic --generate-serialization \ +--root-element-last +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -59,6 +55,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/streaming/makefile b/examples/cxx/tree/streaming/makefile index 0c478e0..f023af4 100644 --- a/examples/cxx/tree/streaming/makefile +++ b/examples/cxx/tree/streaming/makefile @@ -29,19 +29,13 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := --generate-serialization \ - --suppress-parsing \ - --root-element-all - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-serialization --suppress-parsing \ +--root-element-all +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -61,6 +55,17 @@ $(clean): $(driver).o.clean \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) $(call message,rm $$1,rm -f $$1,$(out_base)/out.xml) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/wildcard/makefile b/examples/cxx/tree/wildcard/makefile index 6a287e6..2e11468 100644 --- a/examples/cxx/tree/wildcard/makefile +++ b/examples/cxx/tree/wildcard/makefile @@ -29,18 +29,13 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd_options := --generate-inline \ ---generate-wildcard --generate-serialization --root-element message - -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-inline --generate-wildcard \ +--generate-serialization --root-element message +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -59,6 +54,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/tree/xpath/makefile b/examples/cxx/tree/xpath/makefile index 5e73cfb..a8ce9d9 100644 --- a/examples/cxx/tree/xpath/makefile +++ b/examples/cxx/tree/xpath/makefile @@ -33,13 +33,12 @@ $(driver): $(obj) $(xqilla.l) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xqilla.l.cpp-options) $(xerces_c.l.cpp-options) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): xsd := $(out_root)/xsd/xsd +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(out_base)/$(xsd:.xsd=.hxx) \ -$(out_base)/$(xsd:.xsd=.ixx) \ -$(out_base)/$(xsd:.xsd=.cxx): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -58,6 +57,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # -- cgit v1.1