You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2009/07/09 16:48:13 UTC
svn commit: r792567 - in /qpid/trunk/qpid/cpp: bindings/qmf/Makefile.am
bindings/qmf/ruby/Makefile.am configure.ac
Author: tross
Date: Thu Jul 9 14:48:13 2009
New Revision: 792567
URL: http://svn.apache.org/viewvc?rev=792567&view=rev
Log:
Fix make distcheck problems
Modified:
qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am
qpid/trunk/qpid/cpp/configure.ac
Modified: qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am?rev=792567&r1=792566&r2=792567&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/Makefile.am Thu Jul 9 14:48:13 2009
@@ -17,9 +17,6 @@
# under the License.
#
-INCLUDES = -I$(top_srcdir)/src/qmf
-
EXTRA_DIST = qmfengine.i
-
-SUBDIRS = ruby python
+SUBDIRS = ruby
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=792567&r1=792566&r2=792567&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am Thu Jul 9 14:48:13 2009
@@ -19,12 +19,11 @@
if HAVE_RUBY_DEVEL
-INCLUDES = -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src/gen
+INCLUDES = -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src/gen -I$(top_srcdir)/src/gen
EXTRA_DIST = ruby.i
-
-generated_file_list = \
- qmfengine.cpp
+BUILT_SOURCES = qmfengine.cpp
+generated_file_list = qmfengine.cpp
rubylibdir = $(RUBY_LIB)
@@ -33,16 +32,14 @@
$(generated_file_list): $(srcdir)/ruby.i $(srcdir)/../qmfengine.i
$(SWIG) -ruby -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -o qmfengine.cpp $(srcdir)/ruby.i
-AM_CPPFLAGS = $(QPID_CXXFLAGS) $(INCLUDES) -I$(srcdir) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
-AM_CXXFLAGS = $(QPID_CXXFLAGS)
+#AM_CXXFLAGS = $(QPID_CXXFLAGS) $(INCLUDES) -I$(srcdir) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
rubylibarchdir = $(RUBY_LIB_ARCH)
rubylibarch_LTLIBRARIES = qmfengine.la
qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmfcommon.la
-
-qmfengine_la_SOURCES = \
- qmfengine.cpp
+qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH)
+qmfengine_la_SOURCES = qmfengine.cpp
endif # HAVE_RUBY_DEVEL
Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=792567&r1=792566&r2=792567&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Thu Jul 9 14:48:13 2009
@@ -512,7 +512,6 @@
examples/tradedemo/Makefile
bindings/qmf/Makefile
bindings/qmf/ruby/Makefile
- bindings/qmf/python/Makefile
managementgen/Makefile
etc/Makefile
src/Makefile
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org