diff options
| author | Steven Shaw <steshaw@apache.org> | 2006-11-21 19:08:47 +0000 |
|---|---|---|
| committer | Steven Shaw <steshaw@apache.org> | 2006-11-21 19:08:47 +0000 |
| commit | fc6215f5a468f5ccb20e43dcee34e1d68c30d7f7 (patch) | |
| tree | ddedfdb08b5b21ed14be196cc837739677641c06 /qpid/cpp/options.mk | |
| parent | e3153484cc638260c33cb26aa333156ff3d6c3c1 (diff) | |
| download | qpid-python-fc6215f5a468f5ccb20e43dcee34e1d68c30d7f7.tar.gz | |
QPID-120 Enabled qpid-cpp to build on RHEL3 with less pain.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@477826 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/options.mk')
| -rw-r--r-- | qpid/cpp/options.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qpid/cpp/options.mk b/qpid/cpp/options.mk index 351f4bdefd..9fd966ad6a 100644 --- a/qpid/cpp/options.mk +++ b/qpid/cpp/options.mk @@ -36,8 +36,10 @@ endif ifdef USE_APR PLATFORM := apr IGNORE := posix -CXXFLAGS := $(CXXFLAGS) -DUSE_APR -I$(shell apr-1-config --includedir) -LDFLAGS := $(LDFLAGS) -L/usr/local/apr/lib -lapr-1 +APR_LDFLAGS := $(shell apr-1-config --link-ld --libs) +APR_CFLAGS := -DUSE_APR -I$(shell apr-1-config --includedir) +CXXFLAGS := $(CXXFLAGS) $(APR_CFLAGS) +LDFLAGS := $(LDFLAGS) $(APR_LDFLAGS) else PLATFORM := posix IGNORE := apr @@ -72,7 +74,9 @@ EXTRA_LIBDIRS := # -Wunreachable-code -Wpadded -Winline # -Wshadow - warns about boost headers. # +ifndef WARN WARN := -Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers +endif INCLUDES := $(SRCDIRS:%=-I%) $(EXTRA_INCLUDES) LDFLAGS := $(LDFLAGS) -L$(LIBDIR) @@ -90,3 +94,4 @@ LIBFILE =$(CURDIR)/$(LIBDIR)/libqpid_$1.so.$2 LIB_COMMAND = mkdir -p $(dir $@) && $(CXX) -shared -o $@ $(LDFLAGS) $(CXXFLAGS) $^ +-include options-local-override.mk |