--- parser3/src/classes/Makefile.in 2001/10/11 08:00:29 1.22 +++ parser3/src/classes/Makefile.in 2001/10/24 16:59:37 1.27 @@ -63,6 +63,7 @@ APACHE13 = @APACHE13@ AS = @AS@ AWK = @AWK@ CC = @CC@ +CPP_LIBS = @CPP_LIBS@ CXX = @CXX@ DLLTOOL = @DLLTOOL@ INCLTDL = @INCLTDL@ @@ -72,6 +73,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ +MATH_LIBS = @MATH_LIBS@ OBJDUMP = @OBJDUMP@ P3S = @P3S@ PACKAGE = @PACKAGE@ @@ -81,13 +83,17 @@ 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 xalan-patched +SUBDIRS = gd $(PATCHES_SUBDIR) -INCLUDES = -I../types -I../sql -I../pcre -Igd -Ixalan-patched @XML_INCLUDES@ +INCLUDES = -I../types -I../sql -I../pcre -Igd $(PATCHES_INCLUDES) @XML_INCLUDES@ noinst_LIBRARIES = libclasses.a -libclasses_a_SOURCES = 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 ident.C +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 CLASSES_INC_DEPS = *.C @@ -105,9 +111,9 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libclasses_a_LIBADD = -libclasses_a_OBJECTS = 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 ident.o +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 AR = ar CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -121,10 +127,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $( TAR = gtar 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/ident.P .deps/image.P .deps/int.P \ -.deps/mail.P .deps/math.P .deps/op.P .deps/response.P .deps/string.P \ -.deps/table.P .deps/void.P .deps/xdoc.P .deps/xnode.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 \ +.deps/string.P .deps/table.P .deps/void.P .deps/xdoc.P .deps/xnode.P SOURCES = $(libclasses_a_SOURCES) OBJECTS = $(libclasses_a_OBJECTS) @@ -298,7 +305,7 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - for subdir in $(SUBDIRS); do \ + for subdir in $(DIST_SUBDIRS); do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \