From 8286ac511144e4f17d34eac9affb97e50646344a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 15:25:44 +0200 Subject: Imported Upstream version 4.0.0 --- xsd/examples/cxx/parser/library/driver.cxx | 1 - xsd/examples/cxx/parser/library/library-pimpl.cxx | 1 - xsd/examples/cxx/parser/library/library-pimpl.hxx | 1 - xsd/examples/cxx/parser/library/library.hxx | 1 - xsd/examples/cxx/parser/library/library.map | 1 - xsd/examples/cxx/parser/library/library.xml | 1 - xsd/examples/cxx/parser/library/library.xsd | 1 - xsd/examples/cxx/parser/library/makefile | 11 +++++------ 8 files changed, 5 insertions(+), 13 deletions(-) (limited to 'xsd/examples/cxx/parser/library') diff --git a/xsd/examples/cxx/parser/library/driver.cxx b/xsd/examples/cxx/parser/library/driver.cxx index ea5f1d9..3b63801 100644 --- a/xsd/examples/cxx/parser/library/driver.cxx +++ b/xsd/examples/cxx/parser/library/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/parser/library/driver.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include diff --git a/xsd/examples/cxx/parser/library/library-pimpl.cxx b/xsd/examples/cxx/parser/library/library-pimpl.cxx index 8b6c357..7a1e484 100644 --- a/xsd/examples/cxx/parser/library/library-pimpl.cxx +++ b/xsd/examples/cxx/parser/library/library-pimpl.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/parser/library/library-pimpl.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include "library-pimpl.hxx" diff --git a/xsd/examples/cxx/parser/library/library-pimpl.hxx b/xsd/examples/cxx/parser/library/library-pimpl.hxx index 180070c..5d0dcc1 100644 --- a/xsd/examples/cxx/parser/library/library-pimpl.hxx +++ b/xsd/examples/cxx/parser/library/library-pimpl.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/parser/library/library-pimpl.hxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #ifndef LIBRARY_PIMPL_HXX diff --git a/xsd/examples/cxx/parser/library/library.hxx b/xsd/examples/cxx/parser/library/library.hxx index fb6cc1d..552e7a5 100644 --- a/xsd/examples/cxx/parser/library/library.hxx +++ b/xsd/examples/cxx/parser/library/library.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/parser/library/library.hxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #ifndef LIBRARY_HXX diff --git a/xsd/examples/cxx/parser/library/library.map b/xsd/examples/cxx/parser/library/library.map index 90f4938..3a49b49 100644 --- a/xsd/examples/cxx/parser/library/library.map +++ b/xsd/examples/cxx/parser/library/library.map @@ -1,5 +1,4 @@ # file : examples/cxx/parser/library/library.map -# author : Boris Kolpackov # copyright : not copyrighted - public domain namespace http://www.codesynthesis.com/library ::library diff --git a/xsd/examples/cxx/parser/library/library.xml b/xsd/examples/cxx/parser/library/library.xml index 2d9069c..b1ac98c 100644 --- a/xsd/examples/cxx/parser/library/library.xml +++ b/xsd/examples/cxx/parser/library/library.xml @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/parser/library/library.xsd b/xsd/examples/cxx/parser/library/library.xsd index 57654c7..71e4005 100644 --- a/xsd/examples/cxx/parser/library/library.xsd +++ b/xsd/examples/cxx/parser/library/library.xsd @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/parser/library/makefile b/xsd/examples/cxx/parser/library/makefile index e4eec1a..6410cf3 100644 --- a/xsd/examples/cxx/parser/library/makefile +++ b/xsd/examples/cxx/parser/library/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/parser/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,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 := --generate-inline --type-map $(src_base)/library.map +$(gen): xsd_options += --generate-inline --type-map $(src_base)/library.map $(gen): $(out_root)/xsd/xsd $(src_base)/library.map -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -76,7 +75,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