summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2012-03-13 11:28:22 +0100
committerMartin Sustrik <sustrik@250bpm.com>2012-03-13 11:28:22 +0100
commit4ae2af8c9a3f9f928b411eb31b4007a4ce8f26ba (patch)
tree328326b76b2793875b195c3e9dea3c493b28b34a /src
parent921da22147e201455837bcd38df1af33aceff26f (diff)
parent46f8864e4879b257e20c7686f6e8e008cd749939 (diff)
Merge branch 'for-sustrik' of git.lucina.net:libxs
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am39
-rw-r--r--src/libxszmq.pc.in10
-rw-r--r--src/xszmq.cpp4
3 files changed, 13 insertions, 40 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 84c7d3d..0b226a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,29 +1,18 @@
pkgconfigdir = $(libdir)/pkgconfig
if BUILD_LIBZMQ
-lib_LTLIBRARIES = libxs.la libxszmq.la libzmq.la
+lib_LTLIBRARIES = libxs.la libzmq.la
-pkgconfig_DATA = libxs.pc libxszmq.pc libzmq.pc
+pkgconfig_DATA = libxs.pc libzmq.pc
include_HEADERS = ../include/xs.h ../include/xs_utils.h \
- ../include/xszmq.h ../include/xszmq_utils.h \
../include/zmq.h ../include/zmq_utils.h
-
-../include/zmq.h: ../include/xszmq.h
- cp ../include/xszmq.h ../include/zmq.h
-
-../include/zmq_utils.h: ../include/xszmq_utils.h
- cp ../include/xszmq_utils.h ../include/zmq_utils.h
-
-distclean-local:
- -rm -f ../include/zmq.h ../include/zmq_utils.h
else
-lib_LTLIBRARIES = libxs.la libxszmq.la
+lib_LTLIBRARIES = libxs.la
-pkgconfig_DATA = libxs.pc libxszmq.pc
+pkgconfig_DATA = libxs.pc
-include_HEADERS = ../include/xs.h ../include/xs_utils.h \
- ../include/xszmq.h ../include/xszmq_utils.h
+include_HEADERS = ../include/xs.h ../include/xs_utils.h
endif
libxs_la_SOURCES = \
@@ -165,24 +154,18 @@ libxs_la_CPPFLAGS = -I$(top_srcdir)/@pgm_srcdir@/include/
libxs_la_LIBADD = $(top_srcdir)/@pgm_srcdir@/libpgm_noinst.la
endif
-libxszmq_la_SOURCES = xszmq.cpp
-libxszmq_la_CPPFLAGS = -DXS_BUILDING_LIBXSZMQ
-libxszmq_la_LIBADD = libxs.la
+if BUILD_LIBZMQ
+libzmq_la_SOURCES = xszmq.cpp
+libzmq_la_CPPFLAGS = -DXS_BUILDING_LIBXSZMQ
+libzmq_la_LIBADD = libxs.la
if ON_MINGW
-libxszmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LIBXSZMQ_ABI_VERSION@
+libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LIBZMQ_ABI_VERSION@
else
-libxszmq_la_LDFLAGS = -version-info @LIBXSZMQ_ABI_VERSION@
+libzmq_la_LDFLAGS = -version-info @LIBZMQ_ABI_VERSION@
endif
-
-if BUILD_LIBZMQ
-libzmq_la_SOURCES = $(libxszmq_la_SOURCES)
-libzmq_la_CPPFLAGS = $(libxszmq_la_CPPFLAGS)
-libzmq_la_LIBADD = $(libxszmq_la_LIBADD)
-libzmq_la_LDFLAGS = $(libxszmq_la_LDFLAGS)
endif
dist-hook:
-rm $(distdir)/platform.hpp
-
diff --git a/src/libxszmq.pc.in b/src/libxszmq.pc.in
deleted file mode 100644
index 9c631ad..0000000
--- a/src/libxszmq.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libxszmq
-Description: Crossroads libxszmq compatibility library
-Version: @VERSION@
-Libs: -L${libdir} -lxszmq
-Cflags: -I${includedir}
diff --git a/src/xszmq.cpp b/src/xszmq.cpp
index 6b3930c..350929d 100644
--- a/src/xszmq.cpp
+++ b/src/xszmq.cpp
@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "../include/xszmq.h"
-#include "../include/xszmq_utils.h"
+#include "../include/zmq.h"
+#include "../include/zmq_utils.h"
#include "../include/xs.h"
#include "../include/xs_utils.h"