--- parser3/src/main/Makefile.in	2001/11/01 16:12:04	1.26
+++ parser3/src/main/Makefile.in	2002/02/07 17:41:36	1.35
@@ -38,7 +38,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
-top_builddir = ..
+top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
@@ -83,22 +83,23 @@ VERSION = @VERSION@
 XML_INCLUDES = @XML_INCLUDES@
 XML_LIBS = @XML_LIBS@
 YACC = @YACC@
+charsetsdir = @charsetsdir@
 host_os = @host_os@
+rootconfigdir = @rootconfigdir@
+sqldriversdir = @sqldriversdir@
 
-INCLUDES = -I../types -I../classes -I../classes/xalan-patched -I../sql -I../pcre $(INCLTDL) @XML_INCLUDES@ @DB2_INCLUDES@
-
+INCLUDES = -I../types -I../classes -I../sql -I../pcre $(INCLTDL) @XML_INCLUDES@ @DB2_INCLUDES@
 noinst_LIBRARIES = libmain.a
-libmain_a_SOURCES = compile.C compile.tab.C compile_tools.C execute.C pa_array.C pa_common.C pa_exception.C pa_globals.C pa_hash.C pa_pool.C pa_request.C pa_string.C pa_table.C untaint.C pa_dir.C pa_exec.C pa_socks.C pa_sql_driver_manager.C pa_dictionary.C pa_stylesheet_manager.C ident.C pa_charset_connection.C pa_charset_manager.C pa_db_connection.C pa_db_manager.C pa_db_table.C
-
-IDENT_AWK = ../ident.awk
+libmain_a_SOURCES = compile.C compile.tab.C compile_tools.C execute.C pa_array.C pa_common.C pa_exception.C pa_globals.C pa_hash.C pa_pool.C pa_request.C pa_string.C pa_table.C untaint.C pa_dir.C pa_exec.C pa_socks.C pa_sql_driver_manager.C pa_dictionary.C pa_stylesheet_manager.C pa_db_connection.C pa_db_manager.C pa_db_table.C pa_cache_managers.C pa_charset.C pa_charsets.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@
@@ -107,8 +108,8 @@ libmain_a_OBJECTS =  compile.o compile.t
 pa_array.o pa_common.o pa_exception.o pa_globals.o pa_hash.o pa_pool.o \
 pa_request.o pa_string.o pa_table.o untaint.o pa_dir.o pa_exec.o \
 pa_socks.o pa_sql_driver_manager.o pa_dictionary.o \
-pa_stylesheet_manager.o ident.o pa_charset_connection.o \
-pa_charset_manager.o pa_db_connection.o pa_db_manager.o pa_db_table.o
+pa_stylesheet_manager.o pa_db_connection.o pa_db_manager.o \
+pa_db_table.o pa_cache_managers.o pa_charset.o pa_charsets.o ident.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -124,7 +125,7 @@ TAR = tar
 GZIP_ENV = --best
 DEP_FILES =  .deps/compile.P .deps/compile.tab.P .deps/compile_tools.P \
 .deps/execute.P .deps/ident.P .deps/pa_array.P \
-.deps/pa_charset_connection.P .deps/pa_charset_manager.P \
+.deps/pa_cache_managers.P .deps/pa_charset.P .deps/pa_charsets.P \
 .deps/pa_common.P .deps/pa_db_connection.P .deps/pa_db_manager.P \
 .deps/pa_db_table.P .deps/pa_dictionary.P .deps/pa_dir.P \
 .deps/pa_exception.P .deps/pa_exec.P .deps/pa_globals.P .deps/pa_hash.P \
@@ -138,7 +139,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 main/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/main/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -226,14 +227,14 @@ maintainer-clean-tags:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = main
+subdir = src/main
 
 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 main/Makefile
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/main/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -372,9 +373,12 @@ distclean-generic clean-generic maintain
 mostlyclean distclean maintainer-clean
 
 
+
 compile.tab.C: compile.y
 	bison -v $< -o $@
 
+
+
 ident.C: $(IDENT_AWK) $(IDENT_DEPS) Makefile.am
 	rm -f ident.C 
 	echo // do not edit. autogenerated by Makefile.am > ident.C.new