--- parser3/src/classes/Makefile.am	2001/10/28 14:07:45	1.30
+++ parser3/src/classes/Makefile.am	2002/01/31 10:20:18	1.35
@@ -1,10 +1,9 @@
-SUBDIRS = gd xalan-patched
+SUBDIRS = gd
 
-INCLUDES = -I../types -I../sql -I../pcre -Igd -Ixalan-patched @XML_INCLUDES@ @DB2_INCLUDES@
+INCLUDES = -I../types -I../sql -I../pcre -Igd @XML_INCLUDES@ @DB2_INCLUDES@
 
 noinst_LIBRARIES = libclasses.a
-libclasses_a_SOURCES = ident.C classes.C double.C file.C form.C image.C int.C mail.C op.C math.C response.C string.C table.C void.C hash.C date.C xnode.C xdoc.C hashfile.C
-CLEANFILES = classes.inc
+libclasses_a_SOURCES = double.C file.C form.C image.C int.C mail.C op.C math.C response.C string.C table.C void.C hash.C date.C xnode.C xdoc.C hashfile.C ident.C classes.C
 
 CLASSES_INC_DEPS = *.C
 
@@ -12,10 +11,11 @@ classes.inc: classes.awk $(CLASSES_INC_D
 	echo "/* do not edit. autogenerated by Makefile.am */" > classes.inc
 	echo >> classes.inc
 	ls $(CLASSES_INC_DEPS) | $(AWK) -f classes.awk >> classes.inc
+CLEANFILES = classes.inc
 
 classes.C: classes.inc
 
-IDENT_AWK = ../ident.awk
+IDENT_AWK = $(top_srcdir)/ident.awk
 IDENT_DEPS = *.awk *.h *.C
 
 ident.C: $(IDENT_AWK) $(IDENT_DEPS) Makefile.am