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 | f71389d39b73c7e7fef7b7e81aa6d7da397ff286 (patch) | |
| tree | 74e1db9114f225f68b2cab8da7453c0d0c3393f4 /cpp/Makefile | |
| parent | a877a328957da2bf751edb8a50d08b19785b924e (diff) | |
| download | qpid-python-f71389d39b73c7e7fef7b7e81aa6d7da397ff286.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/qpid@477826 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/Makefile')
| -rw-r--r-- | cpp/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 765e911ebb..d9ffb9919d 100644 --- a/cpp/Makefile +++ b/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) |