Imported Upstream version 4.0.0upstream/4.0.0

6 files changed, 6 insertions, 12 deletions

diff --git a/xsd/examples/cxx/tree/custom/mixed/driver.cxx b/xsd/examples/cxx/tree/custom/mixed/driver.cxx
index a6dd0a7..0378f18 100644
--- a/xsd/examples/cxx/tree/custom/mixed/driver.cxx
+++ b/xsd/examples/cxx/tree/custom/mixed/driver.cxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/tree/custom/mixed/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/mixed/makefile b/xsd/examples/cxx/tree/custom/mixed/makefile
index 144299e..54610f0 100644
--- a/xsd/examples/cxx/tree/custom/mixed/makefile
+++ b/xsd/examples/cxx/tree/custom/mixed/makefile
@@ -1,6 +1,5 @@
 # file      : examples/cxx/tree/custom/mixed/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,15 +39,15 @@ $(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-serialization \
 --custom-type bio=/bio_base \
---hxx-epilogue '\\\#include "people-custom.hxx"'
+--hxx-epilogue '\#include "people-custom.hxx"'
 
 $(gen): $(out_root)/xsd/xsd
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
@@ -81,7 +80,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/mixed/people-custom.cxx b/xsd/examples/cxx/tree/custom/mixed/people-custom.cxx
index af07e22..7cd1947 100644
--- a/xsd/examples/cxx/tree/custom/mixed/people-custom.cxx
+++ b/xsd/examples/cxx/tree/custom/mixed/people-custom.cxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/tree/custom/mixed/people-custom.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #include <ostream>
diff --git a/xsd/examples/cxx/tree/custom/mixed/people-custom.hxx b/xsd/examples/cxx/tree/custom/mixed/people-custom.hxx
index f05ba4a..54dfb21 100644
--- a/xsd/examples/cxx/tree/custom/mixed/people-custom.hxx
+++ b/xsd/examples/cxx/tree/custom/mixed/people-custom.hxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/tree/custom/mixed/people-custom.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 // Do not include this file directly, use people.hxx instead. This
diff --git a/xsd/examples/cxx/tree/custom/mixed/people.xml b/xsd/examples/cxx/tree/custom/mixed/people.xml
index 4e5c0ca..47e68b9 100644
--- a/xsd/examples/cxx/tree/custom/mixed/people.xml
+++ b/xsd/examples/cxx/tree/custom/mixed/people.xml
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/tree/custom/mixed/people.xml
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
diff --git a/xsd/examples/cxx/tree/custom/mixed/people.xsd b/xsd/examples/cxx/tree/custom/mixed/people.xsd
index 40c1fc1..03e6c97 100644
--- a/xsd/examples/cxx/tree/custom/mixed/people.xsd
+++ b/xsd/examples/cxx/tree/custom/mixed/people.xsd
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/tree/custom/mixed/people.xsd
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->