Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 22127 invoked from network); 11 Apr 2007 13:07:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Apr 2007 13:07:03 -0000 Received: (qmail 73620 invoked by uid 500); 11 Apr 2007 13:07:09 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 73610 invoked by uid 500); 11 Apr 2007 13:07:09 -0000 Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: qpid-dev@incubator.apache.org Delivered-To: mailing list qpid-commits@incubator.apache.org Received: (qmail 73600 invoked by uid 99); 11 Apr 2007 13:07:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2007 06:07:09 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2007 06:07:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A2F4C1A9838; Wed, 11 Apr 2007 06:06:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r527481 - in /incubator/qpid/trunk/qpid/cpp: docs/man/Makefile.am src/Makefile.am src/broker/Configuration.cpp src/qpidd.cpp Date: Wed, 11 Apr 2007 13:06:33 -0000 To: qpid-commits@incubator.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070411130640.A2F4C1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 -#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 #include #include -#include "../config.h" +#include "config.h" #include static char const* programName = "qpidd";