--- parser3/src/classes/Makefile.am	2001/10/24 16:59:37	1.28
+++ parser3/src/classes/Makefile.am	2002/02/22 10:11:30	1.38
@@ -1,18 +1,10 @@
-if COMPILE_XML
-PATCHES_SUBDIR=xalan-patched
-PATCHES_INCLUDES=-I$(PATCHES_SUBDIR)
-else
-PATCHES_SUBDIR=
-PATCHES_INCLUDES=
-endif
+SUBDIRS = gd smtp
 
-SUBDIRS = gd $(PATCHES_SUBDIR)
-
-INCLUDES = -I../types -I../sql -I../pcre -Igd $(PATCHES_INCLUDES) @XML_INCLUDES@
+INCLUDES = -I../types -I../sql -I../pcre -Igd @XML_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
+noinst_HEADERS = classes.h xnode.h
+libclasses_a_SOURCES = classes.awk 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 ident.C classes.C
 
 CLASSES_INC_DEPS = *.C
 
@@ -20,10 +12,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)/src/ident.awk
 IDENT_DEPS = *.awk *.h *.C
 
 ident.C: $(IDENT_AWK) $(IDENT_DEPS) Makefile.am
@@ -31,3 +24,5 @@ ident.C: $(IDENT_AWK) $(IDENT_DEPS) Make
 	echo // do not edit. autogenerated by Makefile.am > ident.C.new 
 	cat $(IDENT_DEPS) | $(AWK) -f $(IDENT_AWK) -v project=classes >> ident.C.new 
 	mv ident.C.new ident.C 
+
+EXTRA_DIST = classes.dsp