svn commit: r464614 - /incubator/qpid/trunk/qpid/cpp/Makefile

[ac...@apache.org]

Author: aconway
Date: Mon Oct 16 11:32:55 2006
New Revision: 464614

URL: http://svn.apache.org/viewvc?view=rev&rev=464614
Log:
Link with absolute paths to qpid libs so exes work anywhere.

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=464614&r1=464613&r2=464614
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile Mon Oct 16 11:32:55 2006
@@ -82,7 +82,7 @@
 # Client library.
 CLIENT_LIB  := lib/libqpid_client.so.1.0
 CLIENT_SRC  := $(wildcard src/qpid/client/*.cpp)
-$(CLIENT_LIB): $(CLIENT_SRC:.cpp=.o) $(COMMON_LIB)
+$(CLIENT_LIB): $(CLIENT_SRC:.cpp=.o) $(CURDIR)/$(COMMON_LIB)
 	$(LIB_CMD) $^
 all: $(CLIENT_LIB) 
 UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp))
@@ -90,14 +90,14 @@
 # Broker library.
 BROKER_LIB  := lib/libqpid_broker.so.1.0
 BROKER_SRC  := $(wildcard src/qpid/broker/*.cpp)
-$(BROKER_LIB): $(BROKER_SRC:.cpp=.o)  $(COMMON_LIB)
+$(BROKER_LIB): $(BROKER_SRC:.cpp=.o)  $(CURDIR)/$(COMMON_LIB)
 	$(LIB_CMD) $^
 all: $(BROKER_LIB)
 UNITTESTS := $(UNITTESTS) $(wildcard test/unit/qpid/broker/*Test.cpp)
 
 # Implicit rule for unit test plugin libraries.
 %Test.so: %Test.cpp 
-	$(CXX) -shared -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 -lcppunit $(COMMON_LIB) $(BROKER_LIB)
+	$(CXX) -shared -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 -lcppunit $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(BROKER_LIB)
 
 ## Client tests
 
@@ -107,7 +107,7 @@
 
 ## Daemon executable
 
-bin/qpidd: src/qpidd.o $(COMMON_LIB) $(BROKER_LIB)
+bin/qpidd: src/qpidd.o $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(BROKER_LIB)
 	$(CXX) -o $@ $(LDFLAGS) -lapr-1 $^ 
 all: bin/qpidd