--- parser3/src/targets/cgi/Makefile.am	2001/10/27 12:58:52	1.21
+++ parser3/src/targets/cgi/Makefile.am	2012/06/13 11:15:41	1.63
@@ -1,23 +1,16 @@
-if COMPILE_XML
-PATCHES_LIBS=../../classes/xalan-patched/libxalan_patched.a
-else
-PATCHES_LIBS=
-endif
+# Parser has circular library dependencies, thus libmain.a is linked twice and --preserve-dup-deps libtool option is used
+PA_LIBS = ../../main/.libs/libmain.a ../../classes/.libs/libclasses.a ../../types/.libs/libtypes.a ../../main/.libs/libmain.a \
+	  ../../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
 
-INCLUDES = -I../../classes -I../../types -I$(INCLTDL) -I../../sql @XML_INCLUDES@
+INCLUDES = -I../../classes -I../../types -I../../lib/gc/include -I../../lib/cord/include @XML_INCLUDES@
 
-#for sysadmin-controlled auto.p
-CPPFLAGS:=$(CPPFLAGS) -DSYSCONFDIR=\"$(sysconfdir)\"
+# Automake 1.9 does not support LIBTOOLFLAGS
+CXXLINK = $(LIBTOOL) --preserve-dup-deps --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 
 bin_PROGRAMS = parser3
-parser3_SOURCES = pa_pool.C pa_threads.C parser3.C ident.C
-parser3_LDADD=../../main/libmain.a ../../classes/libclasses.a ../../main/libmain.a ../../types/libtypes.a $(LIBLTDL) ../../classes/gd/libgd.a ../../pcre/libpcre.a $(PATCHES_LIBS) @XML_LIBS@ @DB2_LIBS@
-
-IDENT_AWK = ../../ident.awk
-IDENT_DEPS = *.C
-
-ident.C: $(IDENT_AWK) $(IDENT_DEPS) Makefile.am
-	rm -f ident.C 
-	echo // do not edit. autogenerated by Makefile.am > ident.C.new 
-	cat $(IDENT_DEPS) | $(AWK) -f $(IDENT_AWK) -v project=parser3 >> ident.C.new 
-	mv ident.C.new ident.C 
+noinst_HEADERS = getopt.h
+parser3_DEPENDENCIES=Makefile $(PA_LIBS)
+parser3_SOURCES = pa_threads.C parser3.C getopt.c
+parser3_LDADD = $(PA_LIBS) $(LIBLTDL) @GC_LIBS@ @PCRE_LIBS@ @XML_LIBS@ @MIME_LIBS@
+EXTRA_DIST = parser3.vcproj