Author: aconway
Date: Wed Oct 25 09:46:22 2006
New Revision: 467707
URL: http://svn.apache.org/viewvc?view=rev&rev=467707
Log:
Clean test/client directory properly.
Modified:
incubator/qpid/trunk/qpid/cpp/Makefile
Modified: incubator/qpid/trunk/qpid/cpp/Makefile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile?view=diff&rev=467707&r1=467706&r2=467707
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile Wed Oct 25 09:46:22 2006
@@ -96,13 +96,15 @@
# 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 @@
## #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'`
