2 files changed, 7 insertions, 13 deletions
diff --git a/qpid/cpp/bindings/qmf/Makefile.am b/qpid/cpp/bindings/qmf/Makefile.am
index 538ffbf4d7..1693248e9d 100644
--- a/qpid/cpp/bindings/qmf/Makefile.am
+++ b/qpid/cpp/bindings/qmf/Makefile.am
@@ -17,9 +17,6 @@
 # under the License.
 #
 
-INCLUDES = -I$(top_srcdir)/src/qmf
-
 EXTRA_DIST = qmfengine.i
-
-SUBDIRS = ruby python
+SUBDIRS    = ruby
 
diff --git a/qpid/cpp/bindings/qmf/ruby/Makefile.am b/qpid/cpp/bindings/qmf/ruby/Makefile.am
index 80af3569a3..5db4dc3340 100644
--- a/qpid/cpp/bindings/qmf/ruby/Makefile.am
+++ b/qpid/cpp/bindings/qmf/ruby/Makefile.am
@@ -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 @@ dist_rubylib_DATA = qmf.rb
 $(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