diff options
| author | Steven Shaw <steshaw@apache.org> | 2006-11-21 19:08:47 +0000 |
|---|---|---|
| committer | Steven Shaw <steshaw@apache.org> | 2006-11-21 19:08:47 +0000 |
| commit | fc6215f5a468f5ccb20e43dcee34e1d68c30d7f7 (patch) | |
| tree | ddedfdb08b5b21ed14be196cc837739677641c06 /qpid/cpp/Makefile | |
| parent | e3153484cc638260c33cb26aa333156ff3d6c3c1 (diff) | |
| download | qpid-python-fc6215f5a468f5ccb20e43dcee34e1d68c30d7f7.tar.gz | |
QPID-120 Enabled qpid-cpp to build on RHEL3 with less pain.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@477826 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/Makefile')
| -rw-r--r-- | qpid/cpp/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/qpid/cpp/Makefile b/qpid/cpp/Makefile index 765e911ebb..d9ffb9919d 100644 --- a/qpid/cpp/Makefile +++ b/qpid/cpp/Makefile @@ -26,6 +26,14 @@ include options.mk test: unittest pythontest +.PHONY: show-vars +show-vars: + @echo APR_LDFLAGS=$(APR_LDFLAGS) + @echo APR_CFLAGS=$(APR_CFLAGS) + @echo CXXFLAGS=$(CXXFLAGS) + @echo LDFLAGS=$(LDFLAGS) + @echo CXX=$(CXX) + # Must run two separate make processes to pick up generated files. all: $(MAKE) generate @@ -106,10 +114,14 @@ endef $(foreach dir,$(SRCDIRS),$(eval $(call CPPRULE,$(dir)))) +ifndef CPPUNIT_LDFLAGS + CPPUNIT_LDFLAGS := -lcppunit +endif + # Unit test plugin libraries. $(TESTDIR)/%Test.so: test/unit/%Test.cpp $(LIB_common) $(LIB_broker) mkdir -p $(dir $@) - $(CXX) -shared -o $@ $< $(CXXFLAGS) -Itest/include $(LDFLAGS) -lcppunit $(LIB_common) $(LIB_broker) + $(CXX) -shared -o $@ $< $(CXXFLAGS) -Itest/include $(LDFLAGS) $(CPPUNIT_LDFLAGS) $(LIB_common) $(LIB_broker) # Client test programs $(TESTDIR)/%: test/client/%.cpp $(LIB_common) $(LIB_client) |