Imported Upstream version 4.0.0upstream/4.0.0

10 files changed, 5 insertions, 15 deletions

diff --git a/xsd/examples/cxx/parser/multiroot/balance.xml b/xsd/examples/cxx/parser/multiroot/balance.xml
index df0a6e9..71ed493 100644
--- a/xsd/examples/cxx/parser/multiroot/balance.xml
+++ b/xsd/examples/cxx/parser/multiroot/balance.xml
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/parser/multiroot/balance.xml
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
diff --git a/xsd/examples/cxx/parser/multiroot/deposit.xml b/xsd/examples/cxx/parser/multiroot/deposit.xml
index 3043c52..70f0c77 100644
--- a/xsd/examples/cxx/parser/multiroot/deposit.xml
+++ b/xsd/examples/cxx/parser/multiroot/deposit.xml
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/parser/multiroot/deposit.xml
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
diff --git a/xsd/examples/cxx/parser/multiroot/driver.cxx b/xsd/examples/cxx/parser/multiroot/driver.cxx
index 9e5d874..3b32898 100644
--- a/xsd/examples/cxx/parser/multiroot/driver.cxx
+++ b/xsd/examples/cxx/parser/multiroot/driver.cxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/parser/multiroot/driver.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #include <memory>   // std::auto_ptr
diff --git a/xsd/examples/cxx/parser/multiroot/makefile b/xsd/examples/cxx/parser/multiroot/makefile
index 57fa732..60c6bac 100644
--- a/xsd/examples/cxx/parser/multiroot/makefile
+++ b/xsd/examples/cxx/parser/multiroot/makefile
@@ -1,6 +1,5 @@
 # file      : examples/cxx/parser/multiroot/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,17 +28,17 @@ $(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=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
 gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options := --type-map $(src_base)/protocol.map
+$(gen): xsd_options += --type-map $(src_base)/protocol.map
 $(gen): $(out_root)/xsd/xsd $(src_base)/protocol.map
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
@@ -80,7 +79,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/parser/multiroot/protocol-pimpl.cxx b/xsd/examples/cxx/parser/multiroot/protocol-pimpl.cxx
index 09a04b3..b5ec1b2 100644
--- a/xsd/examples/cxx/parser/multiroot/protocol-pimpl.cxx
+++ b/xsd/examples/cxx/parser/multiroot/protocol-pimpl.cxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/parser/multiroot/protocol-pimpl.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #include "protocol-pimpl.hxx"
diff --git a/xsd/examples/cxx/parser/multiroot/protocol-pimpl.hxx b/xsd/examples/cxx/parser/multiroot/protocol-pimpl.hxx
index 0531790..c0693cb 100644
--- a/xsd/examples/cxx/parser/multiroot/protocol-pimpl.hxx
+++ b/xsd/examples/cxx/parser/multiroot/protocol-pimpl.hxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/parser/multiroot/protocol-pimpl.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #ifndef PROTOCOL_PIMPL_HXX
diff --git a/xsd/examples/cxx/parser/multiroot/protocol.hxx b/xsd/examples/cxx/parser/multiroot/protocol.hxx
index f076140..bbf5b56 100644
--- a/xsd/examples/cxx/parser/multiroot/protocol.hxx
+++ b/xsd/examples/cxx/parser/multiroot/protocol.hxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/parser/multiroot/protocol.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #ifndef PROTOCOL_HXX
diff --git a/xsd/examples/cxx/parser/multiroot/protocol.map b/xsd/examples/cxx/parser/multiroot/protocol.map
index 7389fa9..8d8ac9f 100644
--- a/xsd/examples/cxx/parser/multiroot/protocol.map
+++ b/xsd/examples/cxx/parser/multiroot/protocol.map
@@ -1,5 +1,4 @@
 # file      : examples/cxx/parser/multiroot/protocol.map
-# author    : Boris Kolpackov <boris@codesynthesis.com>
 # copyright : not copyrighted - public domain
 
 namespace http://www.codesynthesis.com/protocol ::protocol
diff --git a/xsd/examples/cxx/parser/multiroot/protocol.xsd b/xsd/examples/cxx/parser/multiroot/protocol.xsd
index 4b29926..e0ecc29 100644
--- a/xsd/examples/cxx/parser/multiroot/protocol.xsd
+++ b/xsd/examples/cxx/parser/multiroot/protocol.xsd
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/parser/multiroot/protocol.xsd
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
diff --git a/xsd/examples/cxx/parser/multiroot/withdraw.xml b/xsd/examples/cxx/parser/multiroot/withdraw.xml
index 7a80aa7..6d5cb39 100644
--- a/xsd/examples/cxx/parser/multiroot/withdraw.xml
+++ b/xsd/examples/cxx/parser/multiroot/withdraw.xml
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/parser/multiroot/withdraw.xml
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->