diff options
| author | Alan Conway <aconway@apache.org> | 2006-09-21 18:26:31 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-09-21 18:26:31 +0000 |
| commit | 474ed3cf1e125360d26dad4376e106e8b48541ac (patch) | |
| tree | 4f1043da7f03a5ec230539a62afac3fb0f0f0b73 /cpp/options.mk | |
| parent | 82e07bb30905feb2c11bb6d9f3624f976ab070a5 (diff) | |
| download | qpid-python-474ed3cf1e125360d26dad4376e106e8b48541ac.tar.gz | |
Implemented topic pattern matching for the TopicExchange.
Corrected default bindings to use the exchange named "" rather than
"amqp.direct".
Added python and unit tests for all of the above.
Minor improvements to testlib.py, also some tests for testlib itself.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@448624 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/options.mk')
| -rw-r--r-- | cpp/options.mk | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/cpp/options.mk b/cpp/options.mk index a1dfd695a7..904f58c774 100644 --- a/cpp/options.mk +++ b/cpp/options.mk @@ -1,4 +1,4 @@ - #l + # # Copyright (c) 2006 The Apache Software Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,30 +21,26 @@ COMMON_HOME = ${QPID_CPP_HOME}/common TOOLS_DIR = ${QPID_CPP_HOME}/tools LIB_DIR = ${QPID_CPP_HOME}/lib BIN_DIR = ${QPID_CPP_HOME}/bin -APR_HOME= /usr -BOOST_HOME= /usr -CPPUNIT_HOME= /usr +APR_HOME = /usr/local/apr # Compile flags -DEBUG = -g +DEBUG = -ggdb3 # _USE_APR_IO_ set when APR IO build is desired. OPT = -D _USE_APR_IO_ #-O3 APR_INCLUDES=-I ${APR_HOME}/include/apr-1/ -BOOST_INCLUDES=-I ${BOOST_HOME}/include/boost-1_33_1 -CPPUNIT_INCLUDES=-I ${CPPUNIT_HOME}/include -COMMON_INCLUDES = -I ${COMMON_HOME}/framing/inc -I ${COMMON_HOME}/framing/generated -I ${COMMON_HOME}/concurrent/inc -I ${COMMON_HOME}/io/inc -I ${COMMON_HOME}/error/inc -I $(COMMON_HOME)/utils/inc ${APR_INCLUDES} ${BOOST_INCLUDES} ${CPPUNIT_INCLUDES} +COMMON_INCLUDES = -I ${COMMON_HOME}/framing/inc -I ${COMMON_HOME}/framing/generated -I ${COMMON_HOME}/concurrent/inc -I ${COMMON_HOME}/io/inc -I ${COMMON_HOME}/error/inc -I $(COMMON_HOME)/utils/inc ${APR_INCLUDES} SRC_INCLUDES = $(COMMON_INCLUDES) -I inc TEST_INCLUDES = $(COMMON_INCLUDES) -I ../inc INCLUDES=$(SRC_INCLUDES) # Default to src CXXFLAGS = $(DEBUG) $(OPT) -MMD -fpic $(INCLUDES) +# General link flags +LDFLAGS= -L $(LIB_DIR) -L ${APR_HOME}/lib $(RPATH) + # TODO aconway 2006-09-12: This is not something we want in a release # but it's useful for development. RPATH= -Wl,-rpath,$(CURDIR)/$(LIB_DIR) -# General link flags -LDFLAGS= -L $(LIB_DIR) -L ${APR_HOME}/lib -L ${BOOST_HOME}/lib -L ${CPPUNIT_HOME}/lib $(RPATH) - # Libraries and executables. Use absolute paths so exes can find # libs wherever they are run. TODO: Proper library management. BROKER=$(BIN_DIR)/qpidd |