diff options
| author | Alan Conway <aconway@apache.org> | 2006-11-01 01:19:12 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-11-01 01:19:12 +0000 |
| commit | dda71d21e76e01918ebec2d80dd8e077f94216e0 (patch) | |
| tree | 79283c295e00de1eee8d98d4fd9b781db8497c28 /cpp/Makefile | |
| parent | 9094d2b10ecadd66fa3b22169183e7573cc79629 (diff) | |
| download | qpid-python-dda71d21e76e01918ebec2d80dd8e077f94216e0.tar.gz | |
Moved APR specific sources into src_apr.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@469738 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/Makefile')
| -rw-r--r-- | cpp/Makefile | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index e81e89a6a7..b3cd65f6d7 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -39,7 +39,12 @@ $(GENDIR)/timestamp: $(wildcard etc/stylesheets/*.xsl) $(SPEC) rm -rf $(GENDIR) mkdir -p $(GENDIR)/qpid/framing ( cd $(GENDIR)/qpid/framing && for s in $(STYLESHEETS) ; do $(TRANSFORM) $$s ; done ) && echo > $(GENDIR)/timestamp -$(shell find $(GENDIR) -name *.cpp -o -name *.h): $(GENDIR)/timestamp + +# Dependencies for existing generated files. +GENFILES:=$(wildcard $(GENDIR)/qpid/*/*.cpp $(GENDIR)/qpid/*/*.h) +ifdef GENFILES +$(GENFILES): $(GENDIR)/timestamp +endif $(BUILDDIRS): mkdir -p $(BUILDDIRS) @@ -47,15 +52,15 @@ $(BUILDDIRS): ## Library rules LIB_common := $(call LIBFILE,common,1.0) -$(LIB_common): $(call OBJ_FROM,src,qpid/concurrent qpid/framing qpid/io qpid) $(call OBJ_FROM,$(GENDIR),qpid/framing) +$(LIB_common): $(call OBJECTS,qpid qpid/concurrent qpid/framing qpid/io) $(LIB_COMMAND) LIB_client :=$(call LIBFILE,client,1.0) -$(LIB_client): $(call OBJ_FROM,src,qpid/client) $(LIB_common) +$(LIB_client): $(call OBJECTS,qpid/client) $(LIB_common) $(LIB_COMMAND) LIB_broker :=$(call LIBFILE,broker,1.0) -$(LIB_broker): $(call OBJ_FROM,src,qpid/broker) $(LIB_common) +$(LIB_broker): $(call OBJECTS,qpid/broker) $(LIB_common) $(LIB_COMMAND) ## Daemon executable @@ -85,13 +90,14 @@ build/html: doxygen.cfg ## Implicit rules -# C++ compiile -$(OBJDIR)/%.o: src/%.cpp - mkdir -p $(dir $@) - $(CXX) $(CXXFLAGS) -c -o $@ $< -$(OBJDIR)/%.o: $(GENDIR)/%.cpp - mkdir -p $(dir $@) - $(CXX) $(CXXFLAGS) -c -o $@ $< +# C++ compile +define CPPRULE +$(OBJDIR)/%.o: $1/%.cpp + @mkdir -p $$(dir $$@) + $(CXX) $(CXXFLAGS) -c -o $$@ $$< +endef + +$(foreach dir,$(SRCDIRS),$(eval $(call CPPRULE,$(dir)))) # Unit test plugin libraries. $(TESTDIR)/%Test.so: test/unit/%Test.cpp @@ -106,9 +112,11 @@ CLIENT_TEST_SRC := $(wildcard test/client/*.cpp) CLIENT_TEST_EXE := $(CLIENT_TEST_SRC:test/client/%.cpp=$(TESTDIR)/%) all-nogen: $(CLIENT_TEST_EXE) -## #include dependencies --include $(shell find $(GENDIR) $(OBJDIR) -name '*.d') dummy-avoid-warning-if-none - +## include dependencies +DEPFILES:=$(wildcard $(OBJDIR)/*.d $(OBJDIR)/*/*.d $(OBJDIR)/*/*/*.d) +ifdef DEPFILES +-include $(DEPFILES) +endif ## Clean up |