diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-06-02 14:21:06 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-06-02 14:21:06 +0000 |
| commit | 47385abda923df55d2bbd924f71c24479eb0c8e1 (patch) | |
| tree | ab8da81a0e32565f4b4a3a4f37440ea64ef21294 | |
| parent | 17119fd4e7d62f27eb917ed5baa8b9f52e64a654 (diff) | |
| download | qpid-python-47385abda923df55d2bbd924f71c24479eb0c8e1.tar.gz | |
Fixed out of tree build broken by QPID-1874
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@781040 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/bindings/qmf/python/Makefile.am | 6 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qmf/ruby/Makefile.am | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/qpid/cpp/bindings/qmf/python/Makefile.am b/qpid/cpp/bindings/qmf/python/Makefile.am index 57f960b9f9..c15927d758 100644 --- a/qpid/cpp/bindings/qmf/python/Makefile.am +++ b/qpid/cpp/bindings/qmf/python/Makefile.am @@ -9,8 +9,8 @@ generated_file_list = \ qmfengine.cpp \ qmfengine.py -$(generated_file_list): python.i ../qmfengine.i - swig -python -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp python.i +$(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 AM_CPPFLAGS = $(QPID_CXXFLAGS) $(INCLUDES) -I$(srcdir)/qmf -I$(PYTHON_INC) AM_CXXFLAGS = $(QPID_CXXFLAGS) @@ -20,7 +20,7 @@ pylibdir = $(PYTHON_LIB) lib_LTLIBRARIES = _qmfengine.la _qmfengine_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)" -_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(QPID_SRC)/.libs -lqpidclient $(top_srcdir)/src/libqmfcommon.la $(top_srcdir)/src/libqmfagent.la +_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(QPID_SRC)/.libs -lqpidclient ../../../src/libqmfcommon.la ../../../src/libqmfagent.la _qmfengine_la_SOURCES = \ qmfengine.cpp diff --git a/qpid/cpp/bindings/qmf/ruby/Makefile.am b/qpid/cpp/bindings/qmf/ruby/Makefile.am index 7cf053790c..f0976f60b5 100644 --- a/qpid/cpp/bindings/qmf/ruby/Makefile.am +++ b/qpid/cpp/bindings/qmf/ruby/Makefile.am @@ -12,8 +12,8 @@ rubylibdir = $(RUBY_LIB) dist_rubylib_DATA = qmf.rb -$(generated_file_list): ruby.i ../qmfengine.i - swig -ruby -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp ruby.i +$(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 AM_CPPFLAGS = $(QPID_CXXFLAGS) $(INCLUDES) -I$(srcdir) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) AM_CXXFLAGS = $(QPID_CXXFLAGS) @@ -22,7 +22,7 @@ rubylibarchdir = $(RUBY_LIB_ARCH) rubylibarch_LTLIBRARIES = qmfengine.la qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)" -qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(QPID_SRC)/.libs -lqpidclient $(top_srcdir)/src/libqmfcommon.la +qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(QPID_SRC)/.libs -lqpidclient ../../../src/libqmfcommon.la qmfengine_la_SOURCES = \ qmfengine.cpp |