Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 3929 invoked from network); 2 Jun 2009 14:45:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Jun 2009 14:45:52 -0000 Received: (qmail 16066 invoked by uid 500); 2 Jun 2009 14:46:04 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 16050 invoked by uid 500); 2 Jun 2009 14:46:04 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 16041 invoked by uid 99); 2 Jun 2009 14:46:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 14:46:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 14:46:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED2AC2388882; Tue, 2 Jun 2009 14:45:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r781046 - in /qpid/trunk/qpid/cpp/bindings/qmf: python/Makefile.am ruby/Makefile.am Date: Tue, 02 Jun 2009 14:45:39 -0000 To: commits@qpid.apache.org From: astitcher@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090602144539.ED2AC2388882@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: astitcher Date: Tue Jun 2 14:45:39 2009 New Revision: 781046 URL: http://svn.apache.org/viewvc?rev=781046&view=rev Log: Bit more fixed for QPID-1874 Modified: qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am Modified: qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am?rev=781046&r1=781045&r2=781046&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am (original) +++ qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am Tue Jun 2 14:45:39 2009 @@ -1,7 +1,7 @@ if HAVE_PYTHON_DEVEL -INCLUDES = -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_srcdir)/src/gen +INCLUDES = -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src/gen EXTRA_DIST = python.i @@ -9,8 +9,8 @@ qmfengine.cpp \ qmfengine.py -$(generated_file_list): $(top_srcdir)/bindings/qmf/python/python.i $(top_srcdir)/bindings/qmf/qmfengine.i - swig -python -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp $(top_srcdir)/bindings/qmf/python/python.i +$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i + swig -python -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp $(srcdir)/python.i AM_CPPFLAGS = $(QPID_CXXFLAGS) $(INCLUDES) -I$(srcdir)/qmf -I$(PYTHON_INC) AM_CXXFLAGS = $(QPID_CXXFLAGS) @@ -20,7 +20,7 @@ lib_LTLIBRARIES = _qmfengine.la _qmfengine_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)" -_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(QPID_SRC)/.libs -lqpidclient ../../../src/libqmfcommon.la ../../../src/libqmfagent.la +_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(QPID_SRC)/.libs -lqpidclient $(top_builddir)/src/libqmfcommon.la $(top_builddir)/src/libqmfagent.la _qmfengine_la_SOURCES = \ qmfengine.cpp Modified: qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am?rev=781046&r1=781045&r2=781046&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am (original) +++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am Tue Jun 2 14:45:39 2009 @@ -1,7 +1,7 @@ if HAVE_RUBY_DEVEL -INCLUDES = -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_srcdir)/src/gen +INCLUDES = -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src/gen EXTRA_DIST = ruby.i @@ -12,8 +12,8 @@ dist_rubylib_DATA = qmf.rb -$(generated_file_list): $(top_srcdir)/bindings/qmf/ruby/ruby.i $(top_srcdir)/bindings/qmf/qmfengine.i - swig -ruby -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp $(top_srcdir)/bindings/qmf/ruby/ruby.i +$(generated_file_list): $(srcdir)/ruby.i $(srcdir)/../qmfengine.i + swig -ruby -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp $(srcdir)/ruby.i AM_CPPFLAGS = $(QPID_CXXFLAGS) $(INCLUDES) -I$(srcdir) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) AM_CXXFLAGS = $(QPID_CXXFLAGS) @@ -22,7 +22,7 @@ rubylibarch_LTLIBRARIES = qmfengine.la qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)" -qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(QPID_SRC)/.libs -lqpidclient ../../../src/libqmfcommon.la +qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(QPID_SRC)/.libs -lqpidclient $(top_builddir)/src/libqmfcommon.la qmfengine_la_SOURCES = \ qmfengine.cpp --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org