diff options
| author | Alan Conway <aconway@apache.org> | 2006-10-25 16:46:22 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-10-25 16:46:22 +0000 |
| commit | 8da6e337e89a5af2cbe7d4b1a649f417c05b7cda (patch) | |
| tree | 57f55f33481a8f2a8b136a9b965f479843030fd6 /cpp | |
| parent | ce74fdafd2ce0eace7a29469819458645eec0364 (diff) | |
| download | qpid-python-8da6e337e89a5af2cbe7d4b1a649f417c05b7cda.tar.gz | |
Clean test/client directory properly.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@467707 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 36d0ad58ee..becc5098f2 100644 --- a/cpp/Makefile +++ b/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'` |