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 | f7f31c6a720d23749b23735b71cd401d93ded9b5 (patch) | |
| tree | 382a98e69263b7bb9704d4a5808207cce1ca9bc3 /cpp | |
| parent | 62fcd3aba9edec066e39de64c2f1c54342282a16 (diff) | |
| download | qpid-python-f7f31c6a720d23749b23735b71cd401d93ded9b5.tar.gz | |
* Fixes to enable VPATH builds.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527481 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/docs/man/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/src/Makefile.am | 7 | ||||
| -rw-r--r-- | cpp/src/broker/Configuration.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpidd.cpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cpp/docs/man/Makefile.am b/cpp/docs/man/Makefile.am index f637328cbb..7d2acd7227 100644 --- a/cpp/docs/man/Makefile.am +++ b/cpp/docs/man/Makefile.am @@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(dist_man_MANS) dist-hook: $(man_aux) -qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd +qpidd.1: $(srcdir)/qpidd.x $(top_builddir)/src/qpidd # Depend on configure.ac to get version number changes. $(dist_man_MANS): $(top_srcdir)/configure.ac diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 275af89ce9..c18eb4f719 100644 --- a/cpp/src/Makefile.am +++ b/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/cpp/src/broker/Configuration.cpp b/cpp/src/broker/Configuration.cpp index 5050314679..3449f6f179 100644 --- a/cpp/src/broker/Configuration.cpp +++ b/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/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp index f4d5286f69..c00b0e5351 100644 --- a/cpp/src/qpidd.cpp +++ b/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"; |