diff options
| author | Gordon Sim <gsim@apache.org> | 2009-03-17 09:20:44 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2009-03-17 09:20:44 +0000 |
| commit | d9024d94b4a9cce969ad50bf05faf746ac031426 (patch) | |
| tree | e839f256ae41864717122808ffe6e1d3c8f922f7 /qpid/cpp/examples | |
| parent | bec6007fcdd938d5eada2330f7e426add3063241 (diff) | |
| download | qpid-python-d9024d94b4a9cce969ad50bf05faf746ac031426.tar.gz | |
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@755162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/examples')
| -rw-r--r-- | qpid/cpp/examples/Makefile.am | 13 | ||||
| -rw-r--r-- | qpid/cpp/examples/makedist.mk | 18 |
2 files changed, 15 insertions, 16 deletions
diff --git a/qpid/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am index 255c86a7be..ea93adca54 100644 --- a/qpid/cpp/examples/Makefile.am +++ b/qpid/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@ diff --git a/qpid/cpp/examples/makedist.mk b/qpid/cpp/examples/makedist.mk index a260a3a3b5..7cbf7d4c86 100644 --- a/qpid/cpp/examples/makedist.mk +++ b/qpid/cpp/examples/makedist.mk @@ -11,13 +11,13 @@ MAKEDIST=.libs/Makefile $(MAKEDIST): Makefile mkdir -p .libs - @$(ECHO) CXX=$(CXX) > $(MAKEDIST) - @$(ECHO) CXXFLAGS=$(CXXFLAGS) >> $(MAKEDIST) - @$(ECHO) LDFLAGS=$(MAKELDFLAGS) >> $(MAKEDIST) - @$(ECHO) >> $(MAKEDIST) - @$(ECHO) all: $(noinst_PROGRAMS) >> $(MAKEDIST) - @$(ECHO) >> $(MAKEDIST) - @$(ECHO) clean: >> $(MAKEDIST) - @$(ECHO) " rm -f $(noinst_PROGRAMS)" >> $(MAKEDIST) - + @(echo CXX=$(CXX) ; \ + echo CXXFLAGS=$(CXXFLAGS) ; \ + echo LDFLAGS=$(MAKELDFLAGS) ; \ + echo ; \ + echo all: $(noinst_PROGRAMS) ; \ + echo ; \ + echo clean: ; \ + echo " rm -f $(noinst_PROGRAMS)" ; \ + ) > $(MAKEDIST) |