You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2006/10/17 21:07:20 UTC
svn commit: r465005 - in /incubator/qpid/trunk/qpid/cpp: Makefile options.mk
Author: aconway
Date: Tue Oct 17 12:07:18 2006
New Revision: 465005
URL: http://svn.apache.org/viewvc?view=rev&rev=465005
Log:
Removed dependencies on linked libraries to avoid needless relinking.
Header dependencies will cause libraries to relink when necessary.
Modified:
incubator/qpid/trunk/qpid/cpp/Makefile
incubator/qpid/trunk/qpid/cpp/options.mk
Modified: incubator/qpid/trunk/qpid/cpp/Makefile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile?view=diff&rev=465005&r1=465004&r2=465005
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile Tue Oct 17 12:07:18 2006
@@ -81,16 +81,16 @@
# Client library.
CLIENT_LIB := lib/libqpid_client.so.1.0
CLIENT_SRC := $(wildcard src/qpid/client/*.cpp)
-$(CLIENT_LIB): $(CLIENT_SRC:.cpp=.o) $(CURDIR)/$(COMMON_LIB)
- $(LIB_CMD) $^
+$(CLIENT_LIB): $(CLIENT_SRC:.cpp=.o)
+ $(LIB_CMD) $^ $(CURDIR)/$(COMMON_LIB)
all-nogen: $(CLIENT_LIB)
UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp))
# Broker library.
BROKER_LIB := lib/libqpid_broker.so.1.0
BROKER_SRC := $(wildcard src/qpid/broker/*.cpp)
-$(BROKER_LIB): $(BROKER_SRC:.cpp=.o) $(CURDIR)/$(COMMON_LIB)
- $(LIB_CMD) $^
+$(BROKER_LIB): $(BROKER_SRC:.cpp=.o)
+ $(LIB_CMD) $^ $(CURDIR)/$(COMMON_LIB)
all-nogen: $(BROKER_LIB)
UNITTESTS := $(UNITTESTS) $(wildcard test/unit/qpid/broker/*Test.cpp)
@@ -106,8 +106,8 @@
## Daemon executable
-bin/qpidd: src/qpidd.o $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(BROKER_LIB)
- $(CXX) -o $@ $(LDFLAGS) -lapr-1 $^
+bin/qpidd: src/qpidd.o $(CURDIR)/$(COMMON_LIB)
+ $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) -lapr-1 $^ $(CURDIR)/$(BROKER_LIB)
all-nogen: bin/qpidd
## Run unit tests.
Modified: incubator/qpid/trunk/qpid/cpp/options.mk
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/options.mk?view=diff&rev=465005&r1=465004&r2=465005
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/options.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/options.mk Tue Oct 17 12:07:18 2006
@@ -23,7 +23,7 @@
## Compile flags
-DEBUG := -ggdb3
+DEBUG := -ggdb3 -O0
# _USE_APR_IO_ set when APR IO build is desired.
DEFINES := -D _USE_APR_IO_