From 46f8864e4879b257e20c7686f6e8e008cd749939 Mon Sep 17 00:00:00 2001
From: Martin Lucina <martin@lucina.net>
Date: Tue, 13 Mar 2012 11:17:59 +0100
Subject: Drop libxszmq, keep only libzmq compatibility library
 (--enable-libzmq)

This simplifies the options for new users; either use libxs APIs or build
with --enable-libzmq and get libzmq 2.1 emulation.

Signed-off-by: Martin Lucina <martin@lucina.net>
---
 src/Makefile.am    | 39 +++++++++++----------------------------
 src/libxszmq.pc.in | 10 ----------
 src/xszmq.cpp      |  4 ++--
 3 files changed, 13 insertions(+), 40 deletions(-)
 delete mode 100644 src/libxszmq.pc.in

(limited to 'src')

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 d97d9ea..4146e45 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"
-- 
cgit v1.2.3