Author: tross
Date: Fri Jan 7 17:55:07 2011
New Revision: 1056420
URL: http://svn.apache.org/viewvc?rev=1056420&view=rev
Log:
Cleaned up the makefiles for the Swig-generated bindings.
1) Suppression of some warnings
2) Proper installation of artifacts in "make install"
Modified:
qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qpid/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=1056420&r1=1056419&r2=1056420&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/python/Makefile.am Fri Jan 7 17:55:07 2011
@@ -27,9 +27,10 @@ generated_file_list = \
EXTRA_DIST = python.i
BUILT_SOURCES = $(generated_file_list)
+SWIG_FLAGS = -w362,401
$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i
- swig -c++ -python -Wall $(INCLUDES) $(QPID_CXXFLAGS)
-I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
+ swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS)
-I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
pylibdir = $(PYTHON_LIB)
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=1056420&r1=1056419&r2=1056420&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/Makefile.am Fri Jan 7 17:55:07 2011
@@ -23,13 +23,14 @@ INCLUDES = -I$(top_srcdir)/include -I$(t
EXTRA_DIST = ruby.i
BUILT_SOURCES = qmfengine.cpp
+SWIG_FLAGS = -w362,401
rubylibdir = $(RUBY_LIB)
dist_rubylib_DATA = qmf.rb
qmfengine.cpp: $(srcdir)/ruby.i $(srcdir)/../qmfengine.i
- $(SWIG) -ruby -c++ -Wall $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o
qmfengine.cpp $(srcdir)/ruby.i
+ $(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS)
-I/usr/include -o qmfengine.cpp $(srcdir)/ruby.i
rubylibarchdir = $(RUBY_LIB_ARCH)
rubylibarch_LTLIBRARIES = qmfengine.la
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am?rev=1056420&r1=1056419&r2=1056420&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am Fri Jan 7 17:55:07
2011
@@ -35,6 +35,8 @@ $(generated_file_list): $(srcdir)/python
pylibdir = $(PYTHON_LIB)
lib_LTLIBRARIES = _cqmf2.la
+cqpiddir = $(pythondir)
+cqpid_PYTHON = qmf2.py cqmf2.py
_cqmf2_la_LDFLAGS = -avoid-version -module -shared
_cqmf2_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs
$(top_builddir)/src/libqmf2.la
Modified: qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am?rev=1056420&r1=1056419&r2=1056420&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am Fri Jan 7 17:55:07
2011
@@ -27,16 +27,17 @@ generated_file_list = \
EXTRA_DIST = python.i
BUILT_SOURCES = $(generated_file_list)
+SWIG_FLAGS = -w362,401
$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i
$(srcdir)/../../swig_python_typemaps.i
- swig -c++ -python -Wall $(INCLUDES) $(QPID_CXXFLAGS)
-I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
+ swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS)
-I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
pylibdir = $(PYTHON_LIB)
lib_LTLIBRARIES = _cqpid.la
+cqpiddir = $(pythondir)
+cqpid_PYTHON = cqpid.py
-#_cqpid_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
-#_cqpid_la_LDFLAGS = -avoid-version -module -shrext ".so"
_cqpid_la_LDFLAGS = -avoid-version -module -shared
_cqpid_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging
-lqpidtypes $(top_builddir)/src/libqpidmessaging.la
$(top_builddir)/src/libqpidtypes.la
_cqpid_la_CXXFLAGS = $(INCLUDES) -I$(PYTHON_INC) -fno-strict-aliasing
Modified: qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am?rev=1056420&r1=1056419&r2=1056420&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am Fri Jan 7 17:55:07 2011
@@ -23,11 +23,12 @@ INCLUDES = -I$(top_srcdir)/include -I$(t
EXTRA_DIST = ruby.i
BUILT_SOURCES = cqpid.cpp
+SWIG_FLAGS = -w362,401
rubylibdir = $(RUBY_LIB)
cqpid.cpp: $(srcdir)/ruby.i $(srcdir)/../qpid.i
$(srcdir)/../../swig_ruby_typemaps.i
- $(SWIG) -ruby -c++ -Wall $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o
cqpid.cpp $(srcdir)/ruby.i
+ $(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS)
-I/usr/include -o cqpid.cpp $(srcdir)/ruby.i
rubylibarchdir = $(RUBY_LIB_ARCH)
rubylibarch_LTLIBRARIES = cqpid.la
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
