c and cpp directories moved into bindings directory

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 -Wall
+@JAVA_INCLUDE@ -I$(top_srcdir)/bindings/c -Wall
 libjzmq_la_LDFLAGS = -version-info @JLTVER@
 libjzmq_la_LIBADD = $(top_builddir)/src/libzmq.la
 

devices/zmq_forwarder/Makefile.am

-INCLUDES = -I$(top_builddir)/c -I$(top_builddir)/cpp
+INCLUDES = -I$(top_builddir)/bindings/c
 
 bin_PROGRAMS = zmq_forwarder
 

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 [])

perf/c/Makefile.am

-INCLUDES = -I$(top_builddir)/c
+INCLUDES = -I$(top_builddir)/bindings/c
 
 noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr
 

perf/cpp/Makefile.am

-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
 

perf/java/Makefile.am

-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

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
 

src/app_thread.cpp

@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "platform.hpp"
 

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"

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
 {

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"

src/msg_content.hpp

@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-#include "../c/zmq.h"
+#include "../bindings/c/zmq.h"
 
 #include "atomic_counter.hpp"
 

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"
 

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"

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"

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"

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"

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>

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"
 

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"