diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 15:25:44 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 15:25:44 +0200 |
| commit | 8286ac511144e4f17d34eac9affb97e50646344a (patch) | |
| tree | f1af7320d7b6be6be059216d0ad08ac7b4f73fd0 /xsd/examples/cxx/tree/custom/wildcard | |
| parent | a15cf65c44d5c224169c32ef5495b68c758134b7 (diff) | |
Imported Upstream version 4.0.0upstream/4.0.0
Diffstat (limited to 'xsd/examples/cxx/tree/custom/wildcard')
6 files changed, 6 insertions, 12 deletions
diff --git a/xsd/examples/cxx/tree/custom/wildcard/driver.cxx b/xsd/examples/cxx/tree/custom/wildcard/driver.cxx index d63fb11..d29f125 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/driver.cxx +++ b/xsd/examples/cxx/tree/custom/wildcard/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/wildcard/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <memory> // std::auto_ptr diff --git a/xsd/examples/cxx/tree/custom/wildcard/makefile b/xsd/examples/cxx/tree/custom/wildcard/makefile index d06fff3..55e94b0 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/makefile +++ b/xsd/examples/cxx/tree/custom/wildcard/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/wildcard/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make @@ -29,7 +28,7 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) @@ -40,16 +39,16 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-ostream \ --generate-serialization \ --custom-type data=/data_base \ ---hxx-epilogue '\\\#include "wildcard-custom.hxx"' +--hxx-epilogue '\#include "wildcard-custom.hxx"' $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -82,7 +81,7 @@ $(dist): $(dist-common) $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) # Clean. diff --git a/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.cxx b/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.cxx index 422a4b3..006f93a 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.cxx +++ b/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/wildcard/wildcard-custom.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <ostream> diff --git a/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.hxx b/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.hxx index 2c58cc8..0546d38 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.hxx +++ b/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/wildcard/wildcard-custom.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use wildcard.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/wildcard/wildcard.xml b/xsd/examples/cxx/tree/custom/wildcard/wildcard.xml index c980193..80f215a 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/wildcard.xml +++ b/xsd/examples/cxx/tree/custom/wildcard/wildcard.xml @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/wildcard/wildcard.xml -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/wildcard/wildcard.xsd b/xsd/examples/cxx/tree/custom/wildcard/wildcard.xsd index ccce30b..1a32b1e 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/wildcard.xsd +++ b/xsd/examples/cxx/tree/custom/wildcard/wildcard.xsd @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/wildcard/wildcard.xsd -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> |