diff options
Diffstat (limited to 'Build/source/texk/ttfdump')
| -rw-r--r-- | Build/source/texk/ttfdump/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/ttfdump/Makefile.am | 10 | ||||
| -rw-r--r-- | Build/source/texk/ttfdump/Makefile.in | 5 | ||||
| -rw-r--r-- | Build/source/texk/ttfdump/Makefile.in.orig | 148 | ||||
| -rw-r--r-- | Build/source/texk/ttfdump/configure.in.orig | 31 | ||||
| -rw-r--r-- | Build/source/texk/ttfdump/libttf/Makefile.in | 103 | ||||
| -rw-r--r-- | Build/source/texk/ttfdump/src/Makefile.in | 115 |
7 files changed, 13 insertions, 403 deletions
diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog index 338bb5557a9..cbaedc2192b 100644 --- a/Build/source/texk/ttfdump/ChangeLog +++ b/Build/source/texk/ttfdump/ChangeLog @@ -1,3 +1,7 @@ +2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> Convert from autoconf-2.13 to autoconf-2.59+: diff --git a/Build/source/texk/ttfdump/Makefile.am b/Build/source/texk/ttfdump/Makefile.am index fe6b13949ca..8ce8e170e73 100644 --- a/Build/source/texk/ttfdump/Makefile.am +++ b/Build/source/texk/ttfdump/Makefile.am @@ -1,3 +1,7 @@ +## Makefile.am for the TeX Live subdirectory texk/afm2pl/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -10,6 +14,8 @@ EXTRA_DIST = docs include libttf src # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` + rm -f $(distdir)/libttf/Makefile.in + rm -f $(distdir)/src/Makefile.in INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) @@ -67,7 +73,3 @@ nodist_man1_MANS = docs/ttfdump.1 ## EXTRA_DIST += ILX NOTE README.bg5 -## Eventually delete these files -## -EXTRA_DIST += Makefile.in.orig configure.in.orig - diff --git a/Build/source/texk/ttfdump/Makefile.in b/Build/source/texk/ttfdump/Makefile.in index a9d33503ae5..3392b9a8e16 100644 --- a/Build/source/texk/ttfdump/Makefile.in +++ b/Build/source/texk/ttfdump/Makefile.in @@ -256,8 +256,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = docs include libttf src ILX NOTE README.bg5 \ - Makefile.in.orig configure.in.orig +EXTRA_DIST = docs include libttf src ILX NOTE README.bg5 INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) noinst_LIBRARIES = libttf.a nodist_libttf_a_SOURCES = \ @@ -1304,6 +1303,8 @@ uninstall-man: uninstall-man1 # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` + rm -f $(distdir)/libttf/Makefile.in + rm -f $(distdir)/src/Makefile.in @KPATHSEA_RULE@ diff --git a/Build/source/texk/ttfdump/Makefile.in.orig b/Build/source/texk/ttfdump/Makefile.in.orig deleted file mode 100644 index d01b644dd81..00000000000 --- a/Build/source/texk/ttfdump/Makefile.in.orig +++ /dev/null @@ -1,148 +0,0 @@ -# Makefile.in for Autoconf. -# @configure_input@ -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# @configure_input@ - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -VPATH = @srcdir@ - -# If you use gcc, you should either run the fixincludes script that -# comes with it or else use gcc with the -traditional option. Otherwise -# ioctl calls will be compiled incorrectly on some systems. -CC = @CC@ -AR = ar - -# set make command -@SET_MAKE@ - -# Set RANLIB = echo if your system doesn't have or need ranlib. -RANLIB = @RANLIB@ - -# Use cp if you don't have install. -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -DEFS = @DEFS@ -LIBS = @LIBS@ - -INCLUDES = -I@top_srcdir@/include -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ - -MAKEINFO = makeinfo -TEXI2DVI = texi2dvi - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -# Where to install the executables. -bindir = $(exec_prefix)/bin - -# Where to put the include header -includedir = $(prefix)/include - -# Where to put the Info files -infodir = $(prefix)/info - -# Where to put the library file -libdir = $(prefix)/lib - -# Where to put the manual pages. -mandir = $(prefix)/man - -#### End of system configuration section. #### - -SUBDIRS = libttf src - -# Set default target. -all: - -.PHONY: all install uninstall -all check install uninstall: config.h Makefile all-local - @for subdir in $(SUBDIRS); do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $(FLAGS_TO_PASS) $@ ) || exit 1; \ - done - -.PHONY: all-local -all-local: - -.PHONY: clean -clean: clean-local - @for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $@ || exit 1; cd ..; done - -.PHONY: distclean -distclean: distclean-local - @for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $@ || exit 1; cd ..; done - rm -f config.status - -.PHONY: realclean -realclean: realclean-local - @for dir in $(SUBDIRS); do echo making $@ in $$dir; cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $@ || exit 1; cd ..; done - rm -f config.status - -.PHONY: mostlyclean-local -mostlyclean-local: - rm -f *~ - -.PHONY: clean-local -clean-local: mostlyclean-local - -.PHONY: distclean-local -distclean-local: clean-local - rm -f Makefile config.cache config.h config.log stamp-h - rm -f tags TAGS - -.PHONY: realclean-local -realclean-local: distclean-local - -#distclean: clean -# rm -f Makefile config.log config.cache config.status config.h stamp-h *~ - -# For the justification of the following Makefile rules, see node -# `Automatic Remaking' in GNU Autoconf documentation. -Makefile: Makefile.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -config.status: configure - ./config.status --recheck -# The rules to run autoconf and autoheader are commented out. This is because -# when the user unpacks a tarfile, configure.in might end up newer than -# configure, but the user might not have (and does not need to have) autoconf -# installed. -#configure: configure.in #aclocal.m4 -# cd $(srcdir); autoconf - -config.h: stamp-h - -# This used to do a ./config.status --recheck, to update config.status with -# any new #defines from config.h.in. The problem was that the rule itself -# depends on config.status, so that the --recheck would get run several -# times, which is bad if the user was trying to specify CFLAGS manually. -# It was a big pain in the neck. -stamp-h: config.h.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS=config.h ./config.status - -#config.h.in: stamp-h.in -#stamp-h.in: configure.in #aclocal.m4 acconfig.h -# cd $(srcdir); autoheader -# date > $(srcdir)/stamp-h.in
\ No newline at end of file diff --git a/Build/source/texk/ttfdump/configure.in.orig b/Build/source/texk/ttfdump/configure.in.orig deleted file mode 100644 index 7b5ab86ac91..00000000000 --- a/Build/source/texk/ttfdump/configure.in.orig +++ /dev/null @@ -1,31 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT -AC_CONFIG_SRCDIR([include/ttf.h]) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_RANLIB -AC_PROG_MAKE_SET - -dnl Checks for libraries. - -dnl Checks for header files. -AC_HEADER_STDC - -dnl Checks for typedefs, structures, and compiler characteristics. - -AC_C_BIGENDIAN -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(long long) -AC_C_INLINE - -dnl Checks for library functions. -AC_CHECK_FUNCS(strstr) - - -AC_CONFIG_HEADER(config.h) -AC_CONFIG_FILES([libttf/Makefile src/Makefile Makefile]) -AC_CONFIG_COMMANDS([default],[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h],[]) -AC_OUTPUT diff --git a/Build/source/texk/ttfdump/libttf/Makefile.in b/Build/source/texk/ttfdump/libttf/Makefile.in deleted file mode 100644 index 178137425f9..00000000000 --- a/Build/source/texk/ttfdump/libttf/Makefile.in +++ /dev/null @@ -1,103 +0,0 @@ -# @configure_input@ -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -# @configure_input@ - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -VPATH = @srcdir@ - -# If you use gcc, you should either run the fixincludes script that -# comes with it or else use gcc with the -traditional option. Otherwise -# ioctl calls will be compiled incorrectly on some systems. -CC = @CC@ -AR = ar - -# set make command -@SET_MAKE@ - -# Set RANLIB = echo if your system doesn't have or need ranlib. -RANLIB = @RANLIB@ - -# Use cp if you don't have install. -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -DEFS = @DEFS@ -LIBS = @LIBS@ - -INCLUDES = -I@top_srcdir@ -I@top_srcdir@/include -CFLAGS = @CFLAGS@ $(INCLUDES) -LDFLAGS = @LDFLAGS@ - -MAKEINFO = makeinfo -TEXI2DVI = texi2dvi - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -# Where to install the executables. -bindir = $(exec_prefix)/bin - -# Where to put the include header -includedir = $(prefix)/include - -# Where to put the Info files -infodir = $(prefix)/info - -# Where to put the library file -libdir = $(prefix)/lib - -# Where to put the manual pages. -mandir = $(prefix)/man - -#### End of system configuration section. #### - -#CFLAGS = -g -pg -Wall -m486 -DMEMCHECK -DTESTCODE -DCOPYDELETE -I/usr/local/include -#CFLAGS = -O3 -Wall -m486 -DTESTCODE -DCOPYDELETE -I/usr/local/include -I../ -I../include -#LDFLAGS = -L/usr/local/lib -#LIBS = -ldmalloc -#LIBS = -lefence -#LIBS = -lc_p -OBJS = ttfread.o tabledir.o ttfutil.o font.o cmap.o glyf.o gcache.o \ - head.o hhea.o hmtx.o loca.o maxp.o name.o os2.o post.o \ - cvt.o fpgm.o gasp.o hdmx.o kern.o ltsh.o prep.o pclt.o vdmx.o vhea.o \ - vmtx.o gstate.o stack.o interp.o disasm.o ttc.o - -all: libttf.a - -libttf.a: ${OBJS} - $(AR) r $@ $? - ranlib $@ || $(AR) ts $@ || true - -clean: - rm -f *.a *.o *~ -.PHONY: clean - -distclean: clean - rm -f tags TAGS Makefile -.PHONY: distclean - -install: - @echo Nothing to install from this directory - -check: - @echo Nothing to check in this directory diff --git a/Build/source/texk/ttfdump/src/Makefile.in b/Build/source/texk/ttfdump/src/Makefile.in deleted file mode 100644 index b53d3c605a0..00000000000 --- a/Build/source/texk/ttfdump/src/Makefile.in +++ /dev/null @@ -1,115 +0,0 @@ -# @configure_input@ -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -# @configure_input@ - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = @srcdir@ -VPATH = @srcdir@ - -# If you use gcc, you should either run the fixincludes script that -# comes with it or else use gcc with the -traditional option. Otherwise -# ioctl calls will be compiled incorrectly on some systems. -CC = @CC@ -AR = ar - -# set make command -@SET_MAKE@ - -# Set RANLIB = echo if your system doesn't have or need ranlib. -RANLIB = @RANLIB@ - -# Use cp if you don't have install. -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -DEFS = @DEFS@ -LIBS = @LIBS@ - -INCLUDES = -I@top_srcdir@ -I@top_srcdir@/include -CFLAGS = @CFLAGS@ $(INCLUDES) $(DEFS) -LDFLAGS = @LDFLAGS@ - -MAKEINFO = makeinfo -TEXI2DVI = texi2dvi - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -# Where to install the executables. -bindir = $(exec_prefix)/bin - -# Where to put the include header -includedir = $(prefix)/include - -# Where to put the Info files -infodir = $(prefix)/info - -# Where to put the library file -libdir = $(prefix)/lib - -# Where to put the manual pages. -mandir = $(prefix)/man - -#### End of system configuration section. #### -#CC = gcc -#CFLAGS = -g -pg -Wall -m486 -DMEMCHECK -DTESTCODE -DCOPYDELETE -I/usr/local/include -#CFLAGS = -O3 -Wall -m486 -DTESTCODE -DCOPYDELETE -I../ -I../include -I/usr/local/include -#LDFLAGS = -L/usr/local/lib -#LIBS = -ldmalloc -#LIBS = -lefence -#LIBS = -lc_p -OBJS = ttfdump.o - -all: ttfdump - -ttfdump:${OBJS} ../libttf/libttf.a - ${CC} ${CFLAGS} -o $@ ${OBJS} ../libttf/libttf.a ${LIBS} - -test:ttfdump - -./ttfdump times.ttf times.txt - @echo There should be no differences found: - diff times.txt times.ok - -depend: - co RCS/* - makedepend *.c *.h - rcsclean -clean: - rm -f *.o *~ core gmon.out times.txt ttfdump logfile -.PHONY: clean - -distclean: clean - rm -f tags TAGS Makefile - -.PHONY: distclean - -check: test - -install: ttfdump - $(INSTALL_PROGRAM) ttfdump $(bindir)/ttfdump - strip $(bindir)/ttfdump || true - chmod 775 $(bindir)/ttfdump - $(INSTALL_DATA) ../docs/ttfdump.1 $(mandir)/man1/ttfdump.1 - chmod 664 $(mandir)/man1/ttfdump.1 - @-rm -f $(mandir)/cat1/ttfdump.1 - @echo Installed files... - ls -l $(bindir)/ttfdump $(mandir)/man1/ttfdump.1 |