You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mt...@apache.org on 2009/03/10 09:10:26 UTC
svn commit: r752014 - in /qpid/trunk/qpid/cpp/examples: direct/Makefile.am
failover/Makefile.am fanout/Makefile.am makedist.mk pub-sub/Makefile.am
qmf-console/Makefile.am request-response/Makefile.am tradedemo/Makefile.am
xml-exchange/Makefile.am
Author: mteira
Date: Tue Mar 10 08:10:24 2009
New Revision: 752014
URL: http://svn.apache.org/viewvc?rev=752014&view=rev
Log:
examples/makedist.mk and examples/*/Makefile.am
- Avoid the usage of make ?= assignments (not portable).
Modified:
qpid/trunk/qpid/cpp/examples/direct/Makefile.am
qpid/trunk/qpid/cpp/examples/failover/Makefile.am
qpid/trunk/qpid/cpp/examples/fanout/Makefile.am
qpid/trunk/qpid/cpp/examples/makedist.mk
qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am
qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
qpid/trunk/qpid/cpp/examples/request-response/Makefile.am
qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am
qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am
Modified: qpid/trunk/qpid/cpp/examples/direct/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/direct/Makefile.am?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/direct/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/direct/Makefile.am Tue Mar 10 08:10:24 2009
@@ -18,6 +18,7 @@
#
examplesdir=$(pkgdatadir)/examples/direct
+MAKELDFLAGS=$(CLIENTFLAGS)
include $(top_srcdir)/examples/makedist.mk
noinst_PROGRAMS=direct_producer listener declare_queues
Modified: qpid/trunk/qpid/cpp/examples/failover/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/failover/Makefile.am?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/failover/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/failover/Makefile.am Tue Mar 10 08:10:24 2009
@@ -18,6 +18,7 @@
#
examplesdir=$(pkgdatadir)/examples/failover
+MAKELDFLAGS=$(CLIENTFLAGS)
include $(top_srcdir)/examples/makedist.mk
noinst_PROGRAMS=declare_queues resuming_receiver replaying_sender
Modified: qpid/trunk/qpid/cpp/examples/fanout/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/fanout/Makefile.am?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/fanout/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/fanout/Makefile.am Tue Mar 10 08:10:24 2009
@@ -18,6 +18,7 @@
#
examplesdir=$(pkgdatadir)/examples/fanout
+MAKELDFLAGS=$(CLIENTFLAGS)
include $(top_srcdir)/examples/makedist.mk
noinst_PROGRAMS=fanout_producer listener
Modified: qpid/trunk/qpid/cpp/examples/makedist.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/makedist.mk?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/makedist.mk (original)
+++ qpid/trunk/qpid/cpp/examples/makedist.mk Tue Mar 10 08:10:24 2009
@@ -3,7 +3,8 @@
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/gen -I$(top_builddir)/src -I$(top_builddir)/src/gen
CLIENT_LIB=$(top_builddir)/src/libqpidclient.la
CONSOLE_LIB=$(top_builddir)/src/libqmfconsole.la
-MAKELDFLAG ?= qpidclient
+CLIENTFLAGS=-lqpidclient
+CONSOLEFLAGS=-lqmfconsole
# Generate a simple non-automake Makefile for distribution.
MAKEDIST=.libs/Makefile
@@ -12,7 +13,7 @@
mkdir -p .libs
@$(ECHO) CXX=$(CXX) > $(MAKEDIST)
@$(ECHO) CXXFLAGS=$(CXXFLAGS) >> $(MAKEDIST)
- @$(ECHO) LDFLAGS=-l$(MAKELDFLAG) >> $(MAKEDIST)
+ @$(ECHO) LDFLAGS=-l$(MAKELDFLAGS) >> $(MAKEDIST)
@$(ECHO) >> $(MAKEDIST)
@$(ECHO) all: $(noinst_PROGRAMS) >> $(MAKEDIST)
@$(ECHO) >> $(MAKEDIST)
Modified: qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/pub-sub/Makefile.am Tue Mar 10 08:10:24 2009
@@ -18,6 +18,7 @@
#
examplesdir=$(pkgdatadir)/examples/pub-sub
+MAKELDFLAGS=$(CLIENTFLAGS)
include $(top_srcdir)/examples/makedist.mk
noinst_PROGRAMS=topic_listener topic_publisher
Modified: qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/Makefile.am Tue Mar 10 08:10:24 2009
@@ -19,7 +19,7 @@
examplesdir=$(pkgdatadir)/examples/qmf-console
-MAKELDFLAG = qmfconsole
+MAKELDFLAGS=$(CONSOLEFLAGS)
include $(top_srcdir)/examples/makedist.mk
noinst_PROGRAMS=console printevents ping queuestats
Modified: qpid/trunk/qpid/cpp/examples/request-response/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/request-response/Makefile.am?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/request-response/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/request-response/Makefile.am Tue Mar 10 08:10:24 2009
@@ -18,6 +18,7 @@
#
examplesdir=$(pkgdatadir)/examples/request-response
+MAKELDFLAGS=$(CLIENTFLAGS)
include $(top_srcdir)/examples/makedist.mk
noinst_PROGRAMS=client server
Modified: qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am Tue Mar 10 08:10:24 2009
@@ -18,6 +18,7 @@
#
examplesdir=$(pkgdatadir)/examples/tradedemo
+MAKELDFLAGS=$(CLIENTFLAGS)
include $(top_srcdir)/examples/makedist.mk
noinst_PROGRAMS=topic_listener topic_publisher declare_queues
Modified: qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am?rev=752014&r1=752013&r2=752014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/xml-exchange/Makefile.am Tue Mar 10 08:10:24 2009
@@ -18,6 +18,7 @@
#
examplesdir=$(pkgdatadir)/examples/xml-exchange
+MAKELDFLAGS=$(CLIENTFLAGS)
include $(top_srcdir)/examples/makedist.mk
noinst_PROGRAMS=declare_queues xml_producer listener
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org