[master] b85574d Explicitly link version.c where it's needed.
Tollef Fog Heen
tfheen at varnish-cache.org
Mon Jun 6 12:26:08 CEST 2011
commit b85574d61e0133aa6ecbe12d61af27267ce4c89d
Author: Tollef Fog Heen <tfheen at err.no>
Date: Mon Jun 6 12:24:59 2011 +0200
Explicitly link version.c where it's needed.
The various tools need version.c from libvarnish, so make that part of
the build directly.
diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 8300e43..f187bb7 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -6,7 +6,8 @@ bin_PROGRAMS = varnishhist
dist_man_MANS = varnishhist.1
-varnishhist_SOURCES = varnishhist.c
+varnishhist_SOURCES = varnishhist.c \
+ $(top_builddir)/lib/libvarnish/version.c
varnishhist_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/bin/varnishlog/Makefile.am b/bin/varnishlog/Makefile.am
index 1a359f7..2c7cb6f 100644
--- a/bin/varnishlog/Makefile.am
+++ b/bin/varnishlog/Makefile.am
@@ -9,6 +9,7 @@ dist_man_MANS = varnishlog.1
varnishlog_SOURCES = \
varnishlog.c \
$(top_builddir)/lib/libvarnish/flopen.c \
+ $(top_builddir)/lib/libvarnish/version.c \
$(top_builddir)/lib/libvarnish/vpf.c
varnishlog_LDADD = \
diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index e1baa79..cd4962e 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -11,6 +11,7 @@ varnishncsa_SOURCES = \
base64.c \
base64.h \
$(top_builddir)/lib/libvarnish/flopen.c \
+ $(top_builddir)/lib/libvarnish/version.c \
$(top_builddir)/lib/libvarnish/vpf.c
varnishncsa_LDADD = \
diff --git a/bin/varnishsizes/Makefile.am b/bin/varnishsizes/Makefile.am
index cb0c013..727081a 100644
--- a/bin/varnishsizes/Makefile.am
+++ b/bin/varnishsizes/Makefile.am
@@ -6,7 +6,8 @@ bin_PROGRAMS = varnishsizes
dist_man_MANS = varnishsizes.1
-varnishsizes_SOURCES = varnishsizes.c
+varnishsizes_SOURCES = varnishsizes.c \
+ $(top_builddir)/lib/libvarnish/version.c
varnishsizes_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am
index ae4da56..d5122ed 100644
--- a/bin/varnishstat/Makefile.am
+++ b/bin/varnishstat/Makefile.am
@@ -10,7 +10,8 @@ varnishstat_SOURCES = \
varnishstat.h \
\
varnishstat.c \
- varnishstat_curses.c
+ varnishstat_curses.c \
+ $(top_builddir)/lib/libvarnish/version.c
varnishstat_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am
index 200ed96..811a97e 100644
--- a/bin/varnishtop/Makefile.am
+++ b/bin/varnishtop/Makefile.am
@@ -6,7 +6,8 @@ bin_PROGRAMS = varnishtop
dist_man_MANS = varnishtop.1
-varnishtop_SOURCES = varnishtop.c
+varnishtop_SOURCES = varnishtop.c \
+ $(top_builddir)/lib/libvarnish/version.c
varnishtop_LDADD = \
$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
More information about the varnish-commit
mailing list