diff options
| author | Manuel Teira Paz <mteira@apache.org> | 2009-03-10 08:10:24 +0000 |
|---|---|---|
| committer | Manuel Teira Paz <mteira@apache.org> | 2009-03-10 08:10:24 +0000 |
| commit | 267a601b03f4655d866b06a6f5d24ef127c0e3f1 (patch) | |
| tree | f92d3c65aaec41766f5f6f7a6b255bc074804423 /cpp | |
| parent | 4ff6c73d90af4f279033f6430b2499f7dd759db0 (diff) | |
| download | qpid-python-267a601b03f4655d866b06a6f5d24ef127c0e3f1.tar.gz | |
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/qpid@752014 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/examples/direct/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/examples/failover/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/examples/fanout/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/examples/makedist.mk | 5 | ||||
| -rw-r--r-- | cpp/examples/pub-sub/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/examples/qmf-console/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/examples/request-response/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/examples/tradedemo/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/examples/xml-exchange/Makefile.am | 1 |
9 files changed, 11 insertions, 3 deletions
diff --git a/cpp/examples/direct/Makefile.am b/cpp/examples/direct/Makefile.am index 07431f6fe4..8f220d1b7e 100644 --- a/cpp/examples/direct/Makefile.am +++ b/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/cpp/examples/failover/Makefile.am b/cpp/examples/failover/Makefile.am index c41f26eaba..67d9eb4b95 100644 --- a/cpp/examples/failover/Makefile.am +++ b/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/cpp/examples/fanout/Makefile.am b/cpp/examples/fanout/Makefile.am index 6cbf2c93ad..395fcec9aa 100644 --- a/cpp/examples/fanout/Makefile.am +++ b/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/cpp/examples/makedist.mk b/cpp/examples/makedist.mk index 4345378983..ce34fd31e2 100644 --- a/cpp/examples/makedist.mk +++ b/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/cpp/examples/pub-sub/Makefile.am b/cpp/examples/pub-sub/Makefile.am index bdbf0f8d20..1d52daf638 100644 --- a/cpp/examples/pub-sub/Makefile.am +++ b/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/cpp/examples/qmf-console/Makefile.am b/cpp/examples/qmf-console/Makefile.am index 471620f465..04a92c214e 100644 --- a/cpp/examples/qmf-console/Makefile.am +++ b/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/cpp/examples/request-response/Makefile.am b/cpp/examples/request-response/Makefile.am index 8fb95f24fc..d7e7d692de 100644 --- a/cpp/examples/request-response/Makefile.am +++ b/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/cpp/examples/tradedemo/Makefile.am b/cpp/examples/tradedemo/Makefile.am index ef90e04bb0..a3c7fabd65 100644 --- a/cpp/examples/tradedemo/Makefile.am +++ b/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/cpp/examples/xml-exchange/Makefile.am b/cpp/examples/xml-exchange/Makefile.am index 0f99aea44e..aa450a32c2 100644 --- a/cpp/examples/xml-exchange/Makefile.am +++ b/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 |