From bada6666c70977a058755ccf232e7d67b24adeed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 15:21:29 +0200 Subject: New upstream release --- xsd/examples/cxx/tree/library/driver.cxx | 1 - xsd/examples/cxx/tree/library/library.xml | 1 - xsd/examples/cxx/tree/library/library.xsd | 1 - xsd/examples/cxx/tree/library/makefile | 11 +++++------ 4 files changed, 5 insertions(+), 9 deletions(-) (limited to 'xsd/examples/cxx/tree/library') diff --git a/xsd/examples/cxx/tree/library/driver.cxx b/xsd/examples/cxx/tree/library/driver.cxx index ae68b87..5913ddf 100644 --- a/xsd/examples/cxx/tree/library/driver.cxx +++ b/xsd/examples/cxx/tree/library/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/library/driver.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include // std::auto_ptr diff --git a/xsd/examples/cxx/tree/library/library.xml b/xsd/examples/cxx/tree/library/library.xml index e9acb75..ca4ca9c 100644 --- a/xsd/examples/cxx/tree/library/library.xml +++ b/xsd/examples/cxx/tree/library/library.xml @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/library/library.xsd b/xsd/examples/cxx/tree/library/library.xsd index baf2221..b183efc 100644 --- a/xsd/examples/cxx/tree/library/library.xsd +++ b/xsd/examples/cxx/tree/library/library.xsd @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/library/makefile b/xsd/examples/cxx/tree/library/makefile index 6fdd942..3db03de 100644 --- a/xsd/examples/cxx/tree/library/makefile +++ b/xsd/examples/cxx/tree/library/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/library/makefile -# author : Boris Kolpackov -# 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,18 +28,18 @@ $(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) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-inline --generate-ostream \ +$(gen): xsd_options += --generate-inline --generate-ostream \ --generate-serialization $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -69,7 +68,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. # -- cgit v1.2.3