diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 15 | ||||
| -rw-r--r-- | src/app_thread.cpp | 2 | ||||
| -rw-r--r-- | src/dispatcher.cpp | 2 | ||||
| -rw-r--r-- | src/i_inout.hpp | 2 | ||||
| -rw-r--r-- | src/io_thread.cpp | 2 | ||||
| -rw-r--r-- | src/msg_content.hpp | 2 | ||||
| -rw-r--r-- | src/pipe.cpp | 2 | ||||
| -rw-r--r-- | src/pipe.hpp | 2 | ||||
| -rw-r--r-- | src/socket_base.cpp | 2 | ||||
| -rw-r--r-- | src/zmq.cpp | 2 | ||||
| -rw-r--r-- | src/zmq_decoder.hpp | 2 | ||||
| -rw-r--r-- | src/zmq_encoder.hpp | 2 |
12 files changed, 23 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 88a6f4b..da442f4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,17 @@ lib_LTLIBRARIES = libzmq.la -pkginclude_HEADERS = \ - ../include/zmq.h \ - ../include/zmq.hpp + +if BUILD_CPP +include_HEADERS = ../cpp/zmq.hpp ../c/zmq.h +endif + +if BUILD_C +if BUILD_CPP + +else +include_HEADERS = ../c/zmq.h +endif +endif libzmq_la_SOURCES = \ app_thread.hpp \ diff --git a/src/app_thread.cpp b/src/app_thread.cpp index 847fcc1..bdceca5 100644 --- a/src/app_thread.cpp +++ b/src/app_thread.cpp @@ -19,7 +19,7 @@ #include <algorithm> -#include "../include/zmq.h" +#include "../c/zmq.h" #include "platform.hpp" diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 49c2197..530238d 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 "../include/zmq.h" +#include "../c/zmq.h" #include "dispatcher.hpp" #include "app_thread.hpp" diff --git a/src/i_inout.hpp b/src/i_inout.hpp index 89b9fbd..4664b13 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 "../include/zmq.h" +#include "../c/zmq.h" namespace zmq { diff --git a/src/io_thread.cpp b/src/io_thread.cpp index 1d85292..d5de497 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 "../include/zmq.h" +#include "../c/zmq.h" #include "io_thread.hpp" #include "command.hpp" diff --git a/src/msg_content.hpp b/src/msg_content.hpp index b468746..6c91966 100644 --- a/src/msg_content.hpp +++ b/src/msg_content.hpp @@ -22,7 +22,7 @@ #include <stddef.h> -#include "../include/zmq.h" +#include "../c/zmq.h" #include "atomic_counter.hpp" diff --git a/src/pipe.cpp b/src/pipe.cpp index 392d380..a5a18be 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 "../include/zmq.h" +#include "../c/zmq.h" #include "pipe.hpp" diff --git a/src/pipe.hpp b/src/pipe.hpp index b4e592a..81316e4 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -20,7 +20,7 @@ #ifndef __ZMQ_PIPE_HPP_INCLUDED__ #define __ZMQ_PIPE_HPP_INCLUDED__ -#include "../include/zmq.h" +#include "../c/zmq.h" #include "stdint.hpp" #include "i_endpoint.hpp" diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 93a0a4c..ac5a88c 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -20,7 +20,7 @@ #include <string> #include <algorithm> -#include "../include/zmq.h" +#include "../c/zmq.h" #include "socket_base.hpp" #include "app_thread.hpp" diff --git a/src/zmq.cpp b/src/zmq.cpp index 0ffd530..ad4839f 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 "../include/zmq.h" +#include "../c/zmq.h" #include <errno.h> #include <stdlib.h> diff --git a/src/zmq_decoder.hpp b/src/zmq_decoder.hpp index 212e68e..16b5312 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 "../include/zmq.h" +#include "../c/zmq.h" #include "decoder.hpp" diff --git a/src/zmq_encoder.hpp b/src/zmq_encoder.hpp index 29563fc..55826a5 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 "../include/zmq.h" +#include "../c/zmq.h" #include "encoder.hpp" |