From 8286ac511144e4f17d34eac9affb97e50646344a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 23 Jul 2014 15:25:44 +0200
Subject: Imported Upstream version 4.0.0

---
 xsd/examples/cxx/parser/mixed/anchor.hxx |  1 -
 xsd/examples/cxx/parser/mixed/driver.cxx |  1 -
 xsd/examples/cxx/parser/mixed/makefile   | 11 +++++------
 xsd/examples/cxx/parser/mixed/text.map   |  1 -
 xsd/examples/cxx/parser/mixed/text.xml   |  1 -
 xsd/examples/cxx/parser/mixed/text.xsd   |  1 -
 6 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'xsd/examples/cxx/parser/mixed')

diff --git a/xsd/examples/cxx/parser/mixed/anchor.hxx b/xsd/examples/cxx/parser/mixed/anchor.hxx
index bc1b54d..3adc90b 100644
--- a/xsd/examples/cxx/parser/mixed/anchor.hxx
+++ b/xsd/examples/cxx/parser/mixed/anchor.hxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/parser/mixed/anchor.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #ifndef ANCHOR_HXX
diff --git a/xsd/examples/cxx/parser/mixed/driver.cxx b/xsd/examples/cxx/parser/mixed/driver.cxx
index 45067f0..3f3cc65 100644
--- a/xsd/examples/cxx/parser/mixed/driver.cxx
+++ b/xsd/examples/cxx/parser/mixed/driver.cxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/parser/mixed/driver.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #include <string>
diff --git a/xsd/examples/cxx/parser/mixed/makefile b/xsd/examples/cxx/parser/mixed/makefile
index 8563a1e..acf8aed 100644
--- a/xsd/examples/cxx/parser/mixed/makefile
+++ b/xsd/examples/cxx/parser/mixed/makefile
@@ -1,6 +1,5 @@
 # file      : examples/cxx/parser/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,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)/text.map
+$(gen): xsd_options += --type-map $(src_base)/text.map
 $(gen): $(out_root)/xsd/xsd $(src_base)/text.map
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
@@ -72,7 +71,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/mixed/text.map b/xsd/examples/cxx/parser/mixed/text.map
index e44caf3..85971c4 100644
--- a/xsd/examples/cxx/parser/mixed/text.map
+++ b/xsd/examples/cxx/parser/mixed/text.map
@@ -1,5 +1,4 @@
 # file      : examples/cxx/parser/mixed/text.map
-# author    : Boris Kolpackov <boris@codesynthesis.com>
 # copyright : not copyrighted - public domain
 
 include "anchor.hxx";
diff --git a/xsd/examples/cxx/parser/mixed/text.xml b/xsd/examples/cxx/parser/mixed/text.xml
index 97d4d21..bfdc881 100644
--- a/xsd/examples/cxx/parser/mixed/text.xml
+++ b/xsd/examples/cxx/parser/mixed/text.xml
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/parser/text/text.xml
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
diff --git a/xsd/examples/cxx/parser/mixed/text.xsd b/xsd/examples/cxx/parser/mixed/text.xsd
index 4929964..92e300c 100644
--- a/xsd/examples/cxx/parser/mixed/text.xsd
+++ b/xsd/examples/cxx/parser/mixed/text.xsd
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/parser/mixed/text.xsd
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
-- 
cgit v1.2.3