From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Sun, 10 Jun 2007 07:19:21 +0000 (+0000)
Subject: libcompat must come after libvarnish because the latter now uses
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0725a5b66af8693fd1ca63f4e8dd7efd5cd852a7;p=varnish

libcompat must come after libvarnish because the latter now uses
strndup which might come from the former.


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

diff --git a/varnish-cache/bin/varnishadm/Makefile.am b/varnish-cache/bin/varnishadm/Makefile.am
index db512444..43291ac0 100644
--- a/varnish-cache/bin/varnishadm/Makefile.am
+++ b/varnish-cache/bin/varnishadm/Makefile.am
@@ -12,6 +12,6 @@ varnishadm_SOURCES = \
 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
 	
diff --git a/varnish-cache/bin/varnishd/Makefile.am b/varnish-cache/bin/varnishd/Makefile.am
index d1a3b660..3f4d6d0f 100644
--- a/varnish-cache/bin/varnishd/Makefile.am
+++ b/varnish-cache/bin/varnishd/Makefile.am
@@ -61,7 +61,7 @@ varnishd_CFLAGS = -include config.h
 varnishd_LDFLAGS = -export-dynamic
 
 varnishd_LDADD = \
-	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvcl/libvcl.la \
 	${DL_LIBS} ${RT_LIBS} ${PTHREAD_LIBS}
diff --git a/varnish-cache/bin/varnishhist/Makefile.am b/varnish-cache/bin/varnishhist/Makefile.am
index e0756d8e..a03a41c7 100644
--- a/varnish-cache/bin/varnishhist/Makefile.am
+++ b/varnish-cache/bin/varnishhist/Makefile.am
@@ -11,8 +11,8 @@ varnishhist_SOURCES = varnishhist.c
 varnishhist_CFLAGS = -include config.h
 
 varnishhist_LDADD = \
-	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	-lm \
 	${CURSES_LIBS}
diff --git a/varnish-cache/bin/varnishlog/Makefile.am b/varnish-cache/bin/varnishlog/Makefile.am
index c739b31c..d79430eb 100644
--- a/varnish-cache/bin/varnishlog/Makefile.am
+++ b/varnish-cache/bin/varnishlog/Makefile.am
@@ -11,6 +11,6 @@ varnishlog_SOURCES = varnishlog.c
 varnishlog_CFLAGS = -include config.h
 
 varnishlog_LDADD = \
-	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la
diff --git a/varnish-cache/bin/varnishncsa/Makefile.am b/varnish-cache/bin/varnishncsa/Makefile.am
index e123a354..43bc0320 100644
--- a/varnish-cache/bin/varnishncsa/Makefile.am
+++ b/varnish-cache/bin/varnishncsa/Makefile.am
@@ -11,6 +11,6 @@ varnishncsa_SOURCES = varnishncsa.c
 varnishncsa_CFLAGS = -include config.h
 
 varnishncsa_LDADD = \
-	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la
diff --git a/varnish-cache/bin/varnishstat/Makefile.am b/varnish-cache/bin/varnishstat/Makefile.am
index e1065dd4..3f7d0115 100644
--- a/varnish-cache/bin/varnishstat/Makefile.am
+++ b/varnish-cache/bin/varnishstat/Makefile.am
@@ -11,7 +11,7 @@ varnishstat_SOURCES = varnishstat.c
 varnishstat_CFLAGS = -include config.h
 
 varnishstat_LDADD = \
-	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(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 5130819e..1bfa6d4f 100644
--- a/varnish-cache/bin/varnishtop/Makefile.am
+++ b/varnish-cache/bin/varnishtop/Makefile.am
@@ -11,7 +11,7 @@ varnishtop_SOURCES = varnishtop.c
 varnishtop_CFLAGS = -include config.h
 
 varnishtop_LDADD = \
-	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libcompat/libcompat.a \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${CURSES_LIBS}