summaryrefslogtreecommitdiff
path: root/qpid/cpp/Makefile
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2006-10-25 16:46:22 +0000
committerAlan Conway <aconway@apache.org>2006-10-25 16:46:22 +0000
commitf14873f69a94cf5bf43a05adcb0147af08369bbe (patch)
tree43e10b3b1ad210981354c613134c88c183424e72 /qpid/cpp/Makefile
parent92ac99c5ffb4416f80e667c47554b2be5565f5fc (diff)
downloadqpid-python-f14873f69a94cf5bf43a05adcb0147af08369bbe.tar.gz
Clean test/client directory properly.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@467707 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/Makefile')
-rw-r--r--qpid/cpp/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/qpid/cpp/Makefile b/qpid/cpp/Makefile
index 36d0ad58ee..becc5098f2 100644
--- a/qpid/cpp/Makefile
+++ b/qpid/cpp/Makefile
@@ -96,13 +96,15 @@ UNITTESTS := $(UNITTESTS) $(wildcard test/unit/qpid/broker/*Test.cpp)
# Implicit rule for unit test plugin libraries.
%Test.so: %Test.cpp $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(BROKER_LIB)
- $(CXX) -shared -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 -lcppunit $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(BROKER_LIB)
+ $(CXX) -shared -o $@ $< $(CXXFLAGS) -Itest/include $(LDFLAGS) -lapr-1 -lcppunit $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(BROKER_LIB)
## Client tests
CLIENT_TEST_SRC := $(wildcard test/client/*.cpp)
all-nogen: $(CLIENT_TEST_SRC:.cpp=)
+clean::
+ rm -f $(CLIENT_TEST_SRC:.cpp=)
test/client/%: test/client/%.cpp
- $(CXX) -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(CLIENT_LIB)
+ $(CXX) -o $@ $< $(CXXFLAGS) -Itest/include $(LDFLAGS) -lapr-1 $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(CLIENT_LIB)
## Daemon executable
@@ -127,10 +129,9 @@ doxygen: doxygen/doxygen.cfg $(SOURCES)
## #include dependencies
-include $(shell find src test -name '*.d')
-## Cleanup
+## General cleanup
clean::
rm -f bin/* lib/* qpidd.log
rm -rf gen
- rm -f `find src test -name '*.o' -o -name '*.d' -o -name '*.so'`
-
+ rm -f `find src test -name '*.o' -o -name '*.d' -o -name '*.so'`