From 367b86d8ae073119b93c7cf0cc1b0017d2e13ad6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 8 May 2012 07:07:09 +0200
Subject: Fix escaping of special character

---
 examples/cxx/tree/custom/calendar/makefile | 6 +-----
 examples/cxx/tree/custom/comments/makefile | 3 +--
 examples/cxx/tree/custom/double/makefile   | 3 +--
 tests/cxx/tree/prefix/makefile             | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/examples/cxx/tree/custom/calendar/makefile b/examples/cxx/tree/custom/calendar/makefile
index d86aa36..d28be1c 100644
--- a/examples/cxx/tree/custom/calendar/makefile
+++ b/examples/cxx/tree/custom/calendar/makefile
@@ -43,7 +43,7 @@ $(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 \
 --custom-type date \
---hxx-epilogue '\#include "xml-schema-custom.hxx"' xml-schema.xsd)
+--hxx-epilogue '#include "xml-schema-custom.hxx"' xml-schema.xsd)
 
 #
 #
@@ -51,10 +51,6 @@ genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
 gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
-
-# We have to double-escape '#' because the message function
-# (which is used in command scripts) expands things twice.
-#
 $(gen): xsd_options := \
 --generate-inline \
 --extern-xml-schema xml-schema.xsd
diff --git a/examples/cxx/tree/custom/comments/makefile b/examples/cxx/tree/custom/comments/makefile
index cf1548f..a39719b 100644
--- a/examples/cxx/tree/custom/comments/makefile
+++ b/examples/cxx/tree/custom/comments/makefile
@@ -37,7 +37,7 @@ $(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 anyType=/type_base \
---hxx-epilogue '\#include "xml-schema-custom.hxx"' xml-schema.xsd)
+--hxx-epilogue '#include "xml-schema-custom.hxx"' xml-schema.xsd)
 
 #
 #
@@ -45,7 +45,6 @@ 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-serialization \
diff --git a/examples/cxx/tree/custom/double/makefile b/examples/cxx/tree/custom/double/makefile
index d099875..9b33821 100644
--- a/examples/cxx/tree/custom/double/makefile
+++ b/examples/cxx/tree/custom/double/makefile
@@ -36,13 +36,12 @@ $(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
 
diff --git a/tests/cxx/tree/prefix/makefile b/tests/cxx/tree/prefix/makefile
index c048934..a0b4778 100644
--- a/tests/cxx/tree/prefix/makefile
+++ b/tests/cxx/tree/prefix/makefile
@@ -35,7 +35,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
 $(gen): xsd_options := --generate-serialization --generate-polymorphic \
---polymorphic-type foo\\\#base --root-element root
+--polymorphic-type foo\#base --root-element root
 $(gen): $(out_root)/xsd/xsd
 
 $(call include-dep,$(dep))
-- 
cgit v1.1