diff options
| author | Alan Conway <aconway@apache.org> | 2006-10-16 14:12:49 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-10-16 14:12:49 +0000 |
| commit | 282cb20bdcca6494a919a16fba85db904aa2cf43 (patch) | |
| tree | 5d6e4d1007a6dc49f492a21a038825979ecba034 /qpid/cpp/Makefile | |
| parent | c0e2b3586a64acbd2f2a46e3b79384cab76e6ddd (diff) | |
| download | qpid-python-282cb20bdcca6494a919a16fba85db904aa2cf43.tar.gz | |
Renamed unit tests to follow naming conventions, fixed some #include inconsistencies.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@464503 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/Makefile')
| -rw-r--r-- | qpid/cpp/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qpid/cpp/Makefile b/qpid/cpp/Makefile index 586a934cce..15d73b4bd9 100644 --- a/qpid/cpp/Makefile +++ b/qpid/cpp/Makefile @@ -53,10 +53,6 @@ XSL := code_gen.xsl framing.xsl STYLESHEETS := $(XSL:%=$(CURDIR)/etc/stylesheets/%) TRANSFORM := java -jar $(CURDIR)/tools/saxon8.jar -o results.out $(SPEC) -.PHONY: generate - -generate: gen/timestamp - # Restart make if code is re-generated to get proper dependencies. # Remove "clean" to avoid infinite loop. REMAKE := exec $(MAKE) $(MAKECMDGOALS:clean=) @@ -78,7 +74,7 @@ LIB_CMD = $(CXX) -shared -o $@ $(LDFLAGS) $(CXXFLAGS) -lapr-1 COMMON_LIB := lib/libqpid_common.so.1.0 COMMON_DIRS := qpid/concurrent qpid/framing qpid/io qpid COMMON_SRC := $(wildcard gen/qpid/framing/*.cpp $(COMMON_DIRS:%=src/%/*.cpp)) -$(COMMON_LIB): generate $(COMMON_SRC:.cpp=.o) +$(COMMON_LIB): gen/timestamp $(COMMON_SRC:.cpp=.o) $(LIB_CMD) $(COMMON_SRC:.cpp=.o) all: $(COMMON_LIB) UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp)) |