diff options
| author | Ted Ross <tross@apache.org> | 2009-07-09 14:48:13 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2009-07-09 14:48:13 +0000 |
| commit | 6441532eb3ec3b71566d38f8ebf3969ff9a3b2fb (patch) | |
| tree | afe456601ac879d2c3acb4fa2b04201848b95ebd /qpid/cpp/bindings | |
| parent | 6eecb365dc033d8909aac0797565825817d3197b (diff) | |
| download | qpid-python-6441532eb3ec3b71566d38f8ebf3969ff9a3b2fb.tar.gz | |
Fix make distcheck problems
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@792567 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/bindings')
| -rw-r--r-- | qpid/cpp/bindings/qmf/Makefile.am | 5 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qmf/ruby/Makefile.am | 15 |
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 |