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/tree/custom/double/makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'xsd/examples/cxx/tree/custom/double/makefile') diff --git a/xsd/examples/cxx/tree/custom/double/makefile b/xsd/examples/cxx/tree/custom/double/makefile index 5bd4f71..2eed216 100644 --- a/xsd/examples/cxx/tree/custom/double/makefile +++ b/xsd/examples/cxx/tree/custom/double/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/double/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,26 +28,25 @@ $(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) $(out_base)/xml-schema.hxx: $(out_root)/xsd/xsd $(call message,xsd $(src_base)/xml-schema.xsd,\ $(out_root)/xsd/xsd cxx-tree --output-dir $(out_base) --generate-xml-schema \ --generate-serialization --custom-type double=double \ ---hxx-epilogue '\#include "double-custom.hxx"' xml-schema.xsd) +--hxx-epilogue '#include "double-custom.hxx"' xml-schema.xsd) 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-serialization --extern-xml-schema xml-schema.xsd +$(gen): xsd_options += --generate-serialization \ +--extern-xml-schema xml-schema.xsd $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -79,7 +77,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