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 db5124448cc7f452f994e4bcfd61fafeee488c6c..43291ac09a0c92d3ba8c3864b515ef4090486059 100644 (file)
--- 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 d1a3b660d3e5a89ba2a9f62255a90b7e0a5a9dfd..3f4d6d0f252abbcd7030e84bad66140253bda63f 100644 (file)
--- 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 e0756d8e2ba2d446d3adcf8558381e0c6ef83632..a03a41c717c50ed90c56db58aac5ef9b272ede62 100644 (file)
--- 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 c739b31c27563f82be989cda7549fa61f9e62605..d79430eb78ae4f83bc55a027624c07ccf0a1ea8e 100644 (file)
--- 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 e123a354f9ddc1914da45949a2fa0e197817a413..43bc0320c5c4db0bd3a42fdac9f74ad7d2eefc5d 100644 (file)
--- 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 e1065dd44db9cb655883b67a88edac78c53a2e67..3f7d0115d0a975fd629db21092f3ed30ca3d49e2 100644 (file)
--- 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 5130819efee5431c485cb882685e3e8ad138ffbe..1bfa6d4fe0ba11298ac7e6ff10e17929318bea65 100644 (file)
--- 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}