--- parser3/src/main/Makefile.in 2001/10/27 12:58:52 1.25 +++ parser3/src/main/Makefile.in 2002/02/18 08:39:16 1.38 @@ -38,7 +38,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +top_builddir = ../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -61,21 +61,15 @@ 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@ LIBLTDL = @LIBLTDL@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_DEPS = @LIBTOOL_DEPS@ -LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ -OBJDUMP = @OBJDUMP@ P3S = @P3S@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ @@ -83,22 +77,28 @@ 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_HEADERS = compile_tools.h 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 +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 = ../ident.awk +IDENT_AWK = $(top_srcdir)/src/ident.awk IDENT_DEPS = *.h *.C + +EXTRA_DIST = compile.y main.dsp 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,24 +107,25 @@ 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) -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +HEADERS = $(noinst_HEADERS) + DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +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 \ @@ -136,9 +137,9 @@ OBJECTS = $(libmain_a_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .C .S .c .lo .o .s +.SUFFIXES: .C .S .c .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) \ @@ -170,30 +171,12 @@ distclean-compile: maintainer-clean-compile: -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - libmain.a: $(libmain_a_OBJECTS) $(libmain_a_DEPENDENCIES) -rm -f libmain.a $(AR) cru libmain.a $(libmain_a_OBJECTS) $(libmain_a_LIBADD) $(RANLIB) libmain.a .C.o: $(CXXCOMPILE) -c $< -.C.lo: - $(LTCXXCOMPILE) -c $< tags: TAGS @@ -226,18 +209,18 @@ 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 \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -314,7 +297,7 @@ install-am: all-am install: install-am uninstall-am: uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) +all-am: Makefile $(LIBRARIES) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -331,27 +314,25 @@ distclean-generic: maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic + mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-am -clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-depend clean-generic mostlyclean-am +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-depend \ - distclean-generic clean-am - -rm -f libtool + distclean-tags distclean-depend distclean-generic \ + clean-am distclean: distclean-am maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-depend \ - maintainer-clean-generic distclean-am + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -360,16 +341,14 @@ maintainer-clean: maintainer-clean-am .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir \ -mostlyclean-depend distclean-depend clean-depend \ -maintainer-clean-depend info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean compile.tab.C: compile.y