You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2009/03/17 10:20:46 UTC
svn commit: r755162 - in /qpid/trunk/qpid/cpp/examples: Makefile.am
makedist.mk
Author: gsim
Date: Tue Mar 17 09:20:44 2009
New Revision: 755162
URL: http://svn.apache.org/viewvc?rev=755162&view=rev
Log:
QPID-1740: Update Makefile generation for examples to not use the undocumented Echo variable no longer supported in later autotools (from Jan Sarenik)
Modified:
qpid/trunk/qpid/cpp/examples/Makefile.am
qpid/trunk/qpid/cpp/examples/makedist.mk
Modified: qpid/trunk/qpid/cpp/examples/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=755162&r1=755161&r2=755162&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/Makefile.am Tue Mar 17 09:20:44 2009
@@ -27,18 +27,17 @@
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@
Modified: qpid/trunk/qpid/cpp/examples/makedist.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/makedist.mk?rev=755162&r1=755161&r2=755162&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/makedist.mk (original)
+++ qpid/trunk/qpid/cpp/examples/makedist.mk Tue Mar 17 09:20:44 2009
@@ -11,13 +11,13 @@
$(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)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org