r617 - in trunk/varnish-cache: . bin/varnishtester

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-03 11:45:36 +0200 (Thu, 03 Aug 2006)
New Revision: 617

Modified:
   trunk/varnish-cache/Makefile.am
   trunk/varnish-cache/autogen.sh
   trunk/varnish-cache/bin/varnishtester/Makefile.am
Log:
Remove libevent from the picture.



Modified: trunk/varnish-cache/Makefile.am
===================================================================
--- trunk/varnish-cache/Makefile.am	2006-08-03 09:45:14 UTC (rev 616)
+++ trunk/varnish-cache/Makefile.am	2006-08-03 09:45:36 UTC (rev 617)
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBDIRS = contrib include lib bin
+SUBDIRS = include lib bin

Modified: trunk/varnish-cache/autogen.sh
===================================================================
--- trunk/varnish-cache/autogen.sh	2006-08-03 09:45:14 UTC (rev 616)
+++ trunk/varnish-cache/autogen.sh	2006-08-03 09:45:36 UTC (rev 617)
@@ -11,7 +11,7 @@
 fi
 
 base=$(cd $(dirname $0) && pwd)
-for dir in $base $base/contrib/libevent ; do
+for dir in $base ; do
 	(
 	echo $dir
 	cd $dir

Modified: trunk/varnish-cache/bin/varnishtester/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishtester/Makefile.am	2006-08-03 09:45:14 UTC (rev 616)
+++ trunk/varnish-cache/bin/varnishtester/Makefile.am	2006-08-03 09:45:36 UTC (rev 617)
@@ -1,6 +1,6 @@
 # $Id: Makefile.am 426 2006-07-11 12:31:44Z phk $
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/contrib/libevent
+INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = varnishtester
 
@@ -12,5 +12,4 @@
 # varnishd_LDFLAGS = -export-dynamic 
 
 varnishtester_LDADD = \
-	$(top_builddir)/lib/libvarnish/libvarnish.la \
-	$(top_builddir)/contrib/libevent/libevent.la
+	$(top_builddir)/lib/libvarnish/libvarnish.la