Fixed some more build bugs.
This commit is contained in:
parent
c83b6936e3
commit
c330eac117
@ -4,5 +4,5 @@ EXTRA_DIST = README-cole README-CVS DOWNLOAD ChangeLog ChangeLog-from1to2 TODO T
|
|||||||
|
|
||||||
noinst_LIBRARIES = libcole.a
|
noinst_LIBRARIES = libcole.a
|
||||||
libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h
|
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
|
||||||
|
|
||||||
|
@ -78,7 +78,6 @@ EXTRA_DIST = README-cole README-CVS DOWNLOAD ChangeLog ChangeLog-from1to2 TODO T
|
|||||||
|
|
||||||
noinst_LIBRARIES = libcole.a
|
noinst_LIBRARIES = libcole.a
|
||||||
libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h
|
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
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
CONFIG_HEADER = ../config.h
|
CONFIG_HEADER = ../config.h
|
||||||
CONFIG_CLEAN_FILES = version.c cole.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 \
|
distclean-generic clean-generic maintainer-clean-generic clean \
|
||||||
mostlyclean distclean maintainer-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.
|
# 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.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
@ -10,4 +10,4 @@ bin_SCRIPTS = nspptview
|
|||||||
bin_PROGRAMS = ppthtml
|
bin_PROGRAMS = ppthtml
|
||||||
LDADD = ../cole/libcole.a
|
LDADD = ../cole/libcole.a
|
||||||
ppthtml_SOURCES = ppthtml.c
|
ppthtml_SOURCES = ppthtml.c
|
||||||
AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
|
#AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
|
||||||
|
@ -84,7 +84,6 @@ bin_SCRIPTS = nspptview
|
|||||||
bin_PROGRAMS = ppthtml
|
bin_PROGRAMS = ppthtml
|
||||||
LDADD = ../cole/libcole.a
|
LDADD = ../cole/libcole.a
|
||||||
ppthtml_SOURCES = ppthtml.c
|
ppthtml_SOURCES = ppthtml.c
|
||||||
AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
CONFIG_HEADER = ../config.h
|
CONFIG_HEADER = ../config.h
|
||||||
CONFIG_CLEAN_FILES =
|
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 \
|
installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
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.
|
# 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.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
@ -12,8 +12,7 @@ LDADD = ../cole/libcole.a -lm
|
|||||||
xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c
|
xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c
|
||||||
xldump_SOURCES = xldump.c
|
xldump_SOURCES = xldump.c
|
||||||
xlcdump_SOURCES = xlcdump.c
|
xlcdump_SOURCES = xlcdump.c
|
||||||
AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
|
#AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
|
||||||
support.o: version.h
|
|
||||||
|
|
||||||
doc:
|
doc:
|
||||||
@echo Generating documentation...
|
@echo Generating documentation...
|
||||||
|
@ -86,7 +86,6 @@ LDADD = ../cole/libcole.a -lm
|
|||||||
xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c
|
xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c
|
||||||
xldump_SOURCES = xldump.c
|
xldump_SOURCES = xldump.c
|
||||||
xlcdump_SOURCES = xlcdump.c
|
xlcdump_SOURCES = xlcdump.c
|
||||||
AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
CONFIG_HEADER = ../config.h
|
CONFIG_HEADER = ../config.h
|
||||||
CONFIG_CLEAN_FILES =
|
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 \
|
installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||||
|
|
||||||
support.o: version.h
|
#AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
|
||||||
|
|
||||||
doc:
|
doc:
|
||||||
@echo Generating documentation...
|
@echo Generating documentation...
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
/* Various support functions for xlhtml. */
|
/* Various support functions for xlhtml. */
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "version.h"
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include "../cole/cole.h"
|
#include "../cole/cole.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
#include <math.h> /* For fabs() */
|
#include <math.h> /* For fabs() */
|
||||||
#include <ctype.h> /* For isprint() */
|
#include <ctype.h> /* For isprint() */
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "version.h"
|
|
||||||
|
|
||||||
/* Used by packed string array Opcode: 0xFC */
|
/* Used by packed string array Opcode: 0xFC */
|
||||||
#define HARD_MAX_ROWS_97 0x7FFE /*!< Used in add_wb_array to prevent OOM */
|
#define HARD_MAX_ROWS_97 0x7FFE /*!< Used in add_wb_array to prevent OOM */
|
||||||
|
Loading…
Reference in New Issue
Block a user