diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-06-02 14:45:39 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-06-02 14:45:39 +0000 |
| commit | 8664304b9781be333636baa887569547e7f76546 (patch) | |
| tree | 466f27b2be1d98db15776f8d0fe853333fd01e15 /cpp/bindings | |
| parent | 7d4082b071338ab22293c633488b33fec120e604 (diff) | |
| download | qpid-python-8664304b9781be333636baa887569547e7f76546.tar.gz | |
Bit more fixed for QPID-1874
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@781046 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/bindings')
| -rw-r--r-- | cpp/bindings/qmf/python/Makefile.am | 8 | ||||
| -rw-r--r-- | cpp/bindings/qmf/ruby/Makefile.am | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cpp/bindings/qmf/python/Makefile.am b/cpp/bindings/qmf/python/Makefile.am index c15927d758..fbae429ba7 100644 --- a/cpp/bindings/qmf/python/Makefile.am +++ b/cpp/bindings/qmf/python/Makefile.am @@ -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 @@ generated_file_list = \ 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 @@ 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 ../../../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 diff --git a/cpp/bindings/qmf/ruby/Makefile.am b/cpp/bindings/qmf/ruby/Makefile.am index f0976f60b5..d7f9c18911 100644 --- a/cpp/bindings/qmf/ruby/Makefile.am +++ b/cpp/bindings/qmf/ruby/Makefile.am @@ -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 @@ rubylibdir = $(RUBY_LIB) 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 @@ 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 ../../../src/libqmfcommon.la +qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(QPID_SRC)/.libs -lqpidclient $(top_builddir)/src/libqmfcommon.la qmfengine_la_SOURCES = \ qmfengine.cpp |