--- parser3/src/targets/apache/Makefile.am	2010/11/24 16:16:44	1.2
+++ parser3/src/targets/apache/Makefile.am	2012/06/13 10:27:02	1.7
@@ -1,19 +1,17 @@
-INCLUDES := $(INCLUDES) $(APACHE_INC) -I./ -I../../classes -I../../types -I../../lib/gc/include -I../../lib/cord/include @XML_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.la ../../types/libtypes.la ../../main/libmain.la ../../lib/gd/libgd.la ../../lib/cord/libcord.la \
+	  ../../lib/md5/libmd5.la ../../lib/sdbm/libsdbm.la ../../lib/smtp/libsmtp.la ../../lib/json/libjson.la  ../../lib/memcached/libmemcached.la
 
-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)
+# Automake 1.9 does not support LIBTOOLFLAGS
+libmod_parser3_la_LINK = $(LIBTOOL) --tag=CXX --tag=disable-static --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(libmod_parser3_la_LDFLAGS) $(LDFLAGS) -o $@
 
-noinst_LIBRARIES = libmod_parser3.a
+noinst_HEADERS = pa_httpd.h
 
-libmod_parser3_a_DEPENDENCIES=Makefile $(PA_LIBS)
-libmod_parser3_a_SOURCES = pa_threads.C mod_parser3_core.C mod_parser3.c
+lib_LTLIBRARIES = libmod_parser3.la
 
-EXTRA_DIST = ApacheModuleParser3.vcproj pa_httpd.h
-
-all-local: parser3module
-
-parser3module:
-	$(CC) -shared -o mod_parser3.so -Wl,--whole-archive libmod_parser3.a $(PA_LIBS) -Wl,--no-whole-archive \
-	@GC_LIBS@ @PCRE_LIBS@ @XML_LIBS@ @MIME_LIBS@ $(LIBADD_DL) @CPP_LIBS@
+libmod_parser3_la_SOURCES = pa_threads.C mod_parser3_core.C mod_parser3.c
+libmod_parser3_la_DEPENDENCIES = Makefile $(PA_LIBS)
+libmod_parser3_la_LDFLAGS = -module -avoid-version
+ 
+libmod_parser3_la_LIBADD = $(PA_LIBS) @GC_LIBS@ @PCRE_LIBS@ @XML_LIBS@ @MIME_LIBS@ $(LIBLTDL)