From dd00f839f41d4bd2d82ce1ac9e8da74309125cee Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 17 Mar 2009 09:20:44 +0000 Subject: QPID-1740: Update Makefile generation for examples to not use the undocumented Echo variable no longer supported in later autotools (from Jan Sarenik) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@755162 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/examples/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'cpp/examples/Makefile.am') diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am index 255c86a7be..ea93adca54 100644 --- a/cpp/examples/Makefile.am +++ b/cpp/examples/Makefile.am @@ -27,18 +27,17 @@ if !HAVE_XML endif MAKEDIST=.libs/Makefile -SUBMAKE=' for d in $(SUBDIRS) ; do $$(MAKE) -C $$$$d $$@ ; done' + $(MAKEDIST): Makefile mkdir -p .libs - @$(ECHO) all: > $(MAKEDIST) - @$(ECHO) $(SUBMAKE) >> $(MAKEDIST) - @$(ECHO) clean: >> $(MAKEDIST) - @$(ECHO) $(SUBMAKE) >> $(MAKEDIST) + @(echo 'all clean:' ; \ + echo ' for d in $$(SUBDIRS) ; do $$(MAKE) -C $$$$d $$@ ; done' ; \ + ) > $(MAKEDIST) examplesdir=$(pkgdatadir)/examples -examples_DATA = README $(MAKEDIST) +dist_examples_DATA = README $(MAKEDIST) -EXTRA_DIST = $(examples_DATA) README.verify verify verify_all +EXTRA_DIST = README.verify verify verify_all # For older versions of automake abs_top_srcdir = @abs_top_srcdir@ -- cgit v1.2.1