r5400 - branches/2.1/varnish-cache/lib/libvarnishapi

[tfheen at varnish-cache.org]

Author: tfheen
Date: 2010-10-05 10:03:38 +0200 (Tue, 05 Oct 2010)
New Revision: 5400

Modified:
   branches/2.1/varnish-cache/lib/libvarnishapi/Makefile.am
Log:
Merge bits of r4887: Add bits from libvarnish to libvarnishapi for improved stand-alone-ish-ness.



Modified: branches/2.1/varnish-cache/lib/libvarnishapi/Makefile.am
===================================================================
--- branches/2.1/varnish-cache/lib/libvarnishapi/Makefile.am	2010-10-04 15:24:33 UTC (rev 5399)
+++ branches/2.1/varnish-cache/lib/libvarnishapi/Makefile.am	2010-10-05 08:03:38 UTC (rev 5400)
@@ -1,15 +1,19 @@
 # $Id$
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include @PCRE_CFLAGS@
 
 lib_LTLIBRARIES = libvarnishapi.la
 
 libvarnishapi_la_LDFLAGS = -version-info 1:0:0
 
 libvarnishapi_la_SOURCES = \
+	../libvarnish/assert.c \
+	../libvarnish/vre.c \
 	base64.c \
 	instance.c \
 	shmlog.c
 
 libvarnishapi_la_CFLAGS = \
 	-DVARNISH_STATE_DIR='"${VARNISH_STATE_DIR}"'
+
+libvarnishapi_la_LIBADD = @PCRE_LIBS@