summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-08-05 08:11:22 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-08-05 08:11:22 +0000
commitcf3ad3411bc9de86fc633d026d6f71511aa68e74 (patch)
treecf8beea383aee4de86f933e70e7387f190904401 /Build
parentd68992e6b7de4c94e6841019eb3b27e725c1fae4 (diff)
Remove unnecessary headers
git-svn-id: svn://tug.org/texlive/trunk@23421 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dviljk/win32/ChangeLog6
-rw-r--r--Build/source/texk/dviljk/win32/Makefile.am3
-rw-r--r--Build/source/texk/dviljk/win32/Makefile.in3
-rw-r--r--Build/source/texk/dviljk/win32/stackenv.c2
-rw-r--r--Build/source/texk/dviljk/win32/variables.h23
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/Makefile.am1
-rw-r--r--Build/source/texk/kpathsea/Makefile.in1
-rw-r--r--Build/source/texk/kpathsea/cnf.c3
-rw-r--r--Build/source/texk/kpathsea/fontmap.c3
-rw-r--r--Build/source/texk/kpathsea/recorder.h21
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst2
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog4
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c1
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c1
16 files changed, 26 insertions, 58 deletions
diff --git a/Build/source/texk/dviljk/win32/ChangeLog b/Build/source/texk/dviljk/win32/ChangeLog
index 4d478c3d3f3..daaa579f6d0 100644
--- a/Build/source/texk/dviljk/win32/ChangeLog
+++ b/Build/source/texk/dviljk/win32/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * stackenv.c: Do not #include "variables.h".
+ * Makefile.am (dvihp_SOURCES): Remove variables.h.
+ * variables.h: Removed.
+
2011-05-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvihp.c, mktex.h, mktexlib.h, stackenv.[ch], variables.h:
diff --git a/Build/source/texk/dviljk/win32/Makefile.am b/Build/source/texk/dviljk/win32/Makefile.am
index 31dd4c58a05..c782943c83e 100644
--- a/Build/source/texk/dviljk/win32/Makefile.am
+++ b/Build/source/texk/dviljk/win32/Makefile.am
@@ -14,8 +14,7 @@ dvihp_SOURCES = \
mktex.h \
mktexlib.h \
stackenv.c \
- stackenv.h \
- variables.h
+ stackenv.h
LDADD = $(KPATHSEA_LIBS)
dvihp_DEPENDENCIES = $(KPATHSEA_DEPEND)
diff --git a/Build/source/texk/dviljk/win32/Makefile.in b/Build/source/texk/dviljk/win32/Makefile.in
index d6f133391c8..fac40038f1d 100644
--- a/Build/source/texk/dviljk/win32/Makefile.in
+++ b/Build/source/texk/dviljk/win32/Makefile.in
@@ -204,8 +204,7 @@ dvihp_SOURCES = \
mktex.h \
mktexlib.h \
stackenv.c \
- stackenv.h \
- variables.h
+ stackenv.h
LDADD = $(KPATHSEA_LIBS)
dvihp_DEPENDENCIES = $(KPATHSEA_DEPEND)
diff --git a/Build/source/texk/dviljk/win32/stackenv.c b/Build/source/texk/dviljk/win32/stackenv.c
index e91a72a63fd..22a054aaf1c 100644
--- a/Build/source/texk/dviljk/win32/stackenv.c
+++ b/Build/source/texk/dviljk/win32/stackenv.c
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#endif
#include <kpathsea/kpathsea.h>
#include "stackenv.h"
-#include "variables.h"
+
const_string mktex_version_string = "2.0";
extern char *output;
diff --git a/Build/source/texk/dviljk/win32/variables.h b/Build/source/texk/dviljk/win32/variables.h
deleted file mode 100644
index 06f79ddb132..00000000000
--- a/Build/source/texk/dviljk/win32/variables.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _MKTEX_VARIABLES_H_
-
-#define _MKTEX_VARIABLES_H_
-
-#include <kpathsea/cnf.h>
-#include <kpathsea/db.h>
-#include <kpathsea/fn.h>
-#include <kpathsea/hash.h>
-
-extern MKTEXDLL void init_vars(void);
-extern MKTEXDLL char *getval(char *name);
-extern MKTEXDLL char *setval(char *name,char *value);
-extern MKTEXDLL char *setval_default(char *name,char *value);
-extern MKTEXDLL char **grep(char *regexp,char *line,int num_vars) ;
-
-extern MKTEXDLL int parse_variable(char *line);
-
-extern char *strcasestr(char *s1,char *s2);
-
-extern char *subst(char *line, char *from, char *to);
-extern MKTEXDLL string expand_var(const_string);
-extern MKTEXDLL string mktex_var_expand (const_string src);
-#endif /* _MKTEX_VARIABLES_H_ */
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 548a2029994..d3bc3105ecb 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * cnf.c, fontmap.c: Do not #include <kpathsea/recorder.h>.
+ * Makefile.am (kpseinclude_HEADERS): Remove recorder.h.
+ * recorder.h (removed): Empty file.
+
2011-08-04 Peter Breitenlohner <peb@mppmu.mpg.de>
More diffs between TeX Live and W32TeX.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index d9ab4a53847..07da8d81e3d 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -146,7 +146,6 @@ kpseinclude_HEADERS = \
proginit.h \
progname.h \
readable.h \
- recorder.h \
str-list.h \
str-llist.h \
systypes.h \
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index b4aac202f9b..779e6f241f4 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -428,7 +428,6 @@ kpseinclude_HEADERS = \
proginit.h \
progname.h \
readable.h \
- recorder.h \
str-list.h \
str-llist.h \
systypes.h \
diff --git a/Build/source/texk/kpathsea/cnf.c b/Build/source/texk/kpathsea/cnf.c
index cb18c66ab83..1eac745261a 100644
--- a/Build/source/texk/kpathsea/cnf.c
+++ b/Build/source/texk/kpathsea/cnf.c
@@ -1,6 +1,6 @@
/* cnf.c: read config files.
- Copyright 1994, 1995, 1996, 1997, 2008, 2009 Karl Berry.
+ Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011 Karl Berry.
Copyright 1997-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -27,7 +27,6 @@
#include <kpathsea/paths.h>
#include <kpathsea/pathsearch.h>
#include <kpathsea/progname.h>
-#include <kpathsea/recorder.h>
#include <kpathsea/tex-file.h>
#include <kpathsea/variable.h>
diff --git a/Build/source/texk/kpathsea/fontmap.c b/Build/source/texk/kpathsea/fontmap.c
index 73c7227b593..3dce91843dc 100644
--- a/Build/source/texk/kpathsea/fontmap.c
+++ b/Build/source/texk/kpathsea/fontmap.c
@@ -1,7 +1,7 @@
/* fontmap.c: read files for additional font names.
Copyright 2001, 2002, 2005 Olaf Weber.
- Copyright 1993, 1994, 1995, 1996, 1997, 2008 Karl Berry.
+ Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2011 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,6 @@
#include <kpathsea/line.h>
#include <kpathsea/pathsearch.h>
#include <kpathsea/str-list.h>
-#include <kpathsea/recorder.h>
#include <kpathsea/tex-file.h>
/* We have one and only one fontmap, so may as well make it static
diff --git a/Build/source/texk/kpathsea/recorder.h b/Build/source/texk/kpathsea/recorder.h
deleted file mode 100644
index 3c5621ff0d7..00000000000
--- a/Build/source/texk/kpathsea/recorder.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* recorder.h: filename recorder callback.
-
- Copyright 2007, 2008 Karl Berry.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef KPATHSEA_RECORDER_H
-#define KPATHSEA_RECORDER_H
-
-#endif /* not KPATHSEA_RECORDER_H */
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 2160c051151..57fb33bd5ba 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -1,2 +1,2 @@
texmf_scripts='simpdftex/simpdftex a2ping/a2ping.pl tetex/e2pall.pl tetex/texdoctk.pl texdoc/texdoc.tlu texlive/rungs.tlu texlive/tlmgr.pl'
-texmf_dist_scripts='bibexport/bibexport.sh installfont/installfont-tl listings-ext/listings-ext.sh pdfjam/pdf180 pdfjam/pdf270 pdfjam/pdf90 pdfjam/pdfbook pdfjam/pdfflip pdfjam/pdfjam pdfjam/pdfjam-pocketmod pdfjam/pdfjam-slides3up pdfjam/pdfjam-slides6up pdfjam/pdfjoin pdfjam/pdfnup pdfjam/pdfpun pst-pdf/ps4pdf accfonts/mkt1font accfonts/vpl2ovp accfonts/vpl2vpl authorindex/authorindex bundledoc/arlatex bundledoc/bundledoc cachepic/cachepic.tlu context/perl/mptopdf.pl de-macro/de-macro dviasm/dviasm.py ebong/ebong.py epspdf/epspdf.rb epspdf/epspdftk.tcl epstopdf/epstopdf.pl fig4latex/fig4latex findhyph/findhyph fontools/afm2afm fontools/autoinst fontools/cmap2enc fontools/font2afm fontools/ot2kpx fontools/pfm2kpx fontools/showglyphs fragmaster/fragmaster.pl glossaries/makeglossaries latex2man/latex2man latexdiff/latexdiff.pl latexdiff/latexdiff-vc.pl latexdiff/latexrevise.pl latexmk/latexmk.pl luaotfload/mkluatexfontdb.lua mathspic/mathspic.pl mkjobtexmf/mkjobtexmf.pl mkgrkindex/mkgrkindex musixtex/musixflx.lua musixtex/musixtex.lua oberdiek/pdfatfi.pl pax/pdfannotextractor.pl pdfcrop/pdfcrop.pl perltex/perltex.pl pkfix/pkfix.pl pkfix-helper/pkfix-helper ppower4/pdfthumb.tlu ppower4/ppower4.tlu pst2pdf/pst2pdf purifyeps/purifyeps splitindex/perl/splitindex.pl sty2dtx/sty2dtx.pl svn-multi/svn-multi.pl texcount/texcount.pl texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten texloganalyser/texloganalyser thumbpdf/thumbpdf.pl ulqda/ulqda.pl urlbst/urlbst vpe/vpe.pl'
+texmf_dist_scripts='bibexport/bibexport.sh installfont/installfont-tl listings-ext/listings-ext.sh pdfjam/pdf180 pdfjam/pdf270 pdfjam/pdf90 pdfjam/pdfbook pdfjam/pdfflip pdfjam/pdfjam pdfjam/pdfjam-pocketmod pdfjam/pdfjam-slides3up pdfjam/pdfjam-slides6up pdfjam/pdfjoin pdfjam/pdfnup pdfjam/pdfpun pst-pdf/ps4pdf accfonts/mkt1font accfonts/vpl2ovp accfonts/vpl2vpl authorindex/authorindex bundledoc/arlatex bundledoc/bundledoc cachepic/cachepic.tlu context/perl/mptopdf.pl de-macro/de-macro dviasm/dviasm.py ebong/ebong.py epspdf/epspdf.rb epspdf/epspdftk.tcl epstopdf/epstopdf.pl fig4latex/fig4latex findhyph/findhyph fontools/afm2afm fontools/autoinst fontools/cmap2enc fontools/font2afm fontools/ot2kpx fontools/pfm2kpx fontools/showglyphs fragmaster/fragmaster.pl glossaries/makeglossaries latex2man/latex2man latexdiff/latexdiff.pl latexdiff/latexdiff-vc.pl latexdiff/latexrevise.pl latexmk/latexmk.pl luaotfload/mkluatexfontdb.lua mathspic/mathspic.pl mf2pt1/mf2pt1.pl mkjobtexmf/mkjobtexmf.pl mkgrkindex/mkgrkindex musixtex/musixflx.lua musixtex/musixtex.lua oberdiek/pdfatfi.pl pax/pdfannotextractor.pl pdfcrop/pdfcrop.pl perltex/perltex.pl pkfix/pkfix.pl pkfix-helper/pkfix-helper pst2pdf/pst2pdf purifyeps/purifyeps splitindex/perl/splitindex.pl sty2dtx/sty2dtx.pl svn-multi/svn-multi.pl texcount/texcount.pl texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten texloganalyser/texloganalyser thumbpdf/thumbpdf.pl ulqda/ulqda.pl urlbst/urlbst vpe/vpe.pl'
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 7f6fb0dd535..12dbd76daa9 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-04 Magnus Granberg <zorry@gentoo.org>
+
+ * texmfmp.c: Do not #include empty file <kpathsea/recorder.h>.
+
2011-08-03 Magnus Granberg <zorry@gentoo.org>
* texmfmp.c: Use C code for i?86 when -fPIC.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 818dceb3d3b..6384a5665c5 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -17,7 +17,6 @@
#include <kpathsea/readable.h>
#include <kpathsea/variable.h>
#include <kpathsea/absolute.h>
-#include <kpathsea/recorder.h>
#ifdef WIN32
#include <kpathsea/concatn.h>
#endif
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 1506e0b3d2a..4d939432d87 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-04 Magnus Granberg <zorry@gentoo.org>
+
+ * luatex.c: Do not #include empty file <kpathsea/recorder.h>.
+
2011-06-17 Peter Breitenlohner <peb@mppmu.mpg.de>
Reduce memory leaks.
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index d8396ca4fc5..6148f2d0862 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -32,7 +32,6 @@ const char *engine_name = "luatex"; /* the name of this engine */
#include <kpathsea/readable.h>
#include <kpathsea/variable.h>
#include <kpathsea/absolute.h>
-#include <kpathsea/recorder.h>
#ifdef WIN32
#include <kpathsea/concatn.h>
#endif