--- parser3/src/classes/Makefile.in	2001/10/27 12:17:17	1.28
+++ parser3/src/classes/Makefile.in	2002/01/28 13:33:56	1.35
@@ -65,6 +65,8 @@ AS = @AS@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+DB2_INCLUDES = @DB2_INCLUDES@
+DB2_LIBS = @DB2_LIBS@
 DLLTOOL = @DLLTOOL@
 INCLTDL = @INCLTDL@
 LIBADD_DL = @LIBADD_DL@
@@ -82,17 +84,13 @@ XML_INCLUDES = @XML_INCLUDES@
 XML_LIBS = @XML_LIBS@
 YACC = @YACC@
 host_os = @host_os@
-@COMPILE_XML_TRUE@PATCHES_SUBDIR = xalan-patched
-@COMPILE_XML_FALSE@PATCHES_SUBDIR = 
-@COMPILE_XML_TRUE@PATCHES_INCLUDES = -I$(PATCHES_SUBDIR)
-@COMPILE_XML_FALSE@PATCHES_INCLUDES = 
 
-SUBDIRS = gd $(PATCHES_SUBDIR)
+SUBDIRS = gd
 
-INCLUDES = -I../types -I../sql -I../pcre -Igd $(PATCHES_INCLUDES) @XML_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
+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
 CLEANFILES = classes.inc
 
 CLASSES_INC_DEPS = *.C
@@ -110,9 +108,9 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libclasses_a_LIBADD = 
-libclasses_a_OBJECTS =  ident.o classes.o double.o file.o form.o image.o \
-int.o mail.o op.o math.o response.o string.o table.o void.o hash.o \
-date.o xnode.o xdoc.o hashfile.o
+libclasses_a_OBJECTS =  double.o file.o form.o image.o int.o mail.o op.o \
+math.o response.o string.o table.o void.o hash.o date.o xnode.o xdoc.o \
+hashfile.o ident.o classes.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -124,9 +122,8 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
-DIST_SUBDIRS =  gd xalan-patched
 DEP_FILES =  .deps/classes.P .deps/date.P .deps/double.P .deps/file.P \
 .deps/form.P .deps/hash.P .deps/hashfile.P .deps/ident.P .deps/image.P \
 .deps/int.P .deps/mail.P .deps/math.P .deps/op.P .deps/response.P \
@@ -297,14 +294,14 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-	for subdir in $(DIST_SUBDIRS); do \
+	for subdir in $(SUBDIRS); do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \