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-subscr...@qpid.apache.org
