summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source')
-rwxr-xr-xBuild/source/configure20
-rw-r--r--Build/source/configure.ac2
-rwxr-xr-xBuild/source/texk/dvipdfmx/configure3
-rw-r--r--Build/source/texk/dvipdfmx/configure.ac3
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.am1
-rw-r--r--Build/source/texk/web2c/Makefile.in49
-rw-r--r--Build/source/texk/web2c/doc/Makefile.am6
-rw-r--r--Build/source/texk/web2c/luatexdir/Makefile.in148
-rw-r--r--Build/source/texk/web2c/luatexdir/am/libluatex.am6
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am5
-rw-r--r--Build/source/texk/web2c/luatexdir/luatexlib.mk167
-rw-r--r--Build/source/texk/web2c/pdftexdir/Makefile.in.orig70
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am4
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftexlib.mk24
-rw-r--r--Build/source/texk/web2c/synctexdir/am/synctex.am4
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex.mk232
-rw-r--r--Build/source/texk/web2c/xetexdir/acx_pthread.m4280
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am14
-rw-r--r--Build/source/texk/web2c/xetexdir/tests.ac83
-rw-r--r--Build/source/texk/web2c/xetexdir/withenable.ac3
-rwxr-xr-xBuild/source/texk/xdvipdfmx/configure3
-rw-r--r--Build/source/texk/xdvipdfmx/configure.ac3
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.am4
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.am.orig45
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.in2
25 files changed, 47 insertions, 1134 deletions
diff --git a/Build/source/configure b/Build/source/configure
index bd14af70292..ebb24e5cebe 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for TeX Live 2009-05-07.
+# Generated by GNU Autoconf 2.63 for TeX Live 2009-05-29.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='TeX Live'
PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2009-05-07'
-PACKAGE_STRING='TeX Live 2009-05-07'
+PACKAGE_VERSION='2009-05-29'
+PACKAGE_STRING='TeX Live 2009-05-29'
PACKAGE_BUGREPORT='tex-k@tug.org'
ac_unique_file="m4/kpse-pkgs.m4"
@@ -1614,7 +1614,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live 2009-05-07 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2009-05-29 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1688,7 +1688,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live 2009-05-07:";;
+ short | recursive ) echo "Configuration of TeX Live 2009-05-29:";;
esac
cat <<\_ACEOF
@@ -1941,7 +1941,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live configure 2009-05-07
+TeX Live configure 2009-05-29
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1955,7 +1955,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live $as_me 2009-05-07, which was
+It was created by TeX Live $as_me 2009-05-29, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -8757,7 +8757,7 @@ fi
# Define the identity of the package.
PACKAGE='tex-live'
- VERSION='2009-05-07'
+ VERSION='2009-05-29'
cat >>confdefs.h <<_ACEOF
@@ -23819,7 +23819,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live $as_me 2009-05-07, which was
+This file was extended by TeX Live $as_me 2009-05-29, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23873,7 +23873,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-TeX Live config.status 2009-05-07
+TeX Live config.status 2009-05-29
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index 6f72b9ef507..15e32ac9697 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([TeX Live], [2009-05-07], [tex-k@tug.org])
+AC_INIT([TeX Live], [2009-05-29], [tex-k@tug.org])
AC_PREREQ([2.63])
AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4])
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index e167cdcc461..cfecb58104b 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -12910,9 +12910,6 @@ fi
ac_config_headers="$ac_config_headers config.h"
-# TEXMF='${datadir}/texmf'
-# AC_SUBST(TEXMF)
-
{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
diff --git a/Build/source/texk/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac
index 7085650e6f7..113583e2d51 100644
--- a/Build/source/texk/dvipdfmx/configure.ac
+++ b/Build/source/texk/dvipdfmx/configure.ac
@@ -17,9 +17,6 @@ KPSE_COMMON([dvipdfmx])
AC_CONFIG_HEADERS([config.h])
-# TEXMF='${datadir}/texmf'
-# AC_SUBST(TEXMF)
-
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdint.h inttypes.h sys/types.h])
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index 3a64a4c1f75..8034e462ddd 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -96,6 +96,5 @@ EXTRA_DIST += ac/withenable.ac
## Eventually delete these files
##
-
EXTRA_DIST += Makefile.am.orig configure.ac.orig
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index dfea0154e2a..ed4641131fe 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1085,25 +1085,25 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
$(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \
pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \
pdftexdir/README pdftexdir/change-files.txt \
- pdftexdir/pdftex.mak pdftexdir/Makefile.in.orig \
- pdftexdir/pdftex.mk pdftexdir/pdftexlib.mk \
+ pdftexdir/pdftex.mak pdftexdir/pdftex.mk \
pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
$(luatex_sources) luatexdir/luatex.defines \
luatexdir/luatexextra.in luatexdir/ptexlib.h \
- $(luatangle_sources) luatexdir/luatangle.test \
- luatexdir/lua51/Makefile luatexdir/lua51/liolib.c \
- luatexdir/lua51/lua.c luatexdir/lua51/luac.c \
- luatexdir/lua51/print.c luatexdir/zziplib/COPYING.LIB \
- luatexdir/zziplib/ChangeLog luatexdir/zziplib/README \
- luatexdir/zziplib/TODO luatexdir/zziplib/zziplib.spec \
- luatexdir/zziplib/Makefile.am luatexdir/zziplib/Makefile.in \
- luatexdir/zziplib/Makefile.mk luatexdir/zziplib/SDL \
- luatexdir/zziplib/aclocal.m4 luatexdir/zziplib/bins \
- luatexdir/zziplib/config.h.in luatexdir/zziplib/configure \
- luatexdir/zziplib/configure.ac luatexdir/zziplib/docs \
- luatexdir/zziplib/m4 luatexdir/zziplib/msvc6 \
- luatexdir/zziplib/msvc7 luatexdir/zziplib/msvc8 \
- luatexdir/zziplib/test luatexdir/zziplib/zzip/Makefile \
+ luatexdir/luatex.mk $(luatangle_sources) \
+ luatexdir/luatangle.test luatexdir/lua51/Makefile \
+ luatexdir/lua51/liolib.c luatexdir/lua51/lua.c \
+ luatexdir/lua51/luac.c luatexdir/lua51/print.c \
+ luatexdir/zziplib/COPYING.LIB luatexdir/zziplib/ChangeLog \
+ luatexdir/zziplib/README luatexdir/zziplib/TODO \
+ luatexdir/zziplib/zziplib.spec luatexdir/zziplib/Makefile.am \
+ luatexdir/zziplib/Makefile.in luatexdir/zziplib/Makefile.mk \
+ luatexdir/zziplib/SDL luatexdir/zziplib/aclocal.m4 \
+ luatexdir/zziplib/bins luatexdir/zziplib/config.h.in \
+ luatexdir/zziplib/configure luatexdir/zziplib/configure.ac \
+ luatexdir/zziplib/docs luatexdir/zziplib/m4 \
+ luatexdir/zziplib/msvc6 luatexdir/zziplib/msvc7 \
+ luatexdir/zziplib/msvc8 luatexdir/zziplib/test \
+ luatexdir/zziplib/zzip/Makefile \
luatexdir/zziplib/zzip/Makefile.am \
luatexdir/zziplib/zzip/Makefile.in \
luatexdir/zziplib/zzip/_msvc.h \
@@ -1207,14 +1207,11 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
luatexdir/luafontloader/fontforge/plugins/Makefile.in \
luatexdir/ChangeLog luatexdir/NEWS luatexdir/README \
luatexdir/change-files.txt luatexdir/font/subfont.txt \
- luatexdir/Makefile.in luatexdir/luatex.mk \
- luatexdir/luatexlib.mk $(xetex_web_srcs) \
- xetexdir/xetex.defines xetexdir/xetexextra.in \
- xetexdir/pool2c.pl xetexdir/unicode-char-prep.pl \
- xetexdir/appleGlyphNames.c xetexdir/XeTeXFontMgr_Mac.mm \
- xetexdir/ChangeLog xetexdir/LICENSE.txt \
- xetexdir/acx_pthread.m4 xetexdir/tests.ac \
- xetexdir/withenable.ac xetexdir/xetex.mk omegaware/ChangeLog \
+ $(xetex_web_srcs) xetexdir/xetex.defines \
+ xetexdir/xetexextra.in xetexdir/pool2c.pl \
+ xetexdir/unicode-char-prep.pl xetexdir/appleGlyphNames.c \
+ xetexdir/XeTeXFontMgr_Mac.mm xetexdir/ChangeLog \
+ xetexdir/LICENSE.txt xetexdir/xetex.mk omegaware/ChangeLog \
$(odvicopy_sources) $(odvitype_sources) $(ofm2opl_sources) \
$(opl2ofm_sources) $(otangle_sources) $(ovf2ovp_sources) \
$(ovp2ovf_sources) omegaware/otangle.test $(aleph_web_srcs) \
@@ -1234,8 +1231,8 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
synctexdir/synctex-e-rec.ch0 synctexdir/synctex-e-rec.ch1 \
synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \
synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
- synctexdir/synctex.mk libmd5/md5.test fmtutil.in \
- Makefile.in.orig configure.in.orig metapost.mk
+ libmd5/md5.test fmtutil.in Makefile.in.orig configure.in.orig \
+ metapost.mk
DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
tangle-web2c stamp-tangle tangleboot.c tangleboot.h ctangle.c \
cweb.c stamp-ctangle cftest.p $(web_programs:=.c) \
diff --git a/Build/source/texk/web2c/doc/Makefile.am b/Build/source/texk/web2c/doc/Makefile.am
index 949ad7c2aa6..b89836d3fa0 100644
--- a/Build/source/texk/web2c/doc/Makefile.am
+++ b/Build/source/texk/web2c/doc/Makefile.am
@@ -6,13 +6,11 @@
info_TEXINFOS = web2c.texi
web2c_TEXINFOS = install.texi ref.txi
-## ######
## Not yet used
-
+##
EXTRA_DIST = ref.tex texinfo.bst
-## ######
## Eventually delete these files
-
+##
EXTRA_DIST += Makefile.in.orig
diff --git a/Build/source/texk/web2c/luatexdir/Makefile.in b/Build/source/texk/web2c/luatexdir/Makefile.in
deleted file mode 100644
index 9d888766d18..00000000000
--- a/Build/source/texk/web2c/luatexdir/Makefile.in
+++ /dev/null
@@ -1,148 +0,0 @@
-# Makefile for luatex.
-# Public domain.
-# $Id$
-
-kpse_include ../make/common.mk
-kpse_include ../make/programs.mk
-kpse_include ../make/library.mk
-
-kpathsea_srcdir_parent = $(srcdir)/../..
-kpathsea_dir_parent = ../..
-
-ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \
- -I. -I$(srcdir) \
- -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \
- @LIBXPDFCPPFLAGS@ \
- -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \
- -I$(LIBOBSDCOMPATFSRCDIR) -I$(LIBOBSDCOMPATFSRCDIR)/.. \
- -I$(LIBPNGSRCDIR) -I$(ZLIBSRCDIR) \
- -DPDF_PARSER_ONLY -DDISABLE_OUTLINE -I../../../../src/libs/obsdcompat
-CXX = @CXX@
-
-CTANGLE = ../ctangle
-
-.SUFFIXES: .cc .o
-.cc.o:
- $(CXX) $(ALL_CXXFLAGS) -c $< -o $@
-
-# XCFLAGS=-Wstrict-prototypes -Wmissing-prototypes
-
-LIBPNGDIR=../../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-
-ZLIBDIR=../../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-
-LIBXPDFDIR=../../../libs/xpdf
-LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
-
-LIBMD5DIR=../../../libs/md5
-LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR)
-
-LIBOBSDCOMPATDIR=../../../libs/obsdcompat
-LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
-
-XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \
- -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \
- -I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \
- -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \
- -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX
-
-
-OBJS = \
-font/mapfile.o \
-font/pkin.o \
-font/subfont.o \
-font/tounicode.o \
-font/vfpacket.o \
-font/writeenc.o \
-font/writefont.o \
-font/writet1.o \
-font/writet3.o \
-font/writettf.o \
-font/writetype0.o \
-font/writetype2.o \
-font/writecff.o \
-font/tt_glyf.o \
-font/tt_table.o \
-font/sfnt.o \
-font/texfont.o \
-font/tfmofm.o \
-font/vfovf.o \
-font/luafont.o \
-font/dofont.o \
-image/epdf.o \
-image/pdftoepdf.o \
-image/writeimg.o \
-image/writejbig2.o \
-image/writejpg.o \
-image/writepng.o \
-lua/loslibext.o \
-lua/lcallbacklib.o \
-lua/lkpselib.o \
-lua/llualib.o \
-lua/lnodelib.o \
-lua/lpdflib.o \
-lua/lstatslib.o \
-lua/ltexiolib.o \
-lua/ltexlib.o \
-lua/ltokenlib.o \
-lua/lfontlib.o \
-lua/texluac.o \
-lua/luainit.o \
-lua/luastuff.o \
-lua/luatex.o \
-lua/luatoken.o \
-lua/luanode.o \
-lua/llanglib.o \
-lua/limglib.o \
-lang/hnjalloc.o \
-lang/hyphen.o \
-lang/texlang.o \
-pdf/pdfpage.o \
-pdf/pagetree.o \
-tex/linebreak.o \
-tex/postlinebreak.o \
-tex/texnodes.o \
-tex/textoken.o \
-tex/texpdf.o \
-tex/math.o \
-tex/mlist.o \
-tex/primitive.o \
-tex/texdeffont.o \
-tex/filename.o \
-managed-sa.o \
-mathcodes.o \
-textcodes.o \
-utils/avl.o \
-utils/avlstuff.o \
-utils/utils.o \
-utils/writezip.o \
-utils/synctex.o
-
-all: libpdf.a makecpool
-
-libpdf.a: $(OBJS)
- rm -f $@
- $(AR) $(ARFLAGS) $@ $(OBJS)
- $(RANLIB) $@
-
-makecpool: makecpool.o
- $(link_command) makecpool.o
-
-kpse_include ../make/clean.mk
-
-clean::
- rm -f libpdf.a
-
-depend:
- rm -f $(OBJS) $(srcdir)/depend.mk
- for a in $(OBJS); do \
- env XXCFLAGS="-MM -MT \$$@" XCFLAGS="-MM -MT \$$@" $(MAKE) -k $$a; \
- touch $$a; \
- grep -a -v "^$(CC)\|$(CXX)\|$(AR)\|make" $$a | \
- sed 's: [^ ]*/\.\./libs/[^ ]*::g' >> $(srcdir)/depend.mk; \
- done; \
- rm -f $(OBJS)
-
-kpse_include luatexdir/depend.mk
diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am
index 88c03eb7589..3de565a776d 100644
--- a/Build/source/texk/web2c/luatexdir/am/libluatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am
@@ -135,9 +135,3 @@ EXTRA_DIST += \
luatexdir/change-files.txt \
luatexdir/font/subfont.txt
-## Eventually delete these files
-##
-EXTRA_DIST += \
- luatexdir/Makefile.in \
- luatexdir/luatex.mk \
- luatexdir/luatexlib.mk
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 1ef3dfd581d..8a82cafea92 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -75,3 +75,8 @@ EXTRA_DIST += $(luatex_sources) \
DISTCLEANFILES += $(nodist_luatex_SOURCES) luatex-web2c \
luatex.p luatex.pool luatex-tangle luatexdir/luatex.version
+
+## Eventually delete these files
+##
+EXTRA_DIST += luatexdir/luatex.mk
+
diff --git a/Build/source/texk/web2c/luatexdir/luatexlib.mk b/Build/source/texk/web2c/luatexdir/luatexlib.mk
deleted file mode 100644
index 55e9ce8dd2a..00000000000
--- a/Build/source/texk/web2c/luatexdir/luatexlib.mk
+++ /dev/null
@@ -1,167 +0,0 @@
-## luatexlib.mk - Makefile fragment for libraries used by luatex.
-# $Id$
-# Public domain.
-
-# luatex depends on a number of libraries.
-# Include dependencies to get them built if we don't do make
-# from the top-level directory.
-
-Makefile: luatexdir/luatexlib.mk
-
-# libpdf itself
-luapdflib = luatexdir/libpdf.a
-luapdflib_sources = $(srcdir)/luatexdir/*.c $(srcdir)/luatexdir/*.h \
- $(srcdir)/luatexdir/*/*.c $(srcdir)/luatexdir/*/*.h \
- $(srcdir)/luatexdir/*/*.cc
-
-$(luapdflib): $(luapdflib_sources) luatexdir/luatexextra.h ctangle
- cd luatexdir && mkdir -p font image lua lang pdf tex utils && $(MAKE) $(common_makeargs) libpdf.a
-
-# lua
-
-LIBLUADIR=../../libs/lua51
-LIBLUASRCDIR=$(srcdir)/$(LIBLUADIR)
-LIBLUADEP=$(LIBLUADIR)/liblua.a
-
-luatarget=posix
-ifeq ($(target),i386-mingw32)
- ifeq ($(host),i386-linux)
- luatarget = mingwcross
- else
- luatarget = mingw
- endif
-else
-endif
-
-
-$(LIBLUADEP):
- mkdir -p $(LIBLUADIR) && cd $(LIBLUADIR) && cp -f $(LIBLUASRCDIR)/* . && $(MAKE) $(luatarget)
-
-# slnunicode
-SLNUNICODEDIR=../../libs/slnunicode
-SLNUNICODESRCDIR=$(srcdir)/$(SLNUNICODEDIR)
-SLNUNICODEDEP=$(SLNUNICODEDIR)/slnunico.o
-$(SLNUNICODEDEP): $(SLNUNICODEDIR)/slnunico.c $(SLNUNICODEDIR)/slnudata.c
- mkdir -p $(SLNUNICODEDIR) && cd $(SLNUNICODEDIR) && cp -f $(SLNUNICODESRCDIR)/* . && $(CC) $(CFLAGS) -I$(LIBLUADIR) -o slnunico.o -c slnunico.c
-
-# zziplib
-
-# zziplib is a configuration nightmare, because it is so stubborn
-# about using a pre-installed zlib. configure and make have to
-# be fooled in two different ways.
-# - configure needs to find
-# the subdirs 'include' and 'lib' in the --with-zlib prefix,
-# and these need to contain the proper headers and libraries.
-# - make needs to find the right headers using an -I via CPPFLAGS,
-# because the zlib path is relative and can't be found otherwise.
-#
-# final trickyness: configure writes a Makefile in the source
-# directory. it is needed by anything, so I delete it right away
-
-zzipretarget=
-
-ifeq ($(target),i386-mingw32)
- zzipretarget=--target=$(target) --build=$(target) --host=$(host)
-endif
-
-
-ZZIPLIBDIR=../../libs/zziplib
-ZZIPLIBSRCDIR=$(srcdir)/$(ZZIPLIBDIR)
-ZZIPLIBDEP = $(ZZIPLIBDIR)/zzip/libzzip.a
-
-$(ZZIPLIBDEP): $(ZZIPLIBSRCDIR)
- mkdir -p $(ZZIPLIBDIR)/zzip && cd $(ZZIPLIBDIR)/zzip && \
- cp ../$(ZZIPLIBSRCDIR)/zzip/Makefile . && $(MAKE) $(common_makeargs)
-
-# luazip
-
-LUAZIPDIR=../../libs/luazip
-LUAZIPSRCDIR=$(srcdir)/$(LUAZIPDIR)
-LUAZIPDEP=$(LUAZIPDIR)/src/luazip.o
-LUAZIPINC=-I../../lua51 -I../$(ZZIPLIBSRCDIR) -I../$(ZZIPLIBDIR)
-
-$(LUAZIPDEP): $(LUAZIPDIR)/src/luazip.c
- mkdir -p $(LUAZIPDIR) && cd $(LUAZIPDIR) && cp -R $(LUAZIPSRCDIR)/* . && \
- cd src && $(CC) $(CFLAGS) $(LUAZIPINC) -g -o luazip.o -c luazip.c
-
-# luafilesystem
-
-LUAFSDIR=../../libs/luafilesystem
-LUAFSSRCDIR=$(srcdir)/$(LUAFSDIR)
-LUAFSDEP=$(LUAFSDIR)/src/lfs.o
-LUAFSINC=-I../../lua51
-
-$(LUAFSDEP): $(LUAFSDIR)/src/lfs.c $(LUAFSDIR)/src/lfs.h
- mkdir -p $(LUAFSDIR) && cd $(LUAFSDIR) && cp -R $(LUAFSSRCDIR)/* . && \
- cd src && $(CC) $(CFLAGS) $(LUAFSINC) -g -o lfs.o -c lfs.c
-
-
-# luasocket
-
-LUASOCKETDIR=../../libs/luasocket
-LUASOCKETSRCDIR=$(srcdir)/$(LUASOCKETDIR)
-LUASOCKETDEP=$(LUASOCKETDIR)/src/socket.a
-LUASOCKETINC=-I../../lua51
-
-$(LUASOCKETDEP): $(LUASOCKETDIR)/src/luasocket.c $(LUASOCKETDIR)/src/luasocket.h
- mkdir -p $(LUASOCKETDIR) && cd $(LUASOCKETDIR) && cp -R $(LUASOCKETSRCDIR)/* . && \
- cd src && make
-
-
-# luapeg
-LUAPEGDIR=../../libs/luapeg
-LUAPEGSRCDIR=$(srcdir)/$(LUAPEGDIR)
-LUAPEGDEP=$(LUAPEGDIR)/lpeg.o
-$(LUAPEGDEP): $(LUAPEGDIR)/lpeg.c
- mkdir -p $(LUAPEGDIR) && cd $(LUAPEGDIR) && cp -f $(LUAPEGSRCDIR)/* . && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o lpeg.o -c lpeg.c
-
-
-# luamd5
-LUAMDVDIR=../../libs/luamd5
-LUAMDVSRCDIR=$(srcdir)/$(LUAMDVDIR)
-LUAMDVDEP=$(LUAMDVDIR)/md5lib.o $(LUAMDVDIR)/md5.o
-$(LUAMDVDEP): $(LUAMDVDIR)/md5lib.c $(LUAMDVDIR)/md5.h $(LUAMDVDIR)/md5.c
- mkdir -p $(LUAMDVDIR) && cd $(LUAMDVDIR) && cp -f $(LUAMDVSRCDIR)/* . && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o md5.o -c md5.c && $(CC) $(CFLAGS) -I$(LIBLUADIR) -g -o md5lib.o -c md5lib.c
-
-.PHONY: always
-
-# luaff
-LUAFFDIR=../../libs/luafontforge
-LUAFFSRCDIR=$(srcdir)/$(LUAFFDIR)
-LUAFFDEP=$(LUAFFDIR)/libff.a
-$(LUAFFDEP): always
- mkdir -p $(LUAFFDIR) && cd $(LUAFFDIR) && cp -f $(LUAFFSRCDIR)/Makefile . && $(MAKE)
-
-# luaprof
-LUAPROFDIR=../../libs/luaprofiler
-LUAPROFSRCDIR=$(srcdir)/$(LUAPROFDIR)
-LUAPROFDEP=$(LUAPROFDIR)/libprofiler.a
-$(LUAPROFDEP): always
- mkdir -p $(LUAPROFDIR) && cd $(LUAPROFDIR) && cp -f $(LUAPROFSRCDIR)/Makefile . && $(MAKE)
-
-
-# luazlib
-LUAZLIBDIR=../../libs/luazlib
-LUAZLIBSRCDIR=$(srcdir)/$(LUAZLIBDIR)
-LUAZLIBDEP=$(LUAZLIBDIR)/lgzip.o $(LUAZLIBDIR)/lzlib.o
-LUAZLIBINC=-I$(ZLIBSRCDIR) -I$(LIBLUASRCDIR)
-$(LUAZLIBDEP): $(LUAZLIBDIR)/lgzip.c $(LUAZLIBDIR)/lzlib.c
- mkdir -p $(LUAZLIBDIR) && cd $(LUAZLIBDIR) && cp -f $(LUAZLIBSRCDIR)/* . && $(CC) $(CFLAGS) $(LUAZLIBINC) -g -o lgzip.o -c lgzip.c && $(CC) $(CFLAGS) $(LUAZLIBINC) -g -o lzlib.o -c lzlib.c
-
-# mplib (temporary)
-
-LIBMPDIR=mpdir
-LIBMPLIBDEP=$(LIBMPDIR)/lmplib.o $(LIBMPDIR)/.libs/libmplib.a
-
-# Convenience variables.
-
-luatexlibs = $(luapdflib) $(LDLIBPNG) $(LDZLIB) $(LDLIBXPDF) $(LIBMD5DEP) $(LDLIBOBSD) \
- $(LIBLUADEP) $(SLNUNICODEDEP) $(LUAZIPDEP) $(ZZIPLIBDEP) $(LUAFSDEP) $(LUASOCKETDEP) \
- $(LUAPEGDEP) $(LUAMDVDEP) $(LUAZLIBDEP) $(LUAFFDEP) $(LUAPROFDEP) $(LIBMPLIBDEP)
-
-luatexlibsdep = $(luapdflib) $(LIBPNGDEP) $(ZLIBDEP) $(LIBXPDFDEP) $(LIBMD5DEP) $(LIBOBSDDEP) \
- $(LIBLUADEP) $(SLNUNICODEDEP) $(ZZIPLIBDEP) $(LUAZIPDEP) $(LUAFSDEP) $(LUASOCKETDEP) \
- $(LUAPEGDEP) $(LUAMDVDEP) $(LUAZLIBDEP) $(LUAFFDEP) $(LUAPROFDEP) $(makecpool)
-
-## end of luatexlib.mk - Makefile fragment for libraries used by pdf[ex]tex.
-
diff --git a/Build/source/texk/web2c/pdftexdir/Makefile.in.orig b/Build/source/texk/web2c/pdftexdir/Makefile.in.orig
deleted file mode 100644
index 0efe544a444..00000000000
--- a/Build/source/texk/web2c/pdftexdir/Makefile.in.orig
+++ /dev/null
@@ -1,70 +0,0 @@
-# Makefile for libpdf - te@dbs.uni-hannover.de
-
-kpse_include ../make/common.mk
-kpse_include ../make/programs.mk
-kpse_include ../make/library.mk
-
-kpathsea_srcdir_parent = $(srcdir)/../..
-kpathsea_dir_parent = ../..
-
-ALL_CXXFLAGS = @CXXFLAGS@ @DEFS@ $(XXCFLAGS) \
- -I. -I$(srcdir) \
- -I$(kpathsea_dir_parent) -I$(kpathsea_srcdir_parent) \
- @LIBXPDFCPPFLAGS@ \
- -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. \
- -I$(LIBOBSDCOMPATSRCDIR) -I$(LIBOBSDCOMPATSRCDIR)/.. \
- -DPDF_PARSER_ONLY
-CXX = @CXX@
-
-.SUFFIXES: .cc .o
-.cc.o:
- $(CXX) $(ALL_CXXFLAGS) -c $<
-
-# XCFLAGS=-Wstrict-prototypes -Wmissing-prototypes
-
-LIBPNGDIR=../../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-
-ZLIBDIR=../../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-
-LIBXPDFDIR=../../../libs/xpdf
-LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
-
-LIBMD5DIR=../../../libs/md5
-LIBMD5SRCDIR=$(srcdir)/$(LIBMD5DIR)
-
-LIBOBSDCOMPATDIR=../../../libs/obsdcompat
-LIBOBSDCOMPATSRCDIR=$(srcdir)/$(LIBOBSDCOMPATDIR)
-
-XCPPFLAGS=-I.. -I$(srcdir)/.. -I../.. -I$(srcdir)/../.. -I$(LIBMD5DIR) \
- -I$(LIBMD5SRCDIR) @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ \
- -I$(LIBXPDFDIR) -I$(LIBXPDFDIR)/.. -I$(LIBXPDFSRCDIR) -I$(LIBXPDFSRCDIR)/.. \
- -I$(LIBOBSDCOMPATDIR) -I$(LIBOBSDCOMPATDIR)/.. -I$(LIBOBSDCOMPATSRCDIR) \
- -I$(LIBOBSDCOMPATSRCDIR)/.. -DpdfTeX
-
-OBJS = epdf.o mapfile.o utils.o vfpacket.o pkin.o \
-writefont.o writet1.o writet3.o writezip.o writeenc.o writettf.o \
-writejpg.o writejbig2.o writepng.o writeimg.o pdftoepdf.o avl.o avlstuff.o subfont.o tounicode.o
-
-all: libpdf.a
-
-pdftosrc.o: $(srcdir)/pdftosrc.cc
-
-libpdf.a: $(OBJS)
- rm -f $@
- $(AR) $(ARFLAGS) $@ $(OBJS)
- $(RANLIB) $@
-
-kpse_include ../make/clean.mk
-
-clean::
- rm -f libpdf.a ttf2afm pdftosrc
-
-depend:
- rm -f $(OBJS) ttf2afm.o pdftosrc.o
- XXCFLAGS=-MM XCFLAGS=-MM $(MAKE) -k $(OBJS) ttf2afm.o pdftosrc.o | \
- grep -v "^$(CC)\|$(CXX)\|$(AR)\|make\" | \
- sed 's: [^ ]*/\.\./libs/[^ ]*::g' > $(srcdir)/depend.mk
-
-kpse_include pdftexdir/depend.mk
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 8903a3abbb2..079ffcf1a7e 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -88,7 +88,5 @@ EXTRA_DIST += pdftexdir/pdftex.mak
## Eventually delete these files
##
EXTRA_DIST += \
- pdftexdir/Makefile.in.orig \
- pdftexdir/pdftex.mk \
- pdftexdir/pdftexlib.mk
+ pdftexdir/pdftex.mk
diff --git a/Build/source/texk/web2c/pdftexdir/pdftexlib.mk b/Build/source/texk/web2c/pdftexdir/pdftexlib.mk
deleted file mode 100644
index bd23bfdc563..00000000000
--- a/Build/source/texk/web2c/pdftexdir/pdftexlib.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-## pdftexlib.mk - Makefile fragment for libraries used by pdf[ex]tex.
-# Public domain.
-
-# The pdf*tex programs depend on a number of libraries.
-# Include dependencies to get the built if we don't do make
-# from the top-level directory.
-
-Makefile: pdftexdir/pdftexlib.mk
-
-# libpdf itself
-pdflib = pdftexdir/libpdf.a
-pdflib_sources = $(srcdir)/pdftexdir/*.c $(srcdir)/pdftexdir/*.cc \
- $(srcdir)/pdftexdir/*.h
-
-pdftexdir/libpdf.a: $(pdflib_sources) pdftexdir/pdftexextra.h
- cd pdftexdir && $(MAKE) $(common_makeargs) libpdf.a
-
-
-# Convenience variables.
-
-pdftexlibs = $(pdflib) $(LDLIBPNG) $(LDZLIB) $(LDLIBXPDF) $(LIBMD5DEP) $(LDLIBOBSD)
-pdftexlibsdep = $(pdflib) $(LIBPNGDEP) $(ZLIBDEP) $(LIBXPDFDEP) $(LIBMD5DEP) $(LIBOBSDDEP)
-
-## end of pdftexlib.mk - Makefile fragment for libraries used by pdf[ex]tex.
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index 3fc507b4567..4b0bad7f993 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -203,7 +203,3 @@ EXTRA_DIST += \
synctexdir/synctex-xe-rec.ch2 \
synctexdir/synctex-xe-rec.ch3
-## Eventually delete these files
-##
-EXTRA_DIST += synctexdir/synctex.mk
-
diff --git a/Build/source/texk/web2c/synctexdir/synctex.mk b/Build/source/texk/web2c/synctexdir/synctex.mk
deleted file mode 100644
index 53c22a97062..00000000000
--- a/Build/source/texk/web2c/synctexdir/synctex.mk
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright (c) 2008 jerome DOT laurens AT u-bourgogne DOT fr
-#
-# This file is part of the SyncTeX package.
-#
-# License:
-# --------
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE
-#
-# Except as contained in this notice, the name of the copyright holder
-# shall not be used in advertising or otherwise to promote the sale,
-# use or other dealings in this Software without prior written
-# authorization from the copyright holder.
-#
-# Acknowledgments:
-# ----------------
-# The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh,
-# and significant help from XeTeX developer Jonathan Kew
-#
-# Nota Bene:
-# ----------
-# If you include or use a significant part of the synctex package into a software,
-# I would appreciate to be listed as contributor and see "SyncTeX" highlighted.
-#
-# Version 1
-# Thu Jun 19 09:39:21 UTC 2008
-#
-# Notice:
-# -------
-# Makefile fragment for synctex.
-# It is included in web2c/Makefile.in
-
-synctex_dir = $(srcdir)/synctexdir
-
-Makefile: $(synctex_dir)/synctex.mk
-
-# for all the engines, this trick allows to enable or disable SyncTeX support from here.
-# One of the synctex functions is called before the main_control routine
-# this is why we must include synctex-common.h header
-synctex_common_texd = \
- echo "Enabling SyncTeX Support.";\
- echo "s|\#include \"texmfmp.h\"|&\\"> synctex_sed_command.txt;\
- echo "/* Start of SyncTeX Section */\\" >> synctex_sed_command.txt;\
- echo "\#define __SyncTeX__\\" >> synctex_sed_command.txt;\
- echo "\#include \"$(synctex_dir)/synctex-common.h\"\\" >> synctex_sed_command.txt;\
- echo "/* End of SyncTeX Section */|g" >> synctex_sed_command.txt
-
-### SyncTeX support in tex
-# list of change files
-tex_ch_srcs-with_synctex-mem_only = \
- $(synctex_dir)/synctex-mem.ch0 \
- $(synctex_dir)/synctex-mem.ch1 \
- $(synctex_dir)/synctex-mem.ch2
-tex_ch_srcs-without_synctex = \
- $(tex_ch_srcs-with_synctex-mem_only) \
- $(synctex_dir)/synctex-rec.ch0 \
- $(synctex_dir)/synctex-rec.ch1 \
- $(synctex_dir)/synctex-rec.ch2
-tex_ch_srcs-without_synctex =
-synctex-tex.ch:tie tex.ch $(synctex-tex_ch_srcs)
- $(TIE) -c synctex-tex.ch $(srcdir)/tex.web $(synctex-tex_ch_srcs)
-# The C sources and headers
-synctex-tex_o = synctex.o
-synctex.h: $(synctex_dir)/synctex.h
- cat $(synctex_dir)/synctex.h >$@
-synctex-tex.h: $(synctex_dir)/$@
- cat $(synctex_dir)/$@ >$@
-synctex.c: texd.h $(synctex_dir)/synctex.c synctex.h synctex-tex.h
- sed s/TEX-OR-MF-OR-MP/tex/ $(synctex_dir)/synctex.c >$@
-texd.h-with_synctex = if test -z "`grep __SyncTeX__ texd.h`";\
- then\
- $(synctex_common_texd);\
- sed -f synctex_sed_command.txt texd.h > synctex_texd.h;\
- mv synctex_texd.h texd.h;\
- if test -z "`grep __SyncTeX__ texd.h`";\
- then\
- echo "warning: SyncTeX activation FAILED";\
- exit 1;\
- fi;\
- echo "warning: SyncTeX is enabled";\
- fi
-texd.h-without_synctex = echo "warning: SyncTeX is NOT enabled"
-
-### SyncTeX support in etex
-# list of change files
-synctex-etex_ch_srcs_mem_only = \
- $(synctex_dir)/synctex-mem.ch0 \
- $(synctex_dir)/synctex-mem.ch1 \
- $(synctex_dir)/synctex-e-mem.ch0 \
- $(synctex_dir)/synctex-e-mem.ch1
-synctex-etex_ch_srcs_on = \
- $(synctex-etex_ch_srcs_mem_only) \
- $(synctex_dir)/synctex-rec.ch0 \
- $(synctex_dir)/synctex-rec.ch1 \
- $(synctex_dir)/synctex-e-rec.ch0 \
- $(synctex_dir)/synctex-e-rec.ch1
-synctex-etex_ch_srcs_off =
-# The C sources and headers
-synctex-etex_o = synctex-e.o
-synctex-e.h: $(synctex_dir)/synctex.h
- cat $(synctex_dir)/synctex.h >$@
-synctex-etex.h: $(synctex_dir)/$@
- cat $(synctex_dir)/$@ >$@
-synctex-e.c: etexd.h $(synctex_dir)/synctex.c synctex-etex.h
- sed s/TEX-OR-MF-OR-MP/etex/ $(synctex_dir)/synctex.c >$@
-etexd.h-with_synctex = if test -z "`grep __SyncTeX__ etexd.h`";\
- then\
- $(synctex_common_texd);\
- sed -f synctex_sed_command.txt etexd.h > synctex_etexd.h;\
- mv synctex_etexd.h etexd.h;\
- if test -z "`grep __SyncTeX__ etexd.h`";\
- then\
- echo "warning: SyncTeX activation FAILED";\
- exit 1;\
- fi;\
- echo "warning: SyncTeX is enabled";\
- fi
-etexd.h-without_synctex = echo "warning: SyncTeX is NOT enabled"
-
-### SyncTeX support in pdftex
-# list of change files
-pdftex_ch_srcs-with_synctex-mem_only = \
- $(synctex_dir)/synctex-mem.ch0 \
- $(synctex_dir)/synctex-mem.ch1 \
- $(synctex_dir)/synctex-e-mem.ch0 \
- $(synctex_dir)/synctex-e-mem.ch1
-pdftex_ch_srcs-with_synctex = \
- $(pdftex_ch_srcs-with_synctex-mem_only) \
- $(synctex_dir)/synctex-rec.ch0 \
- $(synctex_dir)/synctex-rec.ch1 \
- $(synctex_dir)/synctex-e-rec.ch0 \
- $(synctex_dir)/synctex-e-rec.ch1 \
- $(synctex_dir)/synctex-pdf-rec.ch2
-pdftex_ch_srcs-without_synctex =
-# The C sources and headers
-pdftex_o-with_synctex = synctex-pdf.o
-pdftex_o-without_synctex =
-synctex-pdf.h: $(synctex_dir)/synctex.h
- cat $(synctex_dir)/synctex.h >$@
-synctex-pdftex.h: $(synctex_dir)/$@
- cat $(synctex_dir)/$@ >$@
-synctex-pdf.c: pdftexd.h $(synctex_dir)/synctex.c synctex-pdftex.h
- sed s/TEX-OR-MF-OR-MP/pdftex/ $(synctex_dir)/synctex.c >$@
-pdftexd.h-with_synctex = if test -z "`grep __SyncTeX__ pdftexd.h`";\
- then\
- $(synctex_common_texd);\
- sed -f synctex_sed_command.txt pdftexd.h > synctex_pdftexd.h;\
- mv synctex_pdftexd.h pdftexd.h;\
- if test -z "`grep __SyncTeX__ pdftexd.h`";\
- then\
- echo "warning: SyncTeX activation FAILED";\
- exit 1;\
- fi;\
- echo "warning: SyncTeX is enabled";\
- fi
-pdftexd.h-without_synctex = echo "warning: SyncTeX is NOT enabled"
-
-### SyncTeX support in xetex
-# Actually, xetex cannot build without SyncTeX because the tex.web
-# code does not provide proper entry points
-# list of change files
-xetex_ch_srcs-with_synctex-mem_only = \
- $(synctex_dir)/synctex-mem.ch0 \
- $(synctex_dir)/synctex-e-mem.ch0 \
- $(synctex_dir)/synctex-e-mem.ch1 \
- $(synctex_dir)/synctex-xe-mem.ch2
-xetex_ch_srcs-with_synctex = \
- $(xetex_ch_srcs-with_synctex-mem_only) \
- $(synctex_dir)/synctex-rec.ch0 \
- $(synctex_dir)/synctex-e-rec.ch0 \
- $(synctex_dir)/synctex-xe-rec.ch2
-xetex_ch_srcs-without_synctex =
-xetex_post_ch_srcs-with_synctex = \
- $(synctex_dir)/synctex-xe-rec.ch3
-xetex_post_ch_srcs-without_synctex =
-# The C sources and headers
-xetex_o-with_synctex = synctex-xe.o
-xetex_o-without_synctex =
-synctex-xe.h: $(synctex_dir)/synctex.h
- cat $(synctex_dir)/synctex.h >$@
-synctex-xetex.h: $(synctex_dir)/$@
- cat $(synctex_dir)/$@ >$@
-synctex-xe.c: xetexd.h $(synctex_dir)/synctex.c synctex-xetex.h
- sed s/TEX-OR-MF-OR-MP/xetex/ $(synctex_dir)/synctex.c >$@
-xetexd.h-with_synctex = if test -z "`grep __SyncTeX__ xetexd.h`";\
- then\
- $(synctex_common_texd);\
- sed -f synctex_sed_command.txt xetexd.h > synctex_xetexd.h;\
- mv synctex_xetexd.h xetexd.h;\
- if test -z "`grep __SyncTeX__ xetexd.h`";\
- then\
- echo "warning: SyncTeX activation FAILED";\
- exit 1;\
- fi;\
- echo "warning: SyncTeX is enabled";\
- fi
-xetexd.h-without_synctex = echo "warning: SyncTeX is NOT enabled"
-
-# the synctex tool
-synctex_parser.o: $(synctex_dir)/synctex_parser.c $(synctex_dir)/synctex_parser.h
- $(compile) -c -DSYNCTEX_USE_LOCAL_HEADER -I$(synctex_dir) $(ZLIBCPPFLAGS) -o $@ $<
-
-synctex_main.o: $(synctex_dir)/synctex_main.c $(synctex_dir)/synctex_parser.h
- $(compile) -c -I$(synctex_dir) $(ZLIBCPPFLAGS) -o $@ $<
-
-synctex:synctex_main.o synctex_parser.o $(ZLIBDEPS)
- $(link_command) synctex_main.o synctex_parser.o $(LDZLIB) $(LIBS)
-
-# Cleaning up.
-clean:: synctex-clean
-synctex-clean:
- -rm -f *synctex*
-
-# end of synctex.mk
diff --git a/Build/source/texk/web2c/xetexdir/acx_pthread.m4 b/Build/source/texk/web2c/xetexdir/acx_pthread.m4
deleted file mode 100644
index 7ac8ffddc5b..00000000000
--- a/Build/source/texk/web2c/xetexdir/acx_pthread.m4
+++ /dev/null
@@ -1,280 +0,0 @@
-##### http://autoconf-archive.cryp.to/acx_pthread.html
-#
-# SYNOPSIS
-#
-# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-# This macro figures out how to build C programs using POSIX threads.
-# It sets the PTHREAD_LIBS output variable to the threads library and
-# linker flags, and the PTHREAD_CFLAGS output variable to any special
-# C compiler flags that are needed. (The user can also force certain
-# compiler flags/libs to be tested by setting these environment
-# variables.)
-#
-# Also sets PTHREAD_CC to any special C compiler that is needed for
-# multi-threaded programs (defaults to the value of CC otherwise).
-# (This is necessary on AIX to use the special cc_r compiler alias.)
-#
-# NOTE: You are assumed to not only compile your program with these
-# flags, but also link it with them as well. e.g. you should link
-# with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
-# $LIBS
-#
-# If you are only building threads programs, you may wish to use
-# these variables in your default LIBS, CFLAGS, and CC:
-#
-# LIBS="$PTHREAD_LIBS $LIBS"
-# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-# CC="$PTHREAD_CC"
-#
-# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-# constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-# ACTION-IF-FOUND is a list of shell commands to run if a threads
-# library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-# run it if it is not found. If ACTION-IF-FOUND is not specified, the
-# default action will define HAVE_PTHREAD.
-#
-# Please let the authors know if this macro fails on any platform, or
-# if you have any other suggestions or comments. This macro was based
-# on work by SGJ on autoconf scripts for FFTW (http://www.fftw.org/)
-# (with help from M. Frigo), as well as ac_pthread and hb_pthread
-# macros posted by Alejandro Forero Cuervo to the autoconf macro
-# repository. We are also grateful for the helpful feedback of
-# numerous users.
-#
-# LAST MODIFICATION
-#
-# 2006-05-29
-#
-# COPYLEFT
-#
-# Copyright (c) 2006 Steven G. Johnson <stevenj@alum.mit.edu>
-#
-# 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 of the
-# License, 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-# As a special exception, the respective Autoconf Macro's copyright
-# owner gives unlimited permission to copy, distribute and modify the
-# configure scripts that are the output of Autoconf when processing
-# the Macro. You need not follow the terms of the GNU General Public
-# License when using or distributing such scripts, even though
-# portions of the text of the Macro appear in them. The GNU General
-# Public License (GPL) does govern all other use of the material that
-# constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the
-# Autoconf Macro released by the Autoconf Macro Archive. When you
-# make and distribute a modified version of the Autoconf Macro, you
-# may extend this special exception to the GPL to apply to your
-# modified version as well.
-
-AC_DEFUN([ACX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG_C
-acx_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- save_LIBS="$LIBS"
- LIBS="$PTHREAD_LIBS $LIBS"
- AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
- AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
- AC_MSG_RESULT($acx_pthread_ok)
- if test x"$acx_pthread_ok" = xno; then
- PTHREAD_LIBS=""
- PTHREAD_CFLAGS=""
- fi
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try. Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important. Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-# other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-# doesn't hurt to check since this sometimes defines pthreads too;
-# also defines -D_REENTRANT)
-# ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
- *solaris*)
-
- # On Solaris (at least, for some versions), libc contains stubbed
- # (non-functional) versions of the pthreads routines, so link-based
- # tests will erroneously succeed. (We need to link with -pthreads/-mt/
- # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
- # a function called by this macro, so we could check for that, but
- # who knows whether they'll stub that too in a future libc.) So,
- # we'll just look for -pthreads and -lpthread first:
-
- acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
- ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
- case $flag in
- none)
- AC_MSG_CHECKING([whether pthreads work without any flags])
- ;;
-
- -*)
- AC_MSG_CHECKING([whether pthreads work with $flag])
- PTHREAD_CFLAGS="$flag"
- ;;
-
- pthread-config)
- AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
- if test x"$acx_pthread_config" = xno; then continue; fi
- PTHREAD_CFLAGS="`pthread-config --cflags`"
- PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
- ;;
-
- *)
- AC_MSG_CHECKING([for the pthreads library -l$flag])
- PTHREAD_LIBS="-l$flag"
- ;;
- esac
-
- save_LIBS="$LIBS"
- save_CFLAGS="$CFLAGS"
- LIBS="$PTHREAD_LIBS $LIBS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
- # Check for various functions. We must include pthread.h,
- # since some functions may be macros. (On the Sequent, we
- # need a special flag -Kthread to make this header compile.)
- # We check for pthread_join because it is in -lpthread on IRIX
- # while pthread_create is in libc. We check for pthread_attr_init
- # due to DEC craziness with -lpthreads. We check for
- # pthread_cleanup_push because it is one of the few pthread
- # functions on Solaris that doesn't have a non-functional libc stub.
- # We try pthread_create on general principles.
- AC_TRY_LINK([#include <pthread.h>],
- [pthread_t th; pthread_join(th, 0);
- pthread_attr_init(0); pthread_cleanup_push(0, 0);
- pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
- [acx_pthread_ok=yes])
-
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-
- AC_MSG_RESULT($acx_pthread_ok)
- if test "x$acx_pthread_ok" = xyes; then
- break;
- fi
-
- PTHREAD_LIBS=""
- PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
- save_LIBS="$LIBS"
- LIBS="$PTHREAD_LIBS $LIBS"
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
- # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
- AC_MSG_CHECKING([for joinable pthread attribute])
- attr_name=unknown
- for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
- AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
- [attr_name=$attr; break])
- done
- AC_MSG_RESULT($attr_name)
- if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
- AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
- [Define to necessary symbol if this constant
- uses a non-standard name on your system.])
- fi
-
- AC_MSG_CHECKING([if more special flags are required for pthreads])
- flag=no
- case "${host_cpu}-${host_os}" in
- *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
- *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
- esac
- AC_MSG_RESULT(${flag})
- if test "x$flag" != xno; then
- PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
- fi
-
- LIBS="$save_LIBS"
- CFLAGS="$save_CFLAGS"
-
- # More AIX lossage: must compile with xlc_r or cc_r
- if test x"$GCC" != xyes; then
- AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
- else
- PTHREAD_CC=$CC
- fi
-else
- PTHREAD_CC="$CC"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
- ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
- :
-else
- acx_pthread_ok=no
- $2
-fi
-AC_LANG_RESTORE
-])dnl ACX_PTHREAD
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index bd9f2bffc12..4ed3231b279 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -206,7 +206,7 @@ $(libxetex_a_OBJECTS): xetexd.h
## the Objective C++ file xetexdir/XeTeXFontMgr_Mac.mm.
## Since this file is to be compiled with '$(CXX) -ObjC++' we provide a
## C++ wrapper xetexdir/XeTeXFontMgr_Mac.cpp including the Objective C++ file.
-## Since Automake does not allow to specify CXXFLAGS for inividual objects,
+## Since Automake does not allow to specify CXXFLAGS for individual objects,
## we use an additional library libxetexmm.a.
EXTRA_LIBRARIES += libxetexmm.a
@@ -221,19 +221,13 @@ libxetexmm_a_SOURCES = \
## included by xetexdir/XeTeXFontMgr_Mac.cpp
EXTRA_DIST += xetexdir/XeTeXFontMgr_Mac.mm
-EXTRA_DIST += \
- xetexdir/ChangeLog
+EXTRA_DIST += xetexdir/ChangeLog
## Not used
##
-EXTRA_DIST += \
- xetexdir/LICENSE.txt
+EXTRA_DIST += xetexdir/LICENSE.txt
## Eventually delete these files
##
-EXTRA_DIST += \
- xetexdir/acx_pthread.m4 \
- xetexdir/tests.ac \
- xetexdir/withenable.ac \
- xetexdir/xetex.mk
+EXTRA_DIST += xetexdir/xetex.mk
diff --git a/Build/source/texk/web2c/xetexdir/tests.ac b/Build/source/texk/web2c/xetexdir/tests.ac
deleted file mode 100644
index ee0c1e29382..00000000000
--- a/Build/source/texk/web2c/xetexdir/tests.ac
+++ /dev/null
@@ -1,83 +0,0 @@
-# Extra configure tests to support XeTeX
-
-AC_DEFUN([AC_HAS_CARBON], [
-#
-# Check for Carbon framework on Mac OS X
-#
- AC_MSG_CHECKING([for Apple Carbon framework])
- AC_TRY_COMPILE(
- [
-#include <Carbon/Carbon.h>
- ], [
-ATSUStyle style;
- ],
- [ AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_CARBON, 1, [Define if you have Carbon])
- LDCARBON="-framework Carbon"
- has_carbon=yes
- ],
- [ AC_MSG_RESULT(no)
- LDCARBON=
- has_carbon=no
- ]
- )
-])
-
-AC_DEFUN([AC_HAS_QUICKTIME], [
-#
-# Check for QuickTime framework on Mac OS X
-#
- AC_MSG_CHECKING([for Apple QuickTime framework])
- AC_TRY_COMPILE(
- [
-#include <QuickTime/QuickTime.h>
- ], [
-ImageDescriptionHandle h;
- ],
- [ AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_QUICKTIME, 1, [Define if you have QuickTime])
- LDQUICKTIME="-framework QuickTime"
- has_quicktime=yes
- ],
- [ AC_MSG_RESULT(no)
- LDQUICKTIME=
- has_quicktime=no
- ]
- )
-])
-
-AC_DEFUN([AC_HAS_LIBFONTCONFIG], [
-#
-# Check for libfontconfig
-#
- _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
- AC_ARG_WITH(fontconfig,
- [ --with-fontconfig=DIR use fontconfig include/library files from DIR],
- [
-if test -d "$withval"; then
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- LDFLAGS="$LDFLAGS -L$withval/lib"
- FONTCONFIGCPPFLAGS="-I$withval/include"
- FONTCONFIGLDFLAGS="-L$withval/lib"
-fi
- ]
- )
- AC_MSG_CHECKING([for fontconfig header files])
- AC_TRY_COMPILE(
- [
-#include <fontconfig/fontconfig.h>
- ], [
-FcObjectSet *os;
- ],
- [ AC_MSG_RESULT(yes)
- AC_CHECK_LIB(fontconfig, FcInit, [
- AC_DEFINE(HAVE_LIBFONTCONFIG, 1, [Define if you have libfontconfig])
- LDFONTCONFIG="-lfontconfig"
- ])
- ],
- [ AC_MSG_RESULT(no)
- CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
- LDFONTCONFIG=
- ]
- )
-])
diff --git a/Build/source/texk/web2c/xetexdir/withenable.ac b/Build/source/texk/web2c/xetexdir/withenable.ac
deleted file mode 100644
index 8d05ab0cd00..00000000000
--- a/Build/source/texk/web2c/xetexdir/withenable.ac
+++ /dev/null
@@ -1,3 +0,0 @@
-AC_ARG_WITH(fontconfig,
-[ --with-fontconfig=DIR Specify dir prefix where fontconfig is installed
- (e.g., /usr/X11R6).])
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index de6ed75ebd5..b0285ef6956 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -12931,9 +12931,6 @@ fi
ac_config_headers="$ac_config_headers config.h"
-# TEXMF='${datadir}/texmf'
-# AC_SUBST(TEXMF)
-
{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac
index d021e90c2b7..cca3a23559d 100644
--- a/Build/source/texk/xdvipdfmx/configure.ac
+++ b/Build/source/texk/xdvipdfmx/configure.ac
@@ -17,9 +17,6 @@ KPSE_COMMON([xdvipdfmx])
AC_CONFIG_HEADERS([config.h])
-# TEXMF='${datadir}/texmf'
-# AC_SUBST(TEXMF)
-
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdint.h inttypes.h sys/types.h])
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am b/Build/source/texk/xdvipdfmx/src/Makefile.am
index f91f40e3bf0..efb86a33b99 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.am
@@ -55,7 +55,3 @@ endif !build_MacOsX
EXTRA_DIST = mk_agl_standard_c.pl
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.am.orig
-
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am.orig b/Build/source/texk/xdvipdfmx/src/Makefile.am.orig
deleted file mode 100644
index cc48aad185c..00000000000
--- a/Build/source/texk/xdvipdfmx/src/Makefile.am.orig
+++ /dev/null
@@ -1,45 +0,0 @@
-bin_PROGRAMS = xdvipdfmx
-xdvipdfmx_SOURCES = agl.c agl_standard.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
-cmap.c cmap_read.c cmap_write.c cs_type2.c \
-dpxconf.c dpxcrypt.c dpxfile.c dpxutil.c \
-dvi.c dvipdfmx.c epdf.c error.c fontmap.c jpegimage.c mem.c mfileio.c mpost.c \
-numbers.c otl_conf.c otl_opt.c pdfcolor.c pdfdev.c pdfdoc.c pdfdraw.c pdfencoding.c \
-pdfencrypt.c pdffont.c pdfnames.c pdfobj.c pdfparse.c pdfresource.c pdfximage.c \
-pkfont.c pngimage.c pst.c pst_obj.c sfnt.c \
-spc_color.c spc_dvips.c spc_html.c spc_misc.c spc_pdfm.c spc_tpic.c spc_util.c spc_xtx.c specials.c \
-subfont.c tfm.c \
-tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \
-type0.c t1_char.c t1_load.c type1.c type1c.c \
-unicode.c vf.c xbb.c \
-agl.h bmpimage.h asl_charset.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
-cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \
-cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h epdf.h error.h fontmap.h \
-jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \
-pdfdoc.h pdfdraw.h pdfencoding.h pdfencrypt.h pdffont.h pdflimits.h pdfnames.h pdfobj.h \
-pdfparse.h pdfresource.h pdfximage.h pkfont.h pngimage.h pst.h pst_obj.h sfnt.h \
-spc_color.h spc_dvips.h spc_html.h spc_misc.h spc_pdfm.h spc_tpic.h spc_util.h spc_xtx.h specials.h \
-subfont.h system.h tfm.h \
-tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h truetype.h \
-type0.h t1_char.h t1_load.h type1.h type1c.h \
-unicode.h vf.h xbb.h
-
-
-LIBPNGDIR=$(top_builddir)/../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-LIBPNGDEP = @LIBPNGDEP@
-LDLIBPNG = @LDLIBPNG@
-
-ZLIBDIR=$(top_builddir)/../../libs/zlib
-ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR)
-ZLIBDEP = @ZLIBDEP@
-LDZLIB = @LDZLIB@
-
-FREETYPE2DIR = $(top_builddir)/../../libs/freetype2
-FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR)
-LDFREETYPE2 = @LDFREETYPE2@
-FREETYPE2DEP = @FREETYPE2DEP@
-
-xdvipdfmx_CPPFLAGS = @LIBPNGCPPFLAGS@ @ZLIBCPPFLAGS@ @FREETYPE2CPPFLAGS@
-xdvipdfmx_LDADD = $(LDADD) $(LDLIBPNG) $(LDZLIB) $(LDFREETYPE2)
-xdvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIBPNGDEP) $(FREETYPE2DEP)
-xdvipdfmx_LDFLAGS = @xdvipdfmx_LDFLAGS@
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in
index 3520c4bb0b8..cfe6a77551f 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.in
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.in
@@ -268,7 +268,7 @@ xdvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(LIBPNG_DEPEND)
LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \
$(am__append_2)
@build_MacOsX_TRUE@AM_LDFLAGS = -framework ApplicationServices
-EXTRA_DIST = mk_agl_standard_c.pl Makefile.am.orig
+EXTRA_DIST = mk_agl_standard_c.pl
all: all-am
.SUFFIXES: