summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am17
-rw-r--r--bindings/Makefile.am15
-rw-r--r--bindings/c/zmq.h (renamed from c/zmq.h)0
-rw-r--r--bindings/cpp/zmq.hpp (renamed from cpp/zmq.hpp)0
-rw-r--r--bindings/java/Context.cpp (renamed from java/Context.cpp)0
-rw-r--r--bindings/java/Makefile.am (renamed from java/Makefile.am)2
-rw-r--r--bindings/java/Socket.cpp (renamed from java/Socket.cpp)0
-rw-r--r--bindings/java/org/zmq/Context.java (renamed from java/org/zmq/Context.java)0
-rw-r--r--bindings/java/org/zmq/Socket.java (renamed from java/org/zmq/Socket.java)0
-rw-r--r--bindings/python/Makefile.am (renamed from python/Makefile.am)0
-rw-r--r--bindings/python/pyzmq.cpp (renamed from python/pyzmq.cpp)0
-rw-r--r--bindings/python/setup.py.in (renamed from python/setup.py.in)0
-rw-r--r--bindings/ruby/Makefile.am (renamed from ruby/Makefile.am)0
-rw-r--r--bindings/ruby/extconf.rb (renamed from ruby/extconf.rb)0
-rw-r--r--bindings/ruby/rbzmq.cpp (renamed from ruby/rbzmq.cpp)0
-rw-r--r--configure.in7
-rw-r--r--devices/zmq_forwarder/Makefile.am2
-rw-r--r--devices/zmq_forwarder/zmq_forwarder.cpp2
-rw-r--r--perf/c/Makefile.am2
-rw-r--r--perf/cpp/Makefile.am2
-rw-r--r--perf/java/Makefile.am2
-rw-r--r--src/Makefile.am4
-rw-r--r--src/app_thread.cpp2
-rw-r--r--src/dispatcher.cpp2
-rw-r--r--src/i_inout.hpp2
-rw-r--r--src/io_thread.cpp2
-rw-r--r--src/msg_content.hpp2
-rw-r--r--src/pipe.cpp2
-rw-r--r--src/pipe.hpp2
-rw-r--r--src/pub.cpp2
-rw-r--r--src/socket_base.cpp2
-rw-r--r--src/sub.cpp2
-rw-r--r--src/zmq.cpp2
-rw-r--r--src/zmq_decoder.hpp2
-rw-r--r--src/zmq_encoder.hpp2
35 files changed, 43 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am
index b1aa70d..b06c00e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,12 @@
-if BUILD_PYTHON
-DIR_P = python
-endif
-
-if BUILD_RUBY
-DIR_R = ruby
-endif
-
-if BUILD_JAVA
-DIR_J = java
-endif
-
if BUILD_PERF
DIR_PERF = perf
endif
-SUBDIRS = src $(DIR_P) $(DIR_R) $(DIR_J) $(DIR_PERF) devices
-DIST_SUBDIRS = src python ruby java perf devices
+SUBDIRS = src $(DIR_PERF) devices bindings
+DIST_SUBDIRS = src perf devices bindings
EXTRA_DIST = $(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.bz2
dist-hook:
-rm -rf $(distdir)/foreign/openpgm/@pgm_basename@
+
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
new file mode 100644
index 0000000..77b4ec2
--- /dev/null
+++ b/bindings/Makefile.am
@@ -0,0 +1,15 @@
+if BUILD_JAVA
+DIR_J = java
+endif
+
+if BUILD_PYTHON
+DIR_P = python
+endif
+
+if BUILD_RUBY
+DIR_R = ruby
+endif
+
+SUBDIRS = $(DIR_J) $(DIR_P) $(DIR_R)
+DIST_SUBDIRS = java python ruby
+
diff --git a/c/zmq.h b/bindings/c/zmq.h
index 732ecb9..732ecb9 100644
--- a/c/zmq.h
+++ b/bindings/c/zmq.h
diff --git a/cpp/zmq.hpp b/bindings/cpp/zmq.hpp
index 471d1d8..471d1d8 100644
--- a/cpp/zmq.hpp
+++ b/bindings/cpp/zmq.hpp
diff --git a/java/Context.cpp b/bindings/java/Context.cpp
index 67094e8..67094e8 100644
--- a/java/Context.cpp
+++ b/bindings/java/Context.cpp
diff --git a/java/Makefile.am b/bindings/java/Makefile.am
index 97e6cb9..c9e430c 100644
--- a/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -22,7 +22,7 @@ libjzmq_la_SOURCES = \
org_zmq_Socket.h
libjzmq_la_CXXFLAGS = -I$(top_srcdir)/src/libzmq \
-@JAVA_INCLUDE@ -I$(top_srcdir)/c -I$(top_srcdir)/libjzmq -Wall
+@JAVA_INCLUDE@ -I$(top_srcdir)/bindings/c -Wall
libjzmq_la_LDFLAGS = -version-info @JLTVER@
libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la
diff --git a/java/Socket.cpp b/bindings/java/Socket.cpp
index 2274535..2274535 100644
--- a/java/Socket.cpp
+++ b/bindings/java/Socket.cpp
diff --git a/java/org/zmq/Context.java b/bindings/java/org/zmq/Context.java
index c63ef60..c63ef60 100644
--- a/java/org/zmq/Context.java
+++ b/bindings/java/org/zmq/Context.java
diff --git a/java/org/zmq/Socket.java b/bindings/java/org/zmq/Socket.java
index 501bc16..501bc16 100644
--- a/java/org/zmq/Socket.java
+++ b/bindings/java/org/zmq/Socket.java
diff --git a/python/Makefile.am b/bindings/python/Makefile.am
index effe8b9..effe8b9 100644
--- a/python/Makefile.am
+++ b/bindings/python/Makefile.am
diff --git a/python/pyzmq.cpp b/bindings/python/pyzmq.cpp
index 628d037..628d037 100644
--- a/python/pyzmq.cpp
+++ b/bindings/python/pyzmq.cpp
diff --git a/python/setup.py.in b/bindings/python/setup.py.in
index f7055d5..f7055d5 100644
--- a/python/setup.py.in
+++ b/bindings/python/setup.py.in
diff --git a/ruby/Makefile.am b/bindings/ruby/Makefile.am
index 148daf0..148daf0 100644
--- a/ruby/Makefile.am
+++ b/bindings/ruby/Makefile.am
diff --git a/ruby/extconf.rb b/bindings/ruby/extconf.rb
index f931c5e..f931c5e 100644
--- a/ruby/extconf.rb
+++ b/bindings/ruby/extconf.rb
diff --git a/ruby/rbzmq.cpp b/bindings/ruby/rbzmq.cpp
index bf0d9bc..bf0d9bc 100644
--- a/ruby/rbzmq.cpp
+++ b/bindings/ruby/rbzmq.cpp
diff --git a/configure.in b/configure.in
index dd9f0b6..f518509 100644
--- a/configure.in
+++ b/configure.in
@@ -488,10 +488,11 @@ AC_FUNC_MALLOC
AC_TYPE_SIGNAL
AC_CHECK_FUNCS(perror gettimeofday memset socket getifaddrs freeifaddrs)
-AC_OUTPUT(Makefile src/Makefile python/Makefile python/setup.py ruby/Makefile \
- java/Makefile perf/Makefile perf/c/Makefile perf/cpp/Makefile \
+AC_OUTPUT(Makefile src/Makefile bindings/python/Makefile \
+ bindings/python/setup.py bindings/ruby/Makefile \
+ bindings/java/Makefile perf/Makefile perf/c/Makefile perf/cpp/Makefile \
perf/python/Makefile perf/ruby/Makefile perf/java/Makefile src/libzmq.pc \
- devices/Makefile devices/zmq_forwarder/Makefile)
+ devices/Makefile devices/zmq_forwarder/Makefile bindings/Makefile)
AC_MSG_RESULT([])
AC_MSG_RESULT([ ******************************************************** ])
diff --git a/devices/zmq_forwarder/Makefile.am b/devices/zmq_forwarder/Makefile.am
index 892b7fe..ff51d88 100644
--- a/devices/zmq_forwarder/Makefile.am
+++ b/devices/zmq_forwarder/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/c -I$(top_builddir)/cpp
+INCLUDES = -I$(top_builddir)/bindings/c
bin_PROGRAMS = zmq_forwarder
diff --git a/devices/zmq_forwarder/zmq_forwarder.cpp b/devices/zmq_forwarder/zmq_forwarder.cpp
index 8acbc85..32af5dd 100644
--- a/devices/zmq_forwarder/zmq_forwarder.cpp
+++ b/devices/zmq_forwarder/zmq_forwarder.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../../cpp/zmq.hpp"
+#include "../../bindings/cpp/zmq.hpp"
#include "../../foreign/xmlParser/xmlParser.cpp"
int main (int argc, char *argv [])
diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am
index 430a9f2..e23816b 100644
--- a/perf/c/Makefile.am
+++ b/perf/c/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/c
+INCLUDES = -I$(top_builddir)/bindings/c
noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr
diff --git a/perf/cpp/Makefile.am b/perf/cpp/Makefile.am
index 1ea01a0..65ffe68 100644
--- a/perf/cpp/Makefile.am
+++ b/perf/cpp/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/cpp -I$(top_srcdir)/c
+INCLUDES = -I$(top_srcdir)/bindings/cpp -I$(top_srcdir)/bindings/c
noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr
diff --git a/perf/java/Makefile.am b/perf/java/Makefile.am
index 6552e80..4f370b8 100644
--- a/perf/java/Makefile.am
+++ b/perf/java/Makefile.am
@@ -1,4 +1,4 @@
-AM_JAVACFLAGS=-classpath $(top_builddir)/java
+AM_JAVACFLAGS=-classpath $(top_builddir)/bindings/java
dist_noinst_JAVA = local_lat.java remote_lat.java local_thr.java \
remote_thr.java
diff --git a/src/Makefile.am b/src/Makefile.am
index 398c861..2701237 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,14 +4,14 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libzmq.pc
if BUILD_CPP
-include_HEADERS = ../cpp/zmq.hpp ../c/zmq.h
+include_HEADERS = ../bindings/cpp/zmq.hpp ../bindings/c/zmq.h
endif
if BUILD_C
if BUILD_CPP
else
-include_HEADERS = ../c/zmq.h
+include_HEADERS = ../bindings/c/zmq.h
endif
endif
diff --git a/src/app_thread.cpp b/src/app_thread.cpp
index feaa4d6..f523f40 100644
--- a/src/app_thread.cpp
+++ b/src/app_thread.cpp
@@ -19,7 +19,7 @@
#include <algorithm>
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "platform.hpp"
diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp
index 6ac9fa2..4c4ec80 100644
--- a/src/dispatcher.cpp
+++ b/src/dispatcher.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "dispatcher.hpp"
#include "app_thread.hpp"
diff --git a/src/i_inout.hpp b/src/i_inout.hpp
index 4664b13..6be6169 100644
--- a/src/i_inout.hpp
+++ b/src/i_inout.hpp
@@ -20,7 +20,7 @@
#ifndef __ZMQ_I_INOUT_HPP_INCLUDED__
#define __ZMQ_I_INOUT_HPP_INCLUDED__
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
namespace zmq
{
diff --git a/src/io_thread.cpp b/src/io_thread.cpp
index d5de497..afac11c 100644
--- a/src/io_thread.cpp
+++ b/src/io_thread.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "io_thread.hpp"
#include "command.hpp"
diff --git a/src/msg_content.hpp b/src/msg_content.hpp
index 6c91966..22dd915 100644
--- a/src/msg_content.hpp
+++ b/src/msg_content.hpp
@@ -22,7 +22,7 @@
#include <stddef.h>
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "atomic_counter.hpp"
diff --git a/src/pipe.cpp b/src/pipe.cpp
index 6e590df..f4cf0c4 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "pipe.hpp"
diff --git a/src/pipe.hpp b/src/pipe.hpp
index 81316e4..ede73b8 100644
--- a/src/pipe.hpp
+++ b/src/pipe.hpp
@@ -20,7 +20,7 @@
#ifndef __ZMQ_PIPE_HPP_INCLUDED__
#define __ZMQ_PIPE_HPP_INCLUDED__
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "stdint.hpp"
#include "i_endpoint.hpp"
diff --git a/src/pub.cpp b/src/pub.cpp
index 5c6e329..ca8afae 100644
--- a/src/pub.cpp
+++ b/src/pub.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "pub.hpp"
#include "err.hpp"
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 570be9e..9806465 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -20,7 +20,7 @@
#include <string>
#include <algorithm>
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "socket_base.hpp"
#include "app_thread.hpp"
diff --git a/src/sub.cpp b/src/sub.cpp
index 101c62f..515a843 100644
--- a/src/sub.cpp
+++ b/src/sub.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "sub.hpp"
#include "err.hpp"
diff --git a/src/zmq.cpp b/src/zmq.cpp
index c966448..c567b09 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/src/zmq_decoder.hpp b/src/zmq_decoder.hpp
index 16b5312..59c8671 100644
--- a/src/zmq_decoder.hpp
+++ b/src/zmq_decoder.hpp
@@ -20,7 +20,7 @@
#ifndef __ZMQ_ZMQ_DECODER_HPP_INCLUDED__
#define __ZMQ_ZMQ_DECODER_HPP_INCLUDED__
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "decoder.hpp"
diff --git a/src/zmq_encoder.hpp b/src/zmq_encoder.hpp
index 55826a5..102c434 100644
--- a/src/zmq_encoder.hpp
+++ b/src/zmq_encoder.hpp
@@ -20,7 +20,7 @@
#ifndef __ZMQ_ZMQ_ENCODER_HPP_INCLUDED__
#define __ZMQ_ZMQ_ENCODER_HPP_INCLUDED__
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
#include "encoder.hpp"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:08:41 +0000