--- parser3/src/targets/apache/Makefile.am	2010/11/13 00:43:22	1.1
+++ parser3/src/targets/apache/Makefile.am	2012/04/27 16:32:35	1.4
@@ -1,15 +1,16 @@
-INCLUDES := $(INCLUDES) -I./ -I$(APACHE13)/src/include -I$(APACHE13)/src/os/unix \
-	    -I../../classes -I../../types -I../../lib/gc/include -I../../lib/cord/include @XML_INCLUDES@
+INCLUDES := $(INCLUDES) $(APACHE_INC) -I./ -I../../classes -I../../types -I../../lib/gc/include -I../../lib/cord/include @XML_INCLUDES@
+
+AM_CFLAGS := $(AM_CFLAGS) $(APACHE_CFLAGS)
 
 PA_LIBS = ../../classes/libclasses.a ../../types/libtypes.a ../../main/libmain.a ../../lib/gd/libgd.a ../../lib/cord/libcord.a \
-	  ../../lib/md5/libmd5.a ../../lib/sdbm/libsdbm.a ../../lib/smtp/libsmtp.a ../../lib/json/libjson.a $(LIBLTDL)
+	  ../../lib/md5/libmd5.a ../../lib/sdbm/libsdbm.a ../../lib/smtp/libsmtp.a ../../lib/json/libjson.a  ../../lib/memcached/libmemcached.a $(LIBLTDL)
 
 noinst_LIBRARIES = libmod_parser3.a
 
 libmod_parser3_a_DEPENDENCIES=Makefile $(PA_LIBS)
 libmod_parser3_a_SOURCES = pa_threads.C mod_parser3_core.C mod_parser3.c
 
-EXTRA_DIST = ApacheModuleParser3.vcproj pa_httpd.h
+EXTRA_DIST = pa_httpd.h
 
 all-local: parser3module