From f7f31c6a720d23749b23735b71cd401d93ded9b5 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Wed, 11 Apr 2007 13:06:30 +0000
Subject: * Fixes to enable VPATH builds.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@527481 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/Makefile.am              | 7 +++----
 cpp/src/broker/Configuration.cpp | 2 +-
 cpp/src/qpidd.cpp                | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'cpp/src')

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";
-- 
cgit v1.2.1