Author: astitcher
Date: Wed Nov 28 15:03:54 2012
New Revision: 1414741
URL: http://svn.apache.org/viewvc?rev=1414741&view=rev
Log:
NO-JIRA: Fix bindings breakage from previous checkins
Modified:
qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am
qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i
qpid/trunk/qpid/cpp/bindings/qpid/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/qmf2/python/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am?rev=1414741&r1=1414740&r2=1414741&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/python/Makefile.am Wed Nov 28 15:03:54
2012
@@ -19,7 +19,7 @@
if HAVE_PYTHON_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings
-I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
$(QMF_INCLUDES)
generated_file_list = \
cqmf2.cpp \
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt?rev=1414741&r1=1414740&r2=1414741&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt Wed Nov 28 15:03:54
2012
@@ -22,7 +22,9 @@
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES
CPLUSPLUS ON)
-include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
+include_directories(${RUBY_INCLUDE_DIRS}
+ ${qpid-cpp_SOURCE_DIR}/include
+ ${qpid-cpp_SOURCE_DIR}/bindings)
swig_add_module(cqmf2_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(cqmf2_ruby qmf2 ${RUBY_LIBRARY})
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am?rev=1414741&r1=1414740&r2=1414741&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/ruby/Makefile.am Wed Nov 28 15:03:54 2012
@@ -19,7 +19,7 @@
if HAVE_RUBY_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-I$(top_srcdir)/src -I$(top_builddir)/src $(QMF_INCLUDES)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings
-I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
$(QMF_INCLUDES)
EXTRA_DIST = CMakeLists.txt ruby.i
BUILT_SOURCES = cqmf2.cpp
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i?rev=1414741&r1=1414740&r2=1414741&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/ruby/ruby.i Wed Nov 28 15:03:54 2012
@@ -34,4 +34,4 @@
}
}
-%include "qmf2.i"
+%include "qmf/qmf2.i"
Modified: qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am?rev=1414741&r1=1414740&r2=1414741&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/Makefile.am Wed Nov 28 15:03:54 2012
@@ -33,7 +33,7 @@ endif
if HAVE_PERL_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings
-I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
-I$(PERL_INC)
EXTRA_DIST += perl/perl.i perl/CMakeLists.txt
BUILT_SOURCES = perl/cqpid_perl.cpp
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=1414741&r1=1414740&r2=1414741&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/python/Makefile.am Wed Nov 28 15:03:54
2012
@@ -19,7 +19,7 @@
if HAVE_PYTHON_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings
-I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src
-I$(top_builddir)/src
generated_file_list = \
cqpid.cpp \
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=1414741&r1=1414740&r2=1414741&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/ruby/Makefile.am Wed Nov 28 15:03:54 2012
@@ -19,7 +19,7 @@
if HAVE_RUBY_DEVEL
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-I$(top_srcdir)/src -I$(top_builddir)/src
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings
-I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
EXTRA_DIST = CMakeLists.txt ruby.i
BUILT_SOURCES = cqpid.cpp
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
