summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarryl L. Pierce <mcpierce@apache.org>2013-02-19 19:19:02 +0000
committerDarryl L. Pierce <mcpierce@apache.org>2013-02-19 19:19:02 +0000
commit984f5280168625326fdc74225c0f891b0e43bd9b (patch)
tree576783a83303e7bba4d68f7fe972ffd49953e49b
parenta134ab99d953d9db39c2c499c4c08e4962a73077 (diff)
downloadqpid-python-984f5280168625326fdc74225c0f891b0e43bd9b.tar.gz
QPID-4588: Moved the swig descriptors to the include/qpid directory.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1447877 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/CMakeLists.txt6
-rw-r--r--cpp/Makefile.am2
-rw-r--r--cpp/include/qpid/swig_perl_typemaps.i (renamed from cpp/bindings/swig_perl_typemaps.i)0
-rw-r--r--cpp/include/qpid/swig_python_typemaps.i (renamed from cpp/bindings/swig_python_typemaps.i)0
-rw-r--r--cpp/include/qpid/swig_ruby_typemaps.i (renamed from cpp/bindings/swig_ruby_typemaps.i)0
5 files changed, 4 insertions, 4 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index c9b882e478..f9b3be6099 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -69,9 +69,9 @@ set (QPIDD_CONF_FILE ${QPIDD_CONF_PATH} CACHE STRING
install(FILES LICENSE NOTICE DESTINATION ${QPID_INSTALL_DOCDIR})
install(FILES include/qpid/qpid.i
- bindings/swig_perl_typemaps.i
- bindings/swig_python_typemaps.i
- bindings/swig_ruby_typemaps.i
+ include/qpid/swig_perl_typemaps.i
+ include/qpid/swig_python_typemaps.i
+ include/qpid/swig_ruby_typemaps.i
DESTINATION ${QPID_INSTALL_DATADIR}/qpid)
install(FILES include/qmf/qmfengine.i
include/qmf/qmf2.i
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 374f09ebaf..f17170e109 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = \
LICENSE NOTICE README.txt SSL RELEASE_NOTES DESIGN \
INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake \
packaging/NSIS QPID_VERSION.txt bindings/CMakeLists.txt \
- bindings/swig_python_typemaps.i bindings/swig_ruby_typemaps.i bindings/swig_perl_typemaps.i \
+ include/qpid/swig_python_typemaps.i include/qpid/swig_ruby_typemaps.i include/qpid/swig_perl_typemaps.i \
include/qpid/qpid.i include/qmf/qmfengine.i include/qmf/qmf2.i
SUBDIRS = managementgen etc src docs/api docs/man examples bindings/qmf bindings/qpid bindings/qmf2
diff --git a/cpp/bindings/swig_perl_typemaps.i b/cpp/include/qpid/swig_perl_typemaps.i
index 7730b69ce7..7730b69ce7 100644
--- a/cpp/bindings/swig_perl_typemaps.i
+++ b/cpp/include/qpid/swig_perl_typemaps.i
diff --git a/cpp/bindings/swig_python_typemaps.i b/cpp/include/qpid/swig_python_typemaps.i
index 25a4e46b18..25a4e46b18 100644
--- a/cpp/bindings/swig_python_typemaps.i
+++ b/cpp/include/qpid/swig_python_typemaps.i
diff --git a/cpp/bindings/swig_ruby_typemaps.i b/cpp/include/qpid/swig_ruby_typemaps.i
index 1a07cc86b0..1a07cc86b0 100644
--- a/cpp/bindings/swig_ruby_typemaps.i
+++ b/cpp/include/qpid/swig_ruby_typemaps.i