[master] f23c07c Update autotools to compile varnishhist

Martin Blix Grydeland martin at varnish-software.com
Tue Feb 25 15:58:39 CET 2014


commit f23c07c77537454e2cb59f480a14d5529b0dd777
Author: Guillaume Quintard <guillaume.quintard at gmail.com>
Date:   Tue Feb 4 10:08:20 2014 +0100

    Update autotools to compile varnishhist

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 48a9a51..a6defb4 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -6,7 +6,7 @@
 SUBDIRS = varnishadm varnishd varnishlog varnishtest varnishncsa
 
 if VARNISH_CURSES
-#SUBDIRS += varnishhist varnishstat varnishtop
+SUBDIRS += varnishhist
 SUBDIRS += varnishstat
 SUBDIRS += varnishtop
 endif
diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 9511a6e..a24f29a 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -5,8 +5,14 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 bin_PROGRAMS = varnishhist
 
 varnishhist_SOURCES = varnishhist.c \
+	varnishhist_options.h \
+	varnishhist_options.c \
 	$(top_builddir)/lib/libvarnish/vas.c \
-	$(top_builddir)/lib/libvarnish/version.c
+	$(top_builddir)/lib/libvarnish/version.c \
+	$(top_srcdir)/lib/libvarnish/vpf.c \
+	$(top_srcdir)/lib/libvarnish/vtim.c \
+	$(top_srcdir)/lib/libvarnish/flopen.c \
+	$(top_srcdir)/lib/libvarnishtools/vut.c
 
 varnishhist_LDADD = \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
diff --git a/configure.ac b/configure.ac
index f25b2cf..5c46de8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -566,6 +566,7 @@ AC_CONFIG_FILES([
     bin/varnishlog/Makefile
     bin/varnishstat/Makefile
     bin/varnishtop/Makefile
+    bin/varnishhist/Makefile
     bin/varnishtest/Makefile
     bin/varnishncsa/Makefile
     doc/Makefile



More information about the varnish-commit mailing list