From 7107d5c1c3c8323d832184fc097a5d9223633d32 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 5 Dec 2006 13:12:25 +0000 Subject: Patch submitted on qpid-dev: 2006-12-05 Jim Meyering * gen/Makefile.am (timestamp): Remove unnecessary "; \", that could have obscured a failure. (gen-src.mk): Use echo 'var = '\\, rather than 'var = \'. Both work, but emacs' font-lock mode mishandles the latter. * bootstrap: Give JAVA and JAVAC default values, and export them. Don't define abs_srcdir; no longer needed. Also filter out gen/Makefile.am's echo warning: ... Add comments. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482637 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/gen/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cpp/gen') diff --git a/cpp/gen/Makefile.am b/cpp/gen/Makefile.am index 0529afbf7e..eea08c9570 100644 --- a/cpp/gen/Makefile.am +++ b/cpp/gen/Makefile.am @@ -15,9 +15,9 @@ gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools timestamp: $(spec) $(java_sources) $(cxx_templates) if BUILD_IN_MESSAGE_TREE rm -f $(generated_sources) - (cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java); \ - $(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \ - -c -o . -t $(gentools_dir)/templ.cpp $(spec) + cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java + $(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \ + -c -o . -t $(gentools_dir)/templ.cpp $(spec) else echo "warning: failed to regenerate gen/*.{cpp,h}" 1>&2 endif @@ -28,15 +28,15 @@ $(generated_sources): timestamp DISTCLEANFILES = gen-src.mk gen-src.mk: timestamp - ( echo 'generated_sources = \' \ + ( echo 'generated_sources = '\\ \ && ls *.cpp *.h | sort -u | sed 's/.*/ & \\/;$$s/ \\//' \ ) > $@-t if BUILD_IN_MESSAGE_TREE ( echo if BUILD_IN_MESSAGE_TREE; \ - echo 'java_sources = \' \ + echo 'java_sources = '\\ \ && find $(gentools_srcdir) -name '*.java' \ | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \ - echo 'cxx_templates = \' \ + echo 'cxx_templates = '\\ \ && find $(gentools_dir)/templ.cpp -name '*.tmpl' \ | sort -u | sed 's/.*/ & \\/;$$s/ \\//'; \ echo endif \ -- cgit v1.2.1