From bada6666c70977a058755ccf232e7d67b24adeed 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:21:29 +0200
Subject: New upstream release

---
 xsd/examples/cxx/tree/embedded/makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'xsd/examples/cxx/tree/embedded/makefile')

diff --git a/xsd/examples/cxx/tree/embedded/makefile b/xsd/examples/cxx/tree/embedded/makefile
index 0550bd5..d0fdc33 100644
--- a/xsd/examples/cxx/tree/embedded/makefile
+++ b/xsd/examples/cxx/tree/embedded/makefile
@@ -1,6 +1,5 @@
 # file      : examples/cxx/tree/embedded/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
@@ -33,14 +32,13 @@ $(call import,\
 $(driver): $(obj) $(xerces_c.l)
 $(xsdbin): $(obj2) $(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) $(obj2) $(dep): $(xerces_c.l.cpp-options)
 
 genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
 gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options :=
 $(gen): $(out_root)/xsd/xsd
 
 genf += $(xsd:.xsd=-schema.hxx) $(xsd:.xsd=-schema.cxx)
@@ -50,7 +48,7 @@ $(out_base)/%: xsdbin := $(xsdbin)
 $(out_base)/%-schema.hxx $(out_base)/%-schema.cxx: $(src_base)/%.xsd $(xsdbin)
 	$(call message,xsdbin $<,$(xsdbin) --output-dir $(out_base) $<)
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
@@ -83,10 +81,11 @@ $(dist-common):
 $(dist): $(dist-common)
 	$(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README)
 
+$(dist-win): |$(out_root)/.dist-pre
 $(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)
+        # Note: solution files are not automatically generated.
 
 # Clean.
 #
@@ -115,9 +114,10 @@ endif
 $(call include,$(bld_root)/cxx/o-e.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/cxx-d.make)
-$(call include,$(bld_root)/install.make)
 $(call include,$(scf_root)/xsd/tree/xsd-cxx.make)
 
+$(call include,$(bld_root)/install.make)
+
 # Dependencies.
 #
 $(call import,$(src_root)/xsd/makefile)
-- 
cgit v1.2.3