Remove libevent from the picture.

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

diff --git a/varnish-cache/Makefile.am b/varnish-cache/Makefile.am
index b67cd4892c2267b06a125657be042b859fb6afc2..0d79a4d6b91ab47401bf3972981a90f63d5fe698 100644 (file)
--- a/varnish-cache/Makefile.am
+++ b/varnish-cache/Makefile.am
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBDIRS = contrib include lib bin
+SUBDIRS = include lib bin

diff --git a/varnish-cache/autogen.sh b/varnish-cache/autogen.sh
index 490e0608712257f23b30ffd93628cfede07cd846..2492fcb7cd5c554005984f1d909af16eb65bfffa 100755 (executable)
--- a/varnish-cache/autogen.sh
+++ b/varnish-cache/autogen.sh
@@ -11,7 +11,7 @@ if [ -d /usr/local/gnu-autotools/bin ] ; then
 fi
 
 base=$(cd $(dirname $0) && pwd)
-for dir in $base $base/contrib/libevent ; do
+for dir in $base ; do
        (
        echo $dir
        cd $dir

diff --git a/varnish-cache/bin/varnishtester/Makefile.am b/varnish-cache/bin/varnishtester/Makefile.am
index eaeefeae49198d64d69b9185977c556231e0d7a5..ba39377f8d12a0a46411cae129c11a2222fb6f39 100644 (file)
--- a/varnish-cache/bin/varnishtester/Makefile.am
+++ b/varnish-cache/bin/varnishtester/Makefile.am
@@ -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 @@ varnishtester_SOURCES = \
 # varnishd_LDFLAGS = -export-dynamic 
 
 varnishtester_LDADD = \
-       $(top_builddir)/lib/libvarnish/libvarnish.la \
-       $(top_builddir)/contrib/libevent/libevent.la
+       $(top_builddir)/lib/libvarnish/libvarnish.la