diff --git a/Makefile.in b/Makefile.in index 3962c2b..629dd67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,9 +80,9 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ -Makefile.am Makefile.in NEWS aclocal.m4 config.guess config.h.in \ -config.sub configure configure.in install-sh missing mkinstalldirs +DIST_COMMON = README ./stamp-h.in AUTHORS COPYING INSTALL Makefile.am \ +Makefile.in NEWS aclocal.m4 config.guess config.h.in config.sub \ +configure configure.in install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/xlhtml/Makefile.in b/xlhtml/Makefile.in index db3de13..d702d79 100644 --- a/xlhtml/Makefile.in +++ b/xlhtml/Makefile.in @@ -83,7 +83,7 @@ man_MANS = xlhtml.1 bin_SCRIPTS = nsopen nsxlview bin_PROGRAMS = xlhtml LDADD = ../cole/libcole.a -xlhtml_SOURCES = support.c xlhtml.c +xlhtml_SOURCES = support.c xlhtml.c memwatch.c xldump_SOURCES = xldump.c xlcdump_SOURCES = xlcdump.c AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith @@ -97,7 +97,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -xlhtml_OBJECTS = support.o xlhtml.o +xlhtml_OBJECTS = support.o xlhtml.o memwatch.o xlhtml_LDADD = $(LDADD) xlhtml_DEPENDENCIES = ../cole/libcole.a xlhtml_LDFLAGS = diff --git a/xlhtml/xlhtml.c b/xlhtml/xlhtml.c index e9b5969..e886a7f 100644 --- a/xlhtml/xlhtml.c +++ b/xlhtml/xlhtml.c @@ -27,7 +27,6 @@ #include "tuneable.h" #include "xlhtml.h" - static char SectionName[2][12] = /* The section of the Excel Stream where the workbooks are kept */ { "/Workbook", /*!< Excel 97 & 2000 */ @@ -539,9 +538,7 @@ int main (int argc, char **argv) exit(1); } - /* For some reason, this loop core dumps on some */ - /* files from Central Europe...so it's commented out for now */ -/* for (i=0; istr); free(str_array[i]); } - } */ + } for (i=0; i<(int)max_fonts; i++) {