Rename libcompat to libvarnishcompat, and make it dynamic.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1817 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishadm/Makefile.am b/varnish-cache/bin/varnishadm/Makefile.am
index 300008926055eb4c1adddb492a8c22c89020d9fc..e2f37f2ace64f67809b296031007a7de7d856762 100644 (file)
--- a/varnish-cache/bin/varnishadm/Makefile.am
+++ b/varnish-cache/bin/varnishadm/Makefile.am
@@ -13,4 +13,4 @@ varnishadm_CFLAGS = -include config.h
 
 varnishadm_LDADD = \
        $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/lib/libcompat/libcompat.a
+       $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la

diff --git a/varnish-cache/bin/varnishd/Makefile.am b/varnish-cache/bin/varnishd/Makefile.am
index 0fde1558a0c279071e0402fb388ba89e83821d5d..1685ac3c05971d2b04f894988dcf348b0b159f74 100644 (file)
--- a/varnish-cache/bin/varnishd/Makefile.am
+++ b/varnish-cache/bin/varnishd/Makefile.am
@@ -66,6 +66,6 @@ varnishd_LDFLAGS = -export-dynamic
 
 varnishd_LDADD = \
        $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/lib/libcompat/libcompat.a \
+       $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
        $(top_builddir)/lib/libvcl/libvcl.la \
        ${DL_LIBS} ${PTHREAD_LIBS} ${LIBM}

diff --git a/varnish-cache/bin/varnishhist/Makefile.am b/varnish-cache/bin/varnishhist/Makefile.am
index 965916978272b09a0f0d105b82193b439a3d78b2..6f65f7e84bbef61e0f2bee1702a95b8a233aeca6 100644 (file)
--- a/varnish-cache/bin/varnishhist/Makefile.am
+++ b/varnish-cache/bin/varnishhist/Makefile.am
@@ -12,7 +12,7 @@ varnishhist_CFLAGS = -include config.h
 
 varnishhist_LDADD = \
        $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/lib/libcompat/libcompat.a \
+       $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
        $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
        -lm \
        ${CURSES_LIBS} ${PTHREAD_LIBS}

diff --git a/varnish-cache/bin/varnishlog/Makefile.am b/varnish-cache/bin/varnishlog/Makefile.am
index d79430eb78ae4f83bc55a027624c07ccf0a1ea8e..6901cf7cba021959f930f90eb9ac48cd2f8e2caf 100644 (file)
--- a/varnish-cache/bin/varnishlog/Makefile.am
+++ b/varnish-cache/bin/varnishlog/Makefile.am
@@ -12,5 +12,5 @@ varnishlog_CFLAGS = -include config.h
 
 varnishlog_LDADD = \
        $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/lib/libcompat/libcompat.a \
+       $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
        $(top_builddir)/lib/libvarnishapi/libvarnishapi.la

diff --git a/varnish-cache/bin/varnishncsa/Makefile.am b/varnish-cache/bin/varnishncsa/Makefile.am
index 43bc0320c5c4db0bd3a42fdac9f74ad7d2eefc5d..2103090fdf15c7f1d3b61beda0c1c000bba294fd 100644 (file)
--- a/varnish-cache/bin/varnishncsa/Makefile.am
+++ b/varnish-cache/bin/varnishncsa/Makefile.am
@@ -12,5 +12,5 @@ varnishncsa_CFLAGS = -include config.h
 
 varnishncsa_LDADD = \
        $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/lib/libcompat/libcompat.a \
+       $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
        $(top_builddir)/lib/libvarnishapi/libvarnishapi.la

diff --git a/varnish-cache/bin/varnishreplay/Makefile.am b/varnish-cache/bin/varnishreplay/Makefile.am
index c00169cf5e60424e94fe27768bc3e828dcec7b42..fb079fb9b81a9cdfa7057436849916c82b359e7a 100644 (file)
--- a/varnish-cache/bin/varnishreplay/Makefile.am
+++ b/varnish-cache/bin/varnishreplay/Makefile.am
@@ -13,7 +13,7 @@ varnishreplay_CFLAGS = -include config.h
 
 varnishreplay_LDADD = \
        $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/lib/libcompat/libcompat.a \
+       $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
        $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
        ${PTHREAD_LIBS}
 

diff --git a/varnish-cache/bin/varnishstat/Makefile.am b/varnish-cache/bin/varnishstat/Makefile.am
index 3f7d0115d0a975fd629db21092f3ed30ca3d49e2..647ecb462626c5c9f00e15177916b7d33acbaa31 100644 (file)
--- a/varnish-cache/bin/varnishstat/Makefile.am
+++ b/varnish-cache/bin/varnishstat/Makefile.am
@@ -12,6 +12,6 @@ varnishstat_CFLAGS = -include config.h
 
 varnishstat_LDADD = \
        $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/lib/libcompat/libcompat.a \
+       $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
        $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
        ${CURSES_LIBS} ${RT_LIBS}

diff --git a/varnish-cache/bin/varnishtop/Makefile.am b/varnish-cache/bin/varnishtop/Makefile.am
index 6c058ac143c7844fc7aa84db53ba68ab8258cf2e..618892ae74247d71d11bd8043cecae3e09e86b20 100644 (file)
--- a/varnish-cache/bin/varnishtop/Makefile.am
+++ b/varnish-cache/bin/varnishtop/Makefile.am
@@ -12,6 +12,6 @@ varnishtop_CFLAGS = -include config.h
 
 varnishtop_LDADD = \
        $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/lib/libcompat/libcompat.a \
+       $(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
        $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
        ${CURSES_LIBS} ${PTHREAD_LIBS}

diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac
index 4ffc2b071f60f2ea7d52f3fd3994596ecb558979..a2c89eafd07b0287b751d271dd4b734e5d08ee02 100644 (file)
--- a/varnish-cache/configure.ac
+++ b/varnish-cache/configure.ac
@@ -151,9 +151,9 @@ AC_CONFIG_FILES([
     etc/Makefile
     include/Makefile
     lib/Makefile
-    lib/libcompat/Makefile
     lib/libvarnish/Makefile
     lib/libvarnishapi/Makefile
+    lib/libvarnishcompat/Makefile
     lib/libvcl/Makefile
     man/Makefile
     debian/Makefile

diff --git a/varnish-cache/lib/Makefile.am b/varnish-cache/lib/Makefile.am
index 40e3174c77b358fa556a824e9c17d79497395cf2..b6fc8fc928e1e02a20d8ba7275b19b6c88cb0c51 100644 (file)
--- a/varnish-cache/lib/Makefile.am
+++ b/varnish-cache/lib/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 SUBDIRS = \
-       libcompat \
        libvarnish \
        libvarnishapi \
+       libvarnishcompat \
        libvcl

diff --git a/varnish-cache/lib/libcompat/Makefile.am b/varnish-cache/lib/libvarnishcompat/Makefile.am
similarity index 56%
rename from varnish-cache/lib/libcompat/Makefile.am
rename to varnish-cache/lib/libvarnishcompat/Makefile.am
index 885d3a075677a6db6446e5f0b350f5f272199b9c..94d207cf0e80e1556f6bf4fe02dc85cca33302ed 100644 (file)
--- a/varnish-cache/lib/libcompat/Makefile.am
+++ b/varnish-cache/lib/libvarnishcompat/Makefile.am
@@ -2,9 +2,9 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
-noinst_LIBRARIES = libcompat.a
+lib_LTLIBRARIES = libvarnishcompat.la
 
-libcompat_a_SOURCES = \
+libvarnishcompat_la_SOURCES = \
        asprintf.c \
        vasprintf.c \
        setproctitle.c \
@@ -14,4 +14,4 @@ libcompat_a_SOURCES = \
        strndup.c \
        vis.c
 
-libcompat_a_CFLAGS = -include config.h
+libvarnishcompat_la_CFLAGS = -include config.h

diff --git a/varnish-cache/lib/libcompat/asprintf.c b/varnish-cache/lib/libvarnishcompat/asprintf.c
similarity index 100%
rename from varnish-cache/lib/libcompat/asprintf.c
rename to varnish-cache/lib/libvarnishcompat/asprintf.c

diff --git a/varnish-cache/lib/libcompat/setproctitle.c b/varnish-cache/lib/libvarnishcompat/setproctitle.c
similarity index 100%
rename from varnish-cache/lib/libcompat/setproctitle.c
rename to varnish-cache/lib/libvarnishcompat/setproctitle.c

diff --git a/varnish-cache/lib/libcompat/srandomdev.c b/varnish-cache/lib/libvarnishcompat/srandomdev.c
similarity index 100%
rename from varnish-cache/lib/libcompat/srandomdev.c
rename to varnish-cache/lib/libvarnishcompat/srandomdev.c

diff --git a/varnish-cache/lib/libcompat/strlcat.c b/varnish-cache/lib/libvarnishcompat/strlcat.c
similarity index 100%
rename from varnish-cache/lib/libcompat/strlcat.c
rename to varnish-cache/lib/libvarnishcompat/strlcat.c

diff --git a/varnish-cache/lib/libcompat/strlcpy.c b/varnish-cache/lib/libvarnishcompat/strlcpy.c
similarity index 100%
rename from varnish-cache/lib/libcompat/strlcpy.c
rename to varnish-cache/lib/libvarnishcompat/strlcpy.c

diff --git a/varnish-cache/lib/libcompat/strndup.c b/varnish-cache/lib/libvarnishcompat/strndup.c
similarity index 100%
rename from varnish-cache/lib/libcompat/strndup.c
rename to varnish-cache/lib/libvarnishcompat/strndup.c

diff --git a/varnish-cache/lib/libcompat/vasprintf.c b/varnish-cache/lib/libvarnishcompat/vasprintf.c
similarity index 100%
rename from varnish-cache/lib/libcompat/vasprintf.c
rename to varnish-cache/lib/libvarnishcompat/vasprintf.c

diff --git a/varnish-cache/lib/libcompat/vis.c b/varnish-cache/lib/libvarnishcompat/vis.c
similarity index 100%
rename from varnish-cache/lib/libcompat/vis.c
rename to varnish-cache/lib/libvarnishcompat/vis.c