summaryrefslogtreecommitdiff
path: root/xsd/examples/cxx/parser/mixin
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-23 15:25:44 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-23 15:25:44 +0200
commit8286ac511144e4f17d34eac9affb97e50646344a (patch)
treef1af7320d7b6be6be059216d0ad08ac7b4f73fd0 /xsd/examples/cxx/parser/mixin
parenta15cf65c44d5c224169c32ef5495b68c758134b7 (diff)
Imported Upstream version 4.0.0upstream/4.0.0
Diffstat (limited to 'xsd/examples/cxx/parser/mixin')
-rw-r--r--xsd/examples/cxx/parser/mixin/driver.cxx1
-rw-r--r--xsd/examples/cxx/parser/mixin/instance.xml1
-rw-r--r--xsd/examples/cxx/parser/mixin/makefile11
-rw-r--r--xsd/examples/cxx/parser/mixin/schema.map1
-rw-r--r--xsd/examples/cxx/parser/mixin/schema.xsd1
-rw-r--r--xsd/examples/cxx/parser/mixin/types.hxx1
6 files changed, 5 insertions, 11 deletions
diff --git a/xsd/examples/cxx/parser/mixin/driver.cxx b/xsd/examples/cxx/parser/mixin/driver.cxx
index 41e5a45..04466a1 100644
--- a/xsd/examples/cxx/parser/mixin/driver.cxx
+++ b/xsd/examples/cxx/parser/mixin/driver.cxx
@@ -1,5 +1,4 @@
// file : examples/cxx/parser/mixin/driver.cxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
// copyright : not copyrighted - public domain
#include <memory>
diff --git a/xsd/examples/cxx/parser/mixin/instance.xml b/xsd/examples/cxx/parser/mixin/instance.xml
index 265271b..253f348 100644
--- a/xsd/examples/cxx/parser/mixin/instance.xml
+++ b/xsd/examples/cxx/parser/mixin/instance.xml
@@ -3,7 +3,6 @@
<!--
file : examples/cxx/parser/mixin/instance.xml
-author : Boris Kolpackov <boris@codesynthesis.com>
copyright : not copyrighted - public domain
-->
diff --git a/xsd/examples/cxx/parser/mixin/makefile b/xsd/examples/cxx/parser/mixin/makefile
index 9021106..7ef8084 100644
--- a/xsd/examples/cxx/parser/mixin/makefile
+++ b/xsd/examples/cxx/parser/mixin/makefile
@@ -1,6 +1,5 @@
# file : examples/cxx/parser/mixin/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)/schema.map
+$(gen): xsd_options += --type-map $(src_base)/schema.map
$(gen): $(out_root)/xsd/xsd $(src_base)/schema.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/mixin/schema.map b/xsd/examples/cxx/parser/mixin/schema.map
index 22edb1e..a93c881 100644
--- a/xsd/examples/cxx/parser/mixin/schema.map
+++ b/xsd/examples/cxx/parser/mixin/schema.map
@@ -1,5 +1,4 @@
# file : examples/cxx/parser/mixin/schema.map
-# author : Boris Kolpackov <boris@codesynthesis.com>
# copyright : not copyrighted - public domain
include "types.hxx";
diff --git a/xsd/examples/cxx/parser/mixin/schema.xsd b/xsd/examples/cxx/parser/mixin/schema.xsd
index 59d8d3b..d2d195d 100644
--- a/xsd/examples/cxx/parser/mixin/schema.xsd
+++ b/xsd/examples/cxx/parser/mixin/schema.xsd
@@ -3,7 +3,6 @@
<!--
file : examples/cxx/parser/mixin/schema.xsd
-author : Boris Kolpackov <boris@codesynthesis.com>
copyright : not copyrighted - public domain
-->
diff --git a/xsd/examples/cxx/parser/mixin/types.hxx b/xsd/examples/cxx/parser/mixin/types.hxx
index 708dfc3..930033d 100644
--- a/xsd/examples/cxx/parser/mixin/types.hxx
+++ b/xsd/examples/cxx/parser/mixin/types.hxx
@@ -1,5 +1,4 @@
// file : examples/cxx/parser/mixin/types.hxx
-// author : Boris Kolpackov <boris@codesynthesis.com>
// copyright : not copyrighted - public domain
#ifndef TYPES_HXX