You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/04/11 15:06:33 UTC
svn commit: r527481 - in /incubator/qpid/trunk/qpid/cpp:
docs/man/Makefile.am src/Makefile.am src/broker/Configuration.cpp
src/qpidd.cpp
Author: aconway
Date: Wed Apr 11 06:06:30 2007
New Revision: 527481
URL: http://svn.apache.org/viewvc?view=rev&rev=527481
Log:
* Fixes to enable VPATH builds.
Modified:
incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp
incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
Modified: incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am?view=diff&rev=527481&r1=527480&r2=527481
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/man/Makefile.am Wed Apr 11 06:06:30 2007
@@ -6,7 +6,7 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=527481&r1=527480&r2=527481
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Apr 11 06:06:30 2007
@@ -4,11 +4,10 @@
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 \
Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp?view=diff&rev=527481&r1=527480&r2=527481
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Configuration.cpp Wed Apr 11 06:06:30 2007
@@ -20,7 +20,7 @@
*/
#include "Configuration.h"
#include <string.h>
-#include "../../config.h"
+#include "config.h"
using namespace qpid::broker;
using namespace std;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp?view=diff&rev=527481&r1=527480&r2=527481
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp Wed Apr 11 06:06:30 2007
@@ -24,7 +24,7 @@
#include <iostream>
#include <memory>
#include <cerrno>
-#include "../config.h"
+#include "config.h"
#include <unistd.h>
static char const* programName = "qpidd";