examples/makedist.mk and examples/*/Makefile.am

 - Avoid the usage of make ?= assignments (not portable).



git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@752014 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 11 insertions, 3 deletions

diff --git a/qpid/cpp/examples/direct/Makefile.am b/qpid/cpp/examples/direct/Makefile.am
index 07431f6fe4..8f220d1b7e 100644
--- a/qpid/cpp/examples/direct/Makefile.am
+++ b/qpid/cpp/examples/direct/Makefile.am
@@ -18,6 +18,7 @@
 #
 examplesdir=$(pkgdatadir)/examples/direct
 
+MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
 noinst_PROGRAMS=direct_producer listener declare_queues
diff --git a/qpid/cpp/examples/failover/Makefile.am b/qpid/cpp/examples/failover/Makefile.am
index c41f26eaba..67d9eb4b95 100644
--- a/qpid/cpp/examples/failover/Makefile.am
+++ b/qpid/cpp/examples/failover/Makefile.am
@@ -18,6 +18,7 @@
 #
 examplesdir=$(pkgdatadir)/examples/failover
 
+MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
 noinst_PROGRAMS=declare_queues resuming_receiver replaying_sender
diff --git a/qpid/cpp/examples/fanout/Makefile.am b/qpid/cpp/examples/fanout/Makefile.am
index 6cbf2c93ad..395fcec9aa 100644
--- a/qpid/cpp/examples/fanout/Makefile.am
+++ b/qpid/cpp/examples/fanout/Makefile.am
@@ -18,6 +18,7 @@
 #
 examplesdir=$(pkgdatadir)/examples/fanout
 
+MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
 noinst_PROGRAMS=fanout_producer listener
diff --git a/qpid/cpp/examples/makedist.mk b/qpid/cpp/examples/makedist.mk
index 4345378983..ce34fd31e2 100644
--- a/qpid/cpp/examples/makedist.mk
+++ b/qpid/cpp/examples/makedist.mk
@@ -3,7 +3,8 @@ AM_CXXFLAGS = $(WARNING_CFLAGS)
 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 @@ $(MAKEDIST): Makefile
 	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)
diff --git a/qpid/cpp/examples/pub-sub/Makefile.am b/qpid/cpp/examples/pub-sub/Makefile.am
index bdbf0f8d20..1d52daf638 100644
--- a/qpid/cpp/examples/pub-sub/Makefile.am
+++ b/qpid/cpp/examples/pub-sub/Makefile.am
@@ -18,6 +18,7 @@
 #
 examplesdir=$(pkgdatadir)/examples/pub-sub
 
+MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
 noinst_PROGRAMS=topic_listener topic_publisher
diff --git a/qpid/cpp/examples/qmf-console/Makefile.am b/qpid/cpp/examples/qmf-console/Makefile.am
index 471620f465..04a92c214e 100644
--- a/qpid/cpp/examples/qmf-console/Makefile.am
+++ b/qpid/cpp/examples/qmf-console/Makefile.am
@@ -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
diff --git a/qpid/cpp/examples/request-response/Makefile.am b/qpid/cpp/examples/request-response/Makefile.am
index 8fb95f24fc..d7e7d692de 100644
--- a/qpid/cpp/examples/request-response/Makefile.am
+++ b/qpid/cpp/examples/request-response/Makefile.am
@@ -18,6 +18,7 @@
 #
 examplesdir=$(pkgdatadir)/examples/request-response
 
+MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
 noinst_PROGRAMS=client server
diff --git a/qpid/cpp/examples/tradedemo/Makefile.am b/qpid/cpp/examples/tradedemo/Makefile.am
index ef90e04bb0..a3c7fabd65 100644
--- a/qpid/cpp/examples/tradedemo/Makefile.am
+++ b/qpid/cpp/examples/tradedemo/Makefile.am
@@ -18,6 +18,7 @@
 #
 examplesdir=$(pkgdatadir)/examples/tradedemo
 
+MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
 noinst_PROGRAMS=topic_listener topic_publisher declare_queues
diff --git a/qpid/cpp/examples/xml-exchange/Makefile.am b/qpid/cpp/examples/xml-exchange/Makefile.am
index 0f99aea44e..aa450a32c2 100644
--- a/qpid/cpp/examples/xml-exchange/Makefile.am
+++ b/qpid/cpp/examples/xml-exchange/Makefile.am
@@ -18,6 +18,7 @@
 #
 examplesdir=$(pkgdatadir)/examples/xml-exchange
 
+MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
 noinst_PROGRAMS=declare_queues xml_producer listener