diff options
| author | Alan Conway <aconway@apache.org> | 2007-04-11 13:06:30 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-04-11 13:06:30 +0000 |
| commit | 86336dc0d461ea6069f61aae72778e9fe6511b86 (patch) | |
| tree | 6522df7799047c34196ae0dce9cc667fe24706e3 /qpid/cpp/src | |
| parent | da821ce9991650d72d67172979ca117eb6744b58 (diff) | |
| download | qpid-python-86336dc0d461ea6069f61aae72778e9fe6511b86.tar.gz | |
* Fixes to enable VPATH builds.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@527481 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 7 | ||||
| -rw-r--r-- | qpid/cpp/src/broker/Configuration.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpidd.cpp | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 275af89ce9..c18eb4f719 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -4,11 +4,10 @@ BUILT_SOURCES = $(generated_sources) $(generated_headers) SUBDIRS = . tests -AM_CXXFLAGS = $(WARNING_CFLAGS) +AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS) -INCLUDES = \ - -I$(srcdir)/gen \ - $(APR_CXXFLAGS) +# -I top_builddir for config.h +INCLUDES = -I$(top_builddir) -I$(srcdir)/gen qpidd_LDADD = \ libqpidbroker.la \ diff --git a/qpid/cpp/src/broker/Configuration.cpp b/qpid/cpp/src/broker/Configuration.cpp index 5050314679..3449f6f179 100644 --- a/qpid/cpp/src/broker/Configuration.cpp +++ b/qpid/cpp/src/broker/Configuration.cpp @@ -20,7 +20,7 @@ */ #include "Configuration.h" #include <string.h> -#include "../../config.h" +#include "config.h" using namespace qpid::broker; using namespace std; diff --git a/qpid/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp index f4d5286f69..c00b0e5351 100644 --- a/qpid/cpp/src/qpidd.cpp +++ b/qpid/cpp/src/qpidd.cpp @@ -24,7 +24,7 @@ #include <iostream> #include <memory> #include <cerrno> -#include "../config.h" +#include "config.h" #include <unistd.h> static char const* programName = "qpidd"; |