r1504 - in trunk/varnish-cache/bin: varnishadm varnishd varnishhist varnishlog varnishncsa varnishstat varnishtop

[phk at projects.linpro.no]

Author: phk
Date: 2007-06-10 09:19:21 +0200 (Sun, 10 Jun 2007)
New Revision: 1504

Modified:
   trunk/varnish-cache/bin/varnishadm/Makefile.am
   trunk/varnish-cache/bin/varnishd/Makefile.am
   trunk/varnish-cache/bin/varnishhist/Makefile.am
   trunk/varnish-cache/bin/varnishlog/Makefile.am
   trunk/varnish-cache/bin/varnishncsa/Makefile.am
   trunk/varnish-cache/bin/varnishstat/Makefile.am
   trunk/varnish-cache/bin/varnishtop/Makefile.am
Log:
libcompat must come after libvarnish because the latter now uses
strndup which might come from the former.


Modified: trunk/varnish-cache/bin/varnishadm/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishadm/Makefile.am	2007-06-07 09:40:20 UTC (rev 1503)
+++ trunk/varnish-cache/bin/varnishadm/Makefile.am	2007-06-10 07:19:21 UTC (rev 1504)
@@ -12,6 +12,6 @@
 varnishadm_CFLAGS = -include config.h
 
 varnishadm_LDADD = \
-	$(top_builddir)/lib/libcompat/libcompat.a \
-	$(top_builddir)/lib/libvarnish/libvarnish.la
+	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libcompat/libcompat.a
 	

Modified: trunk/varnish-cache/bin/varnishd/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishd/Makefile.am	2007-06-07 09:40:20 UTC (rev 1503)
+++ trunk/varnish-cache/bin/varnishd/Makefile.am	2007-06-10 07:19:21 UTC (rev 1504)
@@ -61,7 +61,7 @@
 varnishd_LDFLAGS = -export-dynamic
 
 varnishd_LDADD = \
+	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libcompat/libcompat.a \
-	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvcl/libvcl.la \
 	${DL_LIBS} ${RT_LIBS} ${PTHREAD_LIBS}

Modified: trunk/varnish-cache/bin/varnishhist/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishhist/Makefile.am	2007-06-07 09:40:20 UTC (rev 1503)
+++ trunk/varnish-cache/bin/varnishhist/Makefile.am	2007-06-10 07:19:21 UTC (rev 1504)
@@ -11,8 +11,8 @@
 varnishhist_CFLAGS = -include config.h
 
 varnishhist_LDADD = \
+	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libcompat/libcompat.a \
-	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	-lm \
 	${CURSES_LIBS}

Modified: trunk/varnish-cache/bin/varnishlog/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishlog/Makefile.am	2007-06-07 09:40:20 UTC (rev 1503)
+++ trunk/varnish-cache/bin/varnishlog/Makefile.am	2007-06-10 07:19:21 UTC (rev 1504)
@@ -11,6 +11,6 @@
 varnishlog_CFLAGS = -include config.h
 
 varnishlog_LDADD = \
+	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libcompat/libcompat.a \
-	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la

Modified: trunk/varnish-cache/bin/varnishncsa/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/Makefile.am	2007-06-07 09:40:20 UTC (rev 1503)
+++ trunk/varnish-cache/bin/varnishncsa/Makefile.am	2007-06-10 07:19:21 UTC (rev 1504)
@@ -11,6 +11,6 @@
 varnishncsa_CFLAGS = -include config.h
 
 varnishncsa_LDADD = \
+	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libcompat/libcompat.a \
-	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la

Modified: trunk/varnish-cache/bin/varnishstat/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishstat/Makefile.am	2007-06-07 09:40:20 UTC (rev 1503)
+++ trunk/varnish-cache/bin/varnishstat/Makefile.am	2007-06-10 07:19:21 UTC (rev 1504)
@@ -11,7 +11,7 @@
 varnishstat_CFLAGS = -include config.h
 
 varnishstat_LDADD = \
+	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libcompat/libcompat.a \
-	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${CURSES_LIBS} ${RT_LIBS}

Modified: trunk/varnish-cache/bin/varnishtop/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishtop/Makefile.am	2007-06-07 09:40:20 UTC (rev 1503)
+++ trunk/varnish-cache/bin/varnishtop/Makefile.am	2007-06-10 07:19:21 UTC (rev 1504)
@@ -11,7 +11,7 @@
 varnishtop_CFLAGS = -include config.h
 
 varnishtop_LDADD = \
+	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libcompat/libcompat.a \
-	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${CURSES_LIBS}