Permalink
Browse files

Rename libzmq in our installs to libmythzmq

As this library will inevitably end up in /usr/lib in distro packages, we don't
want to be conflicting with a system-installed zeromq.  Therefore, I have
made the lib be libmythzmq.  We may still need to tweak some includes.
  • Loading branch information...
1 parent 9b41af7 commit 5b3afdb6a853421ef5ef18f90992609cfc8a82a4 @Beirdo Beirdo committed Jun 27, 2012
@@ -46,7 +46,7 @@ doc/*.3
doc/*.7
doc/*.html
doc/*.xml
-src/libzmq.pc
+src/libmythzmq.pc
bin/
lib/
builds/msvc/*.suo
@@ -19349,7 +19349,7 @@ fi
-ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile perf/Makefile src/libzmq.pc builds/msvc/Makefile tests/Makefile foreign/openpgm/Makefile builds/redhat/zeromq.spec"
+ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile perf/Makefile src/libmythzmq.pc builds/msvc/Makefile tests/Makefile foreign/openpgm/Makefile builds/redhat/zeromq.spec"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -20444,7 +20444,7 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;;
- "src/libzmq.pc") CONFIG_FILES="$CONFIG_FILES src/libzmq.pc" ;;
+ "src/libmythzmq.pc") CONFIG_FILES="$CONFIG_FILES src/libmythzmq.pc" ;;
"builds/msvc/Makefile") CONFIG_FILES="$CONFIG_FILES builds/msvc/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"foreign/openpgm/Makefile") CONFIG_FILES="$CONFIG_FILES foreign/openpgm/Makefile" ;;
@@ -397,7 +397,7 @@ AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)
AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
- perf/Makefile src/libzmq.pc \
+ perf/Makefile src/libmythzmq.pc \
builds/msvc/Makefile tests/Makefile \
foreign/openpgm/Makefile \
builds/redhat/zeromq.spec])
@@ -2,20 +2,20 @@ INCLUDES = -I$(top_builddir)/include
noinst_PROGRAMS = local_lat remote_lat local_thr remote_thr inproc_lat inproc_thr
-local_lat_LDADD = $(top_builddir)/src/libzmq.la
+local_lat_LDADD = $(top_builddir)/src/libmythzmq.la
local_lat_SOURCES = local_lat.cpp
-remote_lat_LDADD = $(top_builddir)/src/libzmq.la
+remote_lat_LDADD = $(top_builddir)/src/libmythzmq.la
remote_lat_SOURCES = remote_lat.cpp
-local_thr_LDADD = $(top_builddir)/src/libzmq.la
+local_thr_LDADD = $(top_builddir)/src/libmythzmq.la
local_thr_SOURCES = local_thr.cpp
-remote_thr_LDADD = $(top_builddir)/src/libzmq.la
+remote_thr_LDADD = $(top_builddir)/src/libmythzmq.la
remote_thr_SOURCES = remote_thr.cpp
-inproc_lat_LDADD = $(top_builddir)/src/libzmq.la
+inproc_lat_LDADD = $(top_builddir)/src/libmythzmq.la
inproc_lat_SOURCES = inproc_lat.cpp
-inproc_thr_LDADD = $(top_builddir)/src/libzmq.la
+inproc_thr_LDADD = $(top_builddir)/src/libmythzmq.la
inproc_thr_SOURCES = inproc_thr.cpp
@@ -55,25 +55,25 @@ CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
am_inproc_lat_OBJECTS = inproc_lat.$(OBJEXT)
inproc_lat_OBJECTS = $(am_inproc_lat_OBJECTS)
-inproc_lat_DEPENDENCIES = $(top_builddir)/src/libzmq.la
+inproc_lat_DEPENDENCIES = $(top_builddir)/src/libmythzmq.la
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
am__v_lt_0 = --silent
am_inproc_thr_OBJECTS = inproc_thr.$(OBJEXT)
inproc_thr_OBJECTS = $(am_inproc_thr_OBJECTS)
-inproc_thr_DEPENDENCIES = $(top_builddir)/src/libzmq.la
+inproc_thr_DEPENDENCIES = $(top_builddir)/src/libmythzmq.la
am_local_lat_OBJECTS = local_lat.$(OBJEXT)
local_lat_OBJECTS = $(am_local_lat_OBJECTS)
-local_lat_DEPENDENCIES = $(top_builddir)/src/libzmq.la
+local_lat_DEPENDENCIES = $(top_builddir)/src/libmythzmq.la
am_local_thr_OBJECTS = local_thr.$(OBJEXT)
local_thr_OBJECTS = $(am_local_thr_OBJECTS)
-local_thr_DEPENDENCIES = $(top_builddir)/src/libzmq.la
+local_thr_DEPENDENCIES = $(top_builddir)/src/libmythzmq.la
am_remote_lat_OBJECTS = remote_lat.$(OBJEXT)
remote_lat_OBJECTS = $(am_remote_lat_OBJECTS)
-remote_lat_DEPENDENCIES = $(top_builddir)/src/libzmq.la
+remote_lat_DEPENDENCIES = $(top_builddir)/src/libmythzmq.la
am_remote_thr_OBJECTS = remote_thr.$(OBJEXT)
remote_thr_OBJECTS = $(am_remote_thr_OBJECTS)
-remote_thr_DEPENDENCIES = $(top_builddir)/src/libzmq.la
+remote_thr_DEPENDENCIES = $(top_builddir)/src/libmythzmq.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -246,17 +246,17 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = -I$(top_builddir)/include
-local_lat_LDADD = $(top_builddir)/src/libzmq.la
+local_lat_LDADD = $(top_builddir)/src/libmythzmq.la
local_lat_SOURCES = local_lat.cpp
-remote_lat_LDADD = $(top_builddir)/src/libzmq.la
+remote_lat_LDADD = $(top_builddir)/src/libmythzmq.la
remote_lat_SOURCES = remote_lat.cpp
-local_thr_LDADD = $(top_builddir)/src/libzmq.la
+local_thr_LDADD = $(top_builddir)/src/libmythzmq.la
local_thr_SOURCES = local_thr.cpp
-remote_thr_LDADD = $(top_builddir)/src/libzmq.la
+remote_thr_LDADD = $(top_builddir)/src/libmythzmq.la
remote_thr_SOURCES = remote_thr.cpp
-inproc_lat_LDADD = $(top_builddir)/src/libzmq.la
+inproc_lat_LDADD = $(top_builddir)/src/libmythzmq.la
inproc_lat_SOURCES = inproc_lat.cpp
-inproc_thr_LDADD = $(top_builddir)/src/libzmq.la
+inproc_thr_LDADD = $(top_builddir)/src/libmythzmq.la
inproc_thr_SOURCES = inproc_thr.cpp
all: all-am
@@ -1,11 +1,11 @@
-lib_LTLIBRARIES = libzmq.la
+lib_LTLIBRARIES = libmythzmq.la
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libzmq.pc
+pkgconfig_DATA = libmythzmq.pc
include_HEADERS = ../include/zmq.h ../include/zmq.hpp ../include/zmq_utils.h
-libzmq_la_SOURCES = \
+libmythzmq_la_SOURCES = \
array.hpp \
atomic_counter.hpp \
atomic_ptr.hpp \
@@ -141,16 +141,16 @@ libzmq_la_SOURCES = \
zmq_listener.cpp
if ON_MINGW
-libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
+libmythzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
else
-libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
+libmythzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
endif
-libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@
+libmythzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@
if BUILD_PGM
-libzmq_la_CPPFLAGS = -I$(top_srcdir)/@pgm_srcdir@/include/
-libzmq_la_LIBADD = $(top_srcdir)/@pgm_srcdir@/libpgm_noinst.la
+libmythzmq_la_CPPFLAGS = -I$(top_srcdir)/@pgm_srcdir@/include/
+libmythzmq_la_LIBADD = $(top_srcdir)/@pgm_srcdir@/libpgm_noinst.la
endif
dist-hook:
Oops, something went wrong.

0 comments on commit 5b3afdb

Please sign in to comment.