--- parser3/src/types/Makefile.in	2001/05/10 17:28:34	1.2
+++ parser3/src/types/Makefile.in	2002/02/05 14:57:51	1.30
@@ -10,8 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-#  $Id: Makefile.in,v 1.2 2001/05/10 17:28:34 paf Exp $
-
 
 SHELL = @SHELL@
 
@@ -40,7 +38,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
-top_builddir = ..
+top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
@@ -61,10 +59,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+APACHE13 = @APACHE13@
+APACHE_LIBS = @APACHE_LIBS@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+DB2_INCLUDES = @DB2_INCLUDES@
+DB2_LIBS = @DB2_LIBS@
 DLLTOOL = @DLLTOOL@
 INCLTDL = @INCLTDL@
 LIBADD_DL = @LIBADD_DL@
@@ -74,31 +76,40 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
+P3S = @P3S@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
-WIN32_ADDITIONAL_LIBS = @WIN32_ADDITIONAL_LIBS@
+XML_INCLUDES = @XML_INCLUDES@
+XML_LIBS = @XML_LIBS@
 YACC = @YACC@
+charsetsdir = @charsetsdir@
 host_os = @host_os@
+rootconfigdir = @rootconfigdir@
+sqldriversdir = @sqldriversdir@
 
-INCLUDES = -I../include -I../classes -I../sql
+INCLUDES = -I../classes -I../sql -I../pcre -I../classes/gd @XML_INCLUDES@ @DB2_INCLUDES@
 
 noinst_LIBRARIES = libtypes.a
-libtypes_a_SOURCES = pa_valiased.C pa_vcookie.C pa_vfile.C pa_vform.C pa_vimage.C pa_vrequest.C pa_vstateless_class.C pa_vstring.C pa_wcontext.C
+libtypes_a_SOURCES = pa_valiased.C pa_vcookie.C pa_vfile.C pa_vform.C pa_vimage.C pa_vrequest.C pa_vresponse.C pa_vstateless_class.C pa_vstring.C pa_wcontext.C pa_vtable.C pa_vxnode.C pa_vxdoc.C pa_vhashfile.C pa_vstatus.C ident.C
+
+IDENT_AWK = $(top_srcdir)/src/ident.awk
+IDENT_DEPS = *.h *.C
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../include/pa_config_auto.h
+CONFIG_HEADER = ../../src/include/pa_config_auto.h
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(noinst_LIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I../include
+DEFS = @DEFS@ -I. -I$(srcdir) -I../../src/include
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libtypes_a_LIBADD = 
 libtypes_a_OBJECTS =  pa_valiased.o pa_vcookie.o pa_vfile.o pa_vform.o \
-pa_vimage.o pa_vrequest.o pa_vstateless_class.o pa_vstring.o \
-pa_wcontext.o
+pa_vimage.o pa_vrequest.o pa_vresponse.o pa_vstateless_class.o \
+pa_vstring.o pa_wcontext.o pa_vtable.o pa_vxnode.o pa_vxdoc.o \
+pa_vhashfile.o pa_vstatus.o ident.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -112,9 +123,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/pa_valiased.P .deps/pa_vcookie.P .deps/pa_vfile.P \
-.deps/pa_vform.P .deps/pa_vimage.P .deps/pa_vrequest.P \
-.deps/pa_vstateless_class.P .deps/pa_vstring.P .deps/pa_wcontext.P
+DEP_FILES =  .deps/ident.P .deps/pa_valiased.P .deps/pa_vcookie.P \
+.deps/pa_vfile.P .deps/pa_vform.P .deps/pa_vhashfile.P \
+.deps/pa_vimage.P .deps/pa_vrequest.P .deps/pa_vresponse.P \
+.deps/pa_vstateless_class.P .deps/pa_vstatus.P .deps/pa_vstring.P \
+.deps/pa_vtable.P .deps/pa_vxdoc.P .deps/pa_vxnode.P \
+.deps/pa_wcontext.P
 SOURCES = $(libtypes_a_SOURCES)
 OBJECTS = $(libtypes_a_OBJECTS)
 
@@ -122,7 +136,7 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .C .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu types/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/types/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -210,14 +224,14 @@ maintainer-clean-tags:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = types
+subdir = src/types
 
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
 	distdir=`cd $(distdir) && pwd`; \
 	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu types/Makefile
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/types/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -356,6 +370,12 @@ distclean-generic clean-generic maintain
 mostlyclean distclean maintainer-clean
 
 
+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=types >> ident.C.new 
+	mv ident.C.new ident.C 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: