From c330eac117669329251d68c1ffeec360cfc291cb Mon Sep 17 00:00:00 2001 From: slidedraw Date: Thu, 18 Apr 2002 17:22:08 +0000 Subject: [PATCH] Fixed some more build bugs. --- cole/Makefile.am | 2 +- cole/Makefile.in | 2 +- ppthtml/Makefile.am | 2 +- ppthtml/Makefile.in | 2 +- xlhtml/Makefile.am | 3 +-- xlhtml/Makefile.in | 3 +-- xlhtml/support.c | 1 - xlhtml/xlhtml.h | 1 - 8 files changed, 6 insertions(+), 10 deletions(-) diff --git a/cole/Makefile.am b/cole/Makefile.am index 6d50db5..f0f0e61 100644 --- a/cole/Makefile.am +++ b/cole/Makefile.am @@ -4,5 +4,5 @@ EXTRA_DIST = README-cole README-CVS DOWNLOAD ChangeLog ChangeLog-from1to2 TODO T noinst_LIBRARIES = libcole.a libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h -AM_CFLAGS = -Wall -Wcast-align -Wpointer-arith +#AM_CFLAGS = -Wall -Wcast-align -Wpointer-arith diff --git a/cole/Makefile.in b/cole/Makefile.in index e926126..1e97a18 100644 --- a/cole/Makefile.in +++ b/cole/Makefile.in @@ -78,7 +78,6 @@ EXTRA_DIST = README-cole README-CVS DOWNLOAD ChangeLog ChangeLog-from1to2 TODO T noinst_LIBRARIES = libcole.a libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h -AM_CFLAGS = -Wall -Wcast-align -Wpointer-arith mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = version.c cole.h @@ -270,6 +269,7 @@ all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean +#AM_CFLAGS = -Wall -Wcast-align -Wpointer-arith # 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. diff --git a/ppthtml/Makefile.am b/ppthtml/Makefile.am index 42e71de..9be3fa7 100644 --- a/ppthtml/Makefile.am +++ b/ppthtml/Makefile.am @@ -10,4 +10,4 @@ bin_SCRIPTS = nspptview bin_PROGRAMS = ppthtml LDADD = ../cole/libcole.a ppthtml_SOURCES = ppthtml.c -AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith +#AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith diff --git a/ppthtml/Makefile.in b/ppthtml/Makefile.in index ca78a94..a8c3aba 100644 --- a/ppthtml/Makefile.in +++ b/ppthtml/Makefile.in @@ -84,7 +84,6 @@ bin_SCRIPTS = nspptview bin_PROGRAMS = ppthtml LDADD = ../cole/libcole.a ppthtml_SOURCES = ppthtml.c -AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -375,6 +374,7 @@ 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 +#AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith # 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. diff --git a/xlhtml/Makefile.am b/xlhtml/Makefile.am index 7959c9f..b68d6cd 100644 --- a/xlhtml/Makefile.am +++ b/xlhtml/Makefile.am @@ -12,8 +12,7 @@ LDADD = ../cole/libcole.a -lm xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c xldump_SOURCES = xldump.c xlcdump_SOURCES = xlcdump.c -AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith -support.o: version.h +#AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith doc: @echo Generating documentation... diff --git a/xlhtml/Makefile.in b/xlhtml/Makefile.in index 1a8ad8c..cfdfa7a 100644 --- a/xlhtml/Makefile.in +++ b/xlhtml/Makefile.in @@ -86,7 +86,6 @@ LDADD = ../cole/libcole.a -lm xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c xldump_SOURCES = xldump.c xlcdump_SOURCES = xlcdump.c -AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -384,7 +383,7 @@ 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 -support.o: version.h +#AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith doc: @echo Generating documentation... diff --git a/xlhtml/support.c b/xlhtml/support.c index 1417591..b95d74a 100644 --- a/xlhtml/support.c +++ b/xlhtml/support.c @@ -2,7 +2,6 @@ /* Various support functions for xlhtml. */ #include -#include "version.h" #include #include "../cole/cole.h" #include diff --git a/xlhtml/xlhtml.h b/xlhtml/xlhtml.h index f35b25a..4f5e153 100644 --- a/xlhtml/xlhtml.h +++ b/xlhtml/xlhtml.h @@ -17,7 +17,6 @@ #include /* For fabs() */ #include /* For isprint() */ #include -#include "version.h" /* Used by packed string array Opcode: 0xFC */ #define HARD_MAX_ROWS_97 0x7FFE /*!< Used in add_wb_array to prevent OOM */