--- parser3/src/targets/cgi/Makefile.am	2001/09/25 09:36:51	1.17
+++ parser3/src/targets/cgi/Makefile.am	2012/03/19 22:29:41	1.55
@@ -1,8 +1,14 @@
-INCLUDES = -I../../classes -I../../types -I$(INCLTDL) -I../../sql @XML_INCLUDES@
+#by default c++ when running linker adds -lstdc++ (and -lm) which overrides 
+#our [default] setting of linking that that lib should be linked statically
+#so we're switching linker to gcc, which does not add anything
+CXXLD=$(CC)
 
-#for sysadmin-controlled auto.p
-CPPFLAGS:=$(CPPFLAGS) -DSYSCONFDIR=\"$(sysconfdir)\"
+INCLUDES = -I../../classes -I../../types -I../../sql -I../../lib/gc/include -I../../lib/cord/include -I../../lib/md5 -I../../lib/json -I$(INCLTDL) @PCRE_INCLUDES@ @XML_INCLUDES@
+PA_LIBS = ../../main/libmain.a ../../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 ../../lib/memcached/libmemcached.a $(LIBLTDL)
 
 bin_PROGRAMS = parser3
-parser3_SOURCES = pa_pool.C pa_threads.C parser3.C
-parser3_LDADD=../../main/libmain.a ../../classes/libclasses.a ../../main/libmain.a ../../types/libtypes.a $(LIBLTDL) ../../classes/gd/libgd.a ../../pcre/libpcre.a @XML_LIBS@
+noinst_HEADERS = getopt.h
+parser3_DEPENDENCIES=Makefile $(PA_LIBS)
+parser3_SOURCES = pa_threads.C parser3.C getopt.c
+parser3_LDADD= $(PA_LIBS) $(LIBADD_DL) @GC_LIBS@ @PCRE_LIBS@ @XML_LIBS@ @MIME_LIBS@ @CPP_LIBS@
+EXTRA_DIST = parser3.vcproj pp3.cmd