From 4e95ed66483fc12e4b1b5b166e3171501585e395 Mon Sep 17 00:00:00 2001 From: des Date: Thu, 9 Aug 2007 11:19:20 +0000 Subject: [PATCH] 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 --- varnish-cache/bin/varnishadm/Makefile.am | 2 +- varnish-cache/bin/varnishd/Makefile.am | 2 +- varnish-cache/bin/varnishhist/Makefile.am | 2 +- varnish-cache/bin/varnishlog/Makefile.am | 2 +- varnish-cache/bin/varnishncsa/Makefile.am | 2 +- varnish-cache/bin/varnishreplay/Makefile.am | 2 +- varnish-cache/bin/varnishstat/Makefile.am | 2 +- varnish-cache/bin/varnishtop/Makefile.am | 2 +- varnish-cache/configure.ac | 2 +- varnish-cache/lib/Makefile.am | 2 +- .../lib/{libcompat => libvarnishcompat}/Makefile.am | 6 +++--- .../lib/{libcompat => libvarnishcompat}/asprintf.c | 0 .../lib/{libcompat => libvarnishcompat}/setproctitle.c | 0 .../lib/{libcompat => libvarnishcompat}/srandomdev.c | 0 varnish-cache/lib/{libcompat => libvarnishcompat}/strlcat.c | 0 varnish-cache/lib/{libcompat => libvarnishcompat}/strlcpy.c | 0 varnish-cache/lib/{libcompat => libvarnishcompat}/strndup.c | 0 .../lib/{libcompat => libvarnishcompat}/vasprintf.c | 0 varnish-cache/lib/{libcompat => libvarnishcompat}/vis.c | 0 19 files changed, 13 insertions(+), 13 deletions(-) rename varnish-cache/lib/{libcompat => libvarnishcompat}/Makefile.am (56%) rename varnish-cache/lib/{libcompat => libvarnishcompat}/asprintf.c (100%) rename varnish-cache/lib/{libcompat => libvarnishcompat}/setproctitle.c (100%) rename varnish-cache/lib/{libcompat => libvarnishcompat}/srandomdev.c (100%) rename varnish-cache/lib/{libcompat => libvarnishcompat}/strlcat.c (100%) rename varnish-cache/lib/{libcompat => libvarnishcompat}/strlcpy.c (100%) rename varnish-cache/lib/{libcompat => libvarnishcompat}/strndup.c (100%) rename varnish-cache/lib/{libcompat => libvarnishcompat}/vasprintf.c (100%) rename varnish-cache/lib/{libcompat => libvarnishcompat}/vis.c (100%) diff --git a/varnish-cache/bin/varnishadm/Makefile.am b/varnish-cache/bin/varnishadm/Makefile.am index 30000892..e2f37f2a 100644 --- 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 0fde1558..1685ac3c 100644 --- 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 96591697..6f65f7e8 100644 --- 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 d79430eb..6901cf7c 100644 --- 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 43bc0320..2103090f 100644 --- 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 c00169cf..fb079fb9 100644 --- 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 3f7d0115..647ecb46 100644 --- 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 6c058ac1..618892ae 100644 --- 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 4ffc2b07..a2c89eaf 100644 --- 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 40e3174c..b6fc8fc9 100644 --- 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 885d3a07..94d207cf 100644 --- 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 -- 2.39.5