--- parser3/src/targets/cgi/Makefile.am	2002/02/13 13:04:34	1.29
+++ parser3/src/targets/cgi/Makefile.am	2003/03/12 15:13:58	1.46.2.5
@@ -1,20 +1,14 @@
-#this read configure.in comment on stdc++ about next line
+#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)
 
-INCLUDES = -I../../classes -I../../types -I$(INCLTDL) -I../../sql -I../../pcre @XML_INCLUDES@
+INCLUDES = -I../../classes -I../../types -I../../sql -I../../lib/pcre -I../../lib/md5 -I$(INCLTDL) @XML_INCLUDES@
+PA_LIBS = ../../main/libmain.a ../../classes/libclasses.a ../../types/libtypes.a ../../main/libmain.a ../../classes/gd/libgd.a ../../lib/pcre/libpcre.a ../../lib/md5/libmd5.a $(LIBLTDL)
 
 bin_PROGRAMS = parser3
-noinst_HEADERS = pa_config_paths.h pool_storage.h
-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 @XML_LIBS@ @DB2_LIBS@
-
-IDENT_AWK = $(top_srcdir)/src/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) $(LIBADD_DL) @XML_LIBS@ @MIME_LIBS@ @CPP_LIBS@
 EXTRA_DIST = parser3.dsp