diff options
| author | Alan Conway <aconway@apache.org> | 2006-10-16 18:32:55 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-10-16 18:32:55 +0000 |
| commit | 05f2d6f55e960c7067d6b18ebe69907e3498d62e (patch) | |
| tree | 35f8a29cf53a2940dedf95ea2f3795f20c7e4566 /qpid/cpp | |
| parent | 7f678afb5661f865811a7669c3af61879f63ce04 (diff) | |
| download | qpid-python-05f2d6f55e960c7067d6b18ebe69907e3498d62e.tar.gz | |
Link with absolute paths to qpid libs so exes work anywhere.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@464614 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/Makefile b/qpid/cpp/Makefile index 15d73b4bd9..59a2c3b3be 100644 --- a/qpid/cpp/Makefile +++ b/qpid/cpp/Makefile @@ -82,7 +82,7 @@ UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp)) # 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 @@ 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) $(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 @@ test/client/%: test/client/%.cpp ## 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 |