Fixed some warnings. Cut 0.5 (final) release.
This commit is contained in:
parent
cecd43bfee
commit
1909754c0b
@ -92,9 +92,9 @@ GZIP_ENV = --best
|
|||||||
all: all-redirect
|
all: all-redirect
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||||
cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
|
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
|
||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||||
cd $(top_builddir) \
|
cd $(top_builddir) \
|
||||||
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||||
|
|
||||||
@ -261,6 +261,11 @@ distdir: $(DISTFILES)
|
|||||||
-rm -rf $(distdir)
|
-rm -rf $(distdir)
|
||||||
mkdir $(distdir)
|
mkdir $(distdir)
|
||||||
-chmod 777 $(distdir)
|
-chmod 777 $(distdir)
|
||||||
|
here=`cd $(top_builddir) && pwd`; \
|
||||||
|
top_distdir=`cd $(distdir) && pwd`; \
|
||||||
|
distdir=`cd $(distdir) && pwd`; \
|
||||||
|
cd $(top_srcdir) \
|
||||||
|
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
|
||||||
@for file in $(DISTFILES); do \
|
@for file in $(DISTFILES); do \
|
||||||
d=$(srcdir); \
|
d=$(srcdir); \
|
||||||
if test -d $$d/$$file; then \
|
if test -d $$d/$$file; then \
|
||||||
|
@ -97,14 +97,16 @@ CFLAGS = @CFLAGS@
|
|||||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||||
CCLD = $(CC)
|
CCLD = $(CC)
|
||||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||||
DIST_COMMON = AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in \
|
DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in NEWS \
|
||||||
NEWS THANKS TODO cole.h.in version.c.in
|
THANKS TODO cole.h.in version.c.in
|
||||||
|
|
||||||
|
|
||||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
|
|
||||||
TAR = tar
|
TAR = tar
|
||||||
GZIP_ENV = --best
|
GZIP_ENV = --best
|
||||||
|
DEP_FILES = .deps/cole.P .deps/internal.P .deps/olecod.P \
|
||||||
|
.deps/oledecod.P .deps/support.P .deps/version.P
|
||||||
SOURCES = $(libcole_a_SOURCES)
|
SOURCES = $(libcole_a_SOURCES)
|
||||||
OBJECTS = $(libcole_a_OBJECTS)
|
OBJECTS = $(libcole_a_OBJECTS)
|
||||||
|
|
||||||
@ -112,9 +114,9 @@ all: all-redirect
|
|||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .S .c .o .s
|
.SUFFIXES: .S .c .o .s
|
||||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||||
cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps cole/Makefile
|
cd $(top_srcdir) && $(AUTOMAKE) --gnu cole/Makefile
|
||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||||
cd $(top_builddir) \
|
cd $(top_builddir) \
|
||||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||||
|
|
||||||
@ -132,9 +134,6 @@ distclean-noinstLIBRARIES:
|
|||||||
|
|
||||||
maintainer-clean-noinstLIBRARIES:
|
maintainer-clean-noinstLIBRARIES:
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(COMPILE) -c $<
|
|
||||||
|
|
||||||
.s.o:
|
.s.o:
|
||||||
$(COMPILE) -c $<
|
$(COMPILE) -c $<
|
||||||
|
|
||||||
@ -190,6 +189,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
|||||||
subdir = cole
|
subdir = cole
|
||||||
|
|
||||||
distdir: $(DISTFILES)
|
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 cole/Makefile
|
||||||
$(mkinstalldirs) $(distdir)/doc $(distdir)/examples $(distdir)/utils
|
$(mkinstalldirs) $(distdir)/doc $(distdir)/examples $(distdir)/utils
|
||||||
@for file in $(DISTFILES); do \
|
@for file in $(DISTFILES); do \
|
||||||
d=$(srcdir); \
|
d=$(srcdir); \
|
||||||
@ -201,6 +205,38 @@ distdir: $(DISTFILES)
|
|||||||
|| cp -p $$d/$$file $(distdir)/$$file || :; \
|
|| cp -p $$d/$$file $(distdir)/$$file || :; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
|
||||||
|
|
||||||
|
-include $(DEP_FILES)
|
||||||
|
|
||||||
|
mostlyclean-depend:
|
||||||
|
|
||||||
|
clean-depend:
|
||||||
|
|
||||||
|
distclean-depend:
|
||||||
|
-rm -rf .deps
|
||||||
|
|
||||||
|
maintainer-clean-depend:
|
||||||
|
|
||||||
|
%.o: %.c
|
||||||
|
@echo '$(COMPILE) -c $<'; \
|
||||||
|
$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||||
|
@-cp .deps/$(*F).pp .deps/$(*F).P; \
|
||||||
|
tr ' ' '\012' < .deps/$(*F).pp \
|
||||||
|
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||||
|
>> .deps/$(*F).P; \
|
||||||
|
rm .deps/$(*F).pp
|
||||||
|
|
||||||
|
%.lo: %.c
|
||||||
|
@echo '$(LTCOMPILE) -c $<'; \
|
||||||
|
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||||
|
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||||
|
< .deps/$(*F).pp > .deps/$(*F).P; \
|
||||||
|
tr ' ' '\012' < .deps/$(*F).pp \
|
||||||
|
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||||
|
>> .deps/$(*F).P; \
|
||||||
|
rm -f .deps/$(*F).pp
|
||||||
info-am:
|
info-am:
|
||||||
info: info-am
|
info: info-am
|
||||||
dvi-am:
|
dvi-am:
|
||||||
@ -237,23 +273,25 @@ distclean-generic:
|
|||||||
|
|
||||||
maintainer-clean-generic:
|
maintainer-clean-generic:
|
||||||
mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
|
mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
|
||||||
mostlyclean-tags mostlyclean-generic
|
mostlyclean-tags mostlyclean-depend mostlyclean-generic
|
||||||
|
|
||||||
mostlyclean: mostlyclean-am
|
mostlyclean: mostlyclean-am
|
||||||
|
|
||||||
clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
|
clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
|
||||||
mostlyclean-am
|
clean-generic mostlyclean-am
|
||||||
|
|
||||||
clean: clean-am
|
clean: clean-am
|
||||||
|
|
||||||
distclean-am: distclean-noinstLIBRARIES distclean-compile \
|
distclean-am: distclean-noinstLIBRARIES distclean-compile \
|
||||||
distclean-tags distclean-generic clean-am
|
distclean-tags distclean-depend distclean-generic \
|
||||||
|
clean-am
|
||||||
|
|
||||||
distclean: distclean-am
|
distclean: distclean-am
|
||||||
|
|
||||||
maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
|
maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
|
||||||
maintainer-clean-compile maintainer-clean-tags \
|
maintainer-clean-compile maintainer-clean-tags \
|
||||||
maintainer-clean-generic distclean-am
|
maintainer-clean-depend maintainer-clean-generic \
|
||||||
|
distclean-am
|
||||||
@echo "This command is intended for maintainers to use;"
|
@echo "This command is intended for maintainers to use;"
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
|
||||||
@ -263,12 +301,13 @@ maintainer-clean: maintainer-clean-am
|
|||||||
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
|
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
|
||||||
mostlyclean-compile distclean-compile clean-compile \
|
mostlyclean-compile distclean-compile clean-compile \
|
||||||
maintainer-clean-compile tags mostlyclean-tags distclean-tags \
|
maintainer-clean-compile tags mostlyclean-tags distclean-tags \
|
||||||
clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
|
clean-tags maintainer-clean-tags distdir mostlyclean-depend \
|
||||||
check-am installcheck-am installcheck install-exec-am install-exec \
|
distclean-depend clean-depend maintainer-clean-depend info-am info \
|
||||||
install-data-am install-data install-am install uninstall-am uninstall \
|
dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
|
||||||
all-redirect all-am all installdirs mostlyclean-generic \
|
install-exec install-data-am install-data install-am install \
|
||||||
distclean-generic clean-generic maintainer-clean-generic clean \
|
uninstall-am uninstall all-redirect all-am all installdirs \
|
||||||
mostlyclean distclean maintainer-clean
|
mostlyclean-generic distclean-generic clean-generic \
|
||||||
|
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||||
|
|
||||||
|
|
||||||
# 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.
|
||||||
|
@ -34,7 +34,7 @@ extern "C" {
|
|||||||
/* Just to get size_t */
|
/* Just to get size_t */
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#ifndef COLE_INTERNAL_H
|
#ifndef COLE_INTERNAL_H
|
||||||
#include "internal.h" // For _COLE struct definitions
|
#include "internal.h" /* For _COLE struct definitions */
|
||||||
#endif
|
#endif
|
||||||
#if !(defined( __BORLANDC__ ) || defined( __WIN32__ ))
|
#if !(defined( __BORLANDC__ ) || defined( __WIN32__ ))
|
||||||
/**************************************************************/
|
/**************************************************************/
|
||||||
|
@ -121,6 +121,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|||||||
|
|
||||||
TAR = tar
|
TAR = tar
|
||||||
GZIP_ENV = --best
|
GZIP_ENV = --best
|
||||||
|
DEP_FILES = .deps/pptdump.P .deps/ppthtml.P
|
||||||
SOURCES = $(ppthtml_SOURCES) pptdump.c
|
SOURCES = $(ppthtml_SOURCES) pptdump.c
|
||||||
OBJECTS = $(ppthtml_OBJECTS) pptdump.o
|
OBJECTS = $(ppthtml_OBJECTS) pptdump.o
|
||||||
|
|
||||||
@ -128,9 +129,9 @@ all: all-redirect
|
|||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .S .c .o .s
|
.SUFFIXES: .S .c .o .s
|
||||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||||
cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ppthtml/Makefile
|
cd $(top_srcdir) && $(AUTOMAKE) --gnu ppthtml/Makefile
|
||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||||
cd $(top_builddir) \
|
cd $(top_builddir) \
|
||||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||||
|
|
||||||
@ -169,9 +170,6 @@ distclean-noinstPROGRAMS:
|
|||||||
|
|
||||||
maintainer-clean-noinstPROGRAMS:
|
maintainer-clean-noinstPROGRAMS:
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(COMPILE) -c $<
|
|
||||||
|
|
||||||
.s.o:
|
.s.o:
|
||||||
$(COMPILE) -c $<
|
$(COMPILE) -c $<
|
||||||
|
|
||||||
@ -288,6 +286,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
|||||||
subdir = ppthtml
|
subdir = ppthtml
|
||||||
|
|
||||||
distdir: $(DISTFILES)
|
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 ppthtml/Makefile
|
||||||
@for file in $(DISTFILES); do \
|
@for file in $(DISTFILES); do \
|
||||||
d=$(srcdir); \
|
d=$(srcdir); \
|
||||||
if test -d $$d/$$file; then \
|
if test -d $$d/$$file; then \
|
||||||
@ -298,6 +301,38 @@ distdir: $(DISTFILES)
|
|||||||
|| cp -p $$d/$$file $(distdir)/$$file || :; \
|
|| cp -p $$d/$$file $(distdir)/$$file || :; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
|
||||||
|
|
||||||
|
-include $(DEP_FILES)
|
||||||
|
|
||||||
|
mostlyclean-depend:
|
||||||
|
|
||||||
|
clean-depend:
|
||||||
|
|
||||||
|
distclean-depend:
|
||||||
|
-rm -rf .deps
|
||||||
|
|
||||||
|
maintainer-clean-depend:
|
||||||
|
|
||||||
|
%.o: %.c
|
||||||
|
@echo '$(COMPILE) -c $<'; \
|
||||||
|
$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||||
|
@-cp .deps/$(*F).pp .deps/$(*F).P; \
|
||||||
|
tr ' ' '\012' < .deps/$(*F).pp \
|
||||||
|
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||||
|
>> .deps/$(*F).P; \
|
||||||
|
rm .deps/$(*F).pp
|
||||||
|
|
||||||
|
%.lo: %.c
|
||||||
|
@echo '$(LTCOMPILE) -c $<'; \
|
||||||
|
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||||
|
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||||
|
< .deps/$(*F).pp > .deps/$(*F).P; \
|
||||||
|
tr ' ' '\012' < .deps/$(*F).pp \
|
||||||
|
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||||
|
>> .deps/$(*F).P; \
|
||||||
|
rm -f .deps/$(*F).pp
|
||||||
info-am:
|
info-am:
|
||||||
info: info-am
|
info: info-am
|
||||||
dvi-am:
|
dvi-am:
|
||||||
@ -336,26 +371,27 @@ distclean-generic:
|
|||||||
|
|
||||||
maintainer-clean-generic:
|
maintainer-clean-generic:
|
||||||
mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
|
mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
|
||||||
mostlyclean-compile mostlyclean-tags \
|
mostlyclean-compile mostlyclean-tags mostlyclean-depend \
|
||||||
mostlyclean-generic
|
mostlyclean-generic
|
||||||
|
|
||||||
mostlyclean: mostlyclean-am
|
mostlyclean: mostlyclean-am
|
||||||
|
|
||||||
clean-am: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
|
clean-am: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
|
||||||
clean-tags clean-generic mostlyclean-am
|
clean-tags clean-depend clean-generic mostlyclean-am
|
||||||
|
|
||||||
clean: clean-am
|
clean: clean-am
|
||||||
|
|
||||||
distclean-am: distclean-binPROGRAMS distclean-noinstPROGRAMS \
|
distclean-am: distclean-binPROGRAMS distclean-noinstPROGRAMS \
|
||||||
distclean-compile distclean-tags distclean-generic \
|
distclean-compile distclean-tags distclean-depend \
|
||||||
clean-am
|
distclean-generic clean-am
|
||||||
|
|
||||||
distclean: distclean-am
|
distclean: distclean-am
|
||||||
|
|
||||||
maintainer-clean-am: maintainer-clean-binPROGRAMS \
|
maintainer-clean-am: maintainer-clean-binPROGRAMS \
|
||||||
maintainer-clean-noinstPROGRAMS \
|
maintainer-clean-noinstPROGRAMS \
|
||||||
maintainer-clean-compile maintainer-clean-tags \
|
maintainer-clean-compile maintainer-clean-tags \
|
||||||
maintainer-clean-generic distclean-am
|
maintainer-clean-depend maintainer-clean-generic \
|
||||||
|
distclean-am
|
||||||
@echo "This command is intended for maintainers to use;"
|
@echo "This command is intended for maintainers to use;"
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
|
||||||
@ -369,11 +405,13 @@ mostlyclean-compile distclean-compile clean-compile \
|
|||||||
maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS \
|
maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS \
|
||||||
install-man1 uninstall-man1 install-man uninstall-man tags \
|
install-man1 uninstall-man1 install-man uninstall-man tags \
|
||||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||||
distdir info-am info dvi-am dvi check check-am installcheck-am \
|
distdir mostlyclean-depend distclean-depend clean-depend \
|
||||||
installcheck install-exec-am install-exec install-data-am install-data \
|
maintainer-clean-depend info-am info dvi-am dvi check check-am \
|
||||||
install-am install uninstall-am uninstall all-redirect all-am all \
|
installcheck-am installcheck install-exec-am install-exec \
|
||||||
installdirs mostlyclean-generic distclean-generic clean-generic \
|
install-data-am install-data install-am install uninstall-am uninstall \
|
||||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
all-redirect all-am all installdirs mostlyclean-generic \
|
||||||
|
distclean-generic clean-generic maintainer-clean-generic clean \
|
||||||
|
mostlyclean distclean maintainer-clean
|
||||||
|
|
||||||
|
|
||||||
# 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.
|
||||||
|
@ -86,7 +86,7 @@ LDADD = ../cole/libcole.a
|
|||||||
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 = -ansi -pedantic -Wall -Wshadow -Wcast-align -Wpointer-arith
|
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 =
|
||||||
@ -126,6 +126,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|||||||
|
|
||||||
TAR = tar
|
TAR = tar
|
||||||
GZIP_ENV = --best
|
GZIP_ENV = --best
|
||||||
|
DEP_FILES = .deps/ascii.P .deps/html.P .deps/support.P .deps/xlcdump.P \
|
||||||
|
.deps/xldump.P .deps/xlhtml.P .deps/xml.P
|
||||||
SOURCES = $(xlhtml_SOURCES) $(xldump_SOURCES) $(xlcdump_SOURCES)
|
SOURCES = $(xlhtml_SOURCES) $(xldump_SOURCES) $(xlcdump_SOURCES)
|
||||||
OBJECTS = $(xlhtml_OBJECTS) $(xldump_OBJECTS) $(xlcdump_OBJECTS)
|
OBJECTS = $(xlhtml_OBJECTS) $(xldump_OBJECTS) $(xlcdump_OBJECTS)
|
||||||
|
|
||||||
@ -133,9 +135,9 @@ all: all-redirect
|
|||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .S .c .o .s
|
.SUFFIXES: .S .c .o .s
|
||||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||||
cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps xlhtml/Makefile
|
cd $(top_srcdir) && $(AUTOMAKE) --gnu xlhtml/Makefile
|
||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||||
cd $(top_builddir) \
|
cd $(top_builddir) \
|
||||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||||
|
|
||||||
@ -174,9 +176,6 @@ distclean-noinstPROGRAMS:
|
|||||||
|
|
||||||
maintainer-clean-noinstPROGRAMS:
|
maintainer-clean-noinstPROGRAMS:
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(COMPILE) -c $<
|
|
||||||
|
|
||||||
.s.o:
|
.s.o:
|
||||||
$(COMPILE) -c $<
|
$(COMPILE) -c $<
|
||||||
|
|
||||||
@ -297,6 +296,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
|
|||||||
subdir = xlhtml
|
subdir = xlhtml
|
||||||
|
|
||||||
distdir: $(DISTFILES)
|
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 xlhtml/Makefile
|
||||||
@for file in $(DISTFILES); do \
|
@for file in $(DISTFILES); do \
|
||||||
d=$(srcdir); \
|
d=$(srcdir); \
|
||||||
if test -d $$d/$$file; then \
|
if test -d $$d/$$file; then \
|
||||||
@ -307,6 +311,38 @@ distdir: $(DISTFILES)
|
|||||||
|| cp -p $$d/$$file $(distdir)/$$file || :; \
|
|| cp -p $$d/$$file $(distdir)/$$file || :; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
|
||||||
|
|
||||||
|
-include $(DEP_FILES)
|
||||||
|
|
||||||
|
mostlyclean-depend:
|
||||||
|
|
||||||
|
clean-depend:
|
||||||
|
|
||||||
|
distclean-depend:
|
||||||
|
-rm -rf .deps
|
||||||
|
|
||||||
|
maintainer-clean-depend:
|
||||||
|
|
||||||
|
%.o: %.c
|
||||||
|
@echo '$(COMPILE) -c $<'; \
|
||||||
|
$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||||
|
@-cp .deps/$(*F).pp .deps/$(*F).P; \
|
||||||
|
tr ' ' '\012' < .deps/$(*F).pp \
|
||||||
|
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||||
|
>> .deps/$(*F).P; \
|
||||||
|
rm .deps/$(*F).pp
|
||||||
|
|
||||||
|
%.lo: %.c
|
||||||
|
@echo '$(LTCOMPILE) -c $<'; \
|
||||||
|
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||||
|
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||||
|
< .deps/$(*F).pp > .deps/$(*F).P; \
|
||||||
|
tr ' ' '\012' < .deps/$(*F).pp \
|
||||||
|
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||||
|
>> .deps/$(*F).P; \
|
||||||
|
rm -f .deps/$(*F).pp
|
||||||
info-am:
|
info-am:
|
||||||
info: info-am
|
info: info-am
|
||||||
dvi-am:
|
dvi-am:
|
||||||
@ -345,26 +381,27 @@ distclean-generic:
|
|||||||
|
|
||||||
maintainer-clean-generic:
|
maintainer-clean-generic:
|
||||||
mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
|
mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
|
||||||
mostlyclean-compile mostlyclean-tags \
|
mostlyclean-compile mostlyclean-tags mostlyclean-depend \
|
||||||
mostlyclean-generic
|
mostlyclean-generic
|
||||||
|
|
||||||
mostlyclean: mostlyclean-am
|
mostlyclean: mostlyclean-am
|
||||||
|
|
||||||
clean-am: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
|
clean-am: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
|
||||||
clean-tags clean-generic mostlyclean-am
|
clean-tags clean-depend clean-generic mostlyclean-am
|
||||||
|
|
||||||
clean: clean-am
|
clean: clean-am
|
||||||
|
|
||||||
distclean-am: distclean-binPROGRAMS distclean-noinstPROGRAMS \
|
distclean-am: distclean-binPROGRAMS distclean-noinstPROGRAMS \
|
||||||
distclean-compile distclean-tags distclean-generic \
|
distclean-compile distclean-tags distclean-depend \
|
||||||
clean-am
|
distclean-generic clean-am
|
||||||
|
|
||||||
distclean: distclean-am
|
distclean: distclean-am
|
||||||
|
|
||||||
maintainer-clean-am: maintainer-clean-binPROGRAMS \
|
maintainer-clean-am: maintainer-clean-binPROGRAMS \
|
||||||
maintainer-clean-noinstPROGRAMS \
|
maintainer-clean-noinstPROGRAMS \
|
||||||
maintainer-clean-compile maintainer-clean-tags \
|
maintainer-clean-compile maintainer-clean-tags \
|
||||||
maintainer-clean-generic distclean-am
|
maintainer-clean-depend maintainer-clean-generic \
|
||||||
|
distclean-am
|
||||||
@echo "This command is intended for maintainers to use;"
|
@echo "This command is intended for maintainers to use;"
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
|
||||||
@ -378,11 +415,13 @@ mostlyclean-compile distclean-compile clean-compile \
|
|||||||
maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS \
|
maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS \
|
||||||
install-man1 uninstall-man1 install-man uninstall-man tags \
|
install-man1 uninstall-man1 install-man uninstall-man tags \
|
||||||
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
|
||||||
distdir info-am info dvi-am dvi check check-am installcheck-am \
|
distdir mostlyclean-depend distclean-depend clean-depend \
|
||||||
installcheck install-exec-am install-exec install-data-am install-data \
|
maintainer-clean-depend info-am info dvi-am dvi check check-am \
|
||||||
install-am install uninstall-am uninstall all-redirect all-am all \
|
installcheck-am installcheck install-exec-am install-exec \
|
||||||
installdirs mostlyclean-generic distclean-generic clean-generic \
|
install-data-am install-data install-am install uninstall-am uninstall \
|
||||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
all-redirect all-am all installdirs mostlyclean-generic \
|
||||||
|
distclean-generic clean-generic maintainer-clean-generic clean \
|
||||||
|
mostlyclean distclean maintainer-clean
|
||||||
|
|
||||||
support.o: version.h
|
support.o: version.h
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user