minor build system cleanup

git-svn-id: svn://tug.org/texlive/trunk@17252 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 56 insertions, 55 deletions

diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index c31603f8523..f084aa0017d 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: List all used header files.
+
+2010-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* basics.c: #include "basics.h" and drop all others.
+
 2010-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* t1info.c (ComputeStdProps): Declare rc as int, not LONG,
diff --git a/Build/source/texk/ps2pkm/Makefile.am b/Build/source/texk/ps2pkm/Makefile.am
index b3bc5bb9531..e4c04941895 100644
--- a/Build/source/texk/ps2pkm/Makefile.am
+++ b/Build/source/texk/ps2pkm/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/ps2pkm/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -28,18 +28,31 @@ pk2bm_SOURCES = \
 	pkin.h
 
 ps2pk_SOURCES = \
+	Xstuff.h \
 	arith.c \
 	arith.h \
 	basics.c \
 	basics.h \
+	blues.h \
 	bstring.c \
+	cluts.h \
 	curves.c \
 	curves.h \
+	digit.h \
 	encoding.c \
+	ffilest.h \
 	filenames.c \
 	filenames.h \
+	font.h \
 	fontfcn.c \
 	fontfcn.h \
+	fontfile.h \
+	fontmisc.h \
+	fonts.h \
+	fontstruct.h \
+	fontxlfd.h \
+	fsmasks.h \
+	hdigit.h \
 	hints.c \
 	hints.h \
 	lines.c \
@@ -48,22 +61,32 @@ ps2pk_SOURCES = \
 	objects.h \
 	paths.c \
 	paths.h \
+	pictures.h \
 	pkout.c \
 	pkout.h \
 	ps2pk.c \
+	psearch.h \
         regions.c \
         regions.h \
 	scanfont.c \
 	spaces.c \
 	spaces.h \
+	strokes.h \
 	t1funcs.c \
+	t1hdigit.h \
+	t1imager.h \
 	t1info.c \
+	t1intf.h \
 	t1io.c \
         t1snap.c \
+	t1stdio.h \
 	t1stub.c \
 	token.c \
 	token.h \
+	tokst.h \
+	trig.h \
 	type1.c \
+	types.h \
 	util.c \
 	util.h
 
@@ -83,39 +106,16 @@ EXTRA_DIST = \
 	INSTALLATION \
 	README.14m \
 	README.type1 \
-	Xstuff.h \
 	basename.c \
-	blues.h \
-	cluts.h \
-	digit.h \
-	ffilest.h \
 	flisearch.c \
-	font.h \
-	fontfile.h \
-	fontmisc.h \
-	fonts.h \
-	fontstruct.h \
-	fontxlfd.h \
-	fsmasks.h \
-	hdigit.h \
-	pictures.h \
 	pktest.c \
 	protos.h \
 	psearch.c \
-	psearch.h \
 	sexpr.c \
 	strexpr.c \
 	strexpr.h \
-	strokes.h \
-	t1hdigit.h \
-	t1imager.h \
-	t1intf.h \
-	t1stdio.h \
 	t1test.c \
 	texfiles.c \
 	texfiles.h \
-	tokst.h \
-	trig.h \
-	types.h \
 	usenet
 
diff --git a/Build/source/texk/ps2pkm/Makefile.in b/Build/source/texk/ps2pkm/Makefile.in
index fd88e01681c..a3994eceb9f 100644
--- a/Build/source/texk/ps2pkm/Makefile.in
+++ b/Build/source/texk/ps2pkm/Makefile.in
@@ -288,18 +288,31 @@ pk2bm_SOURCES = \
 	pkin.h
 
 ps2pk_SOURCES = \
+	Xstuff.h \
 	arith.c \
 	arith.h \
 	basics.c \
 	basics.h \
+	blues.h \
 	bstring.c \
+	cluts.h \
 	curves.c \
 	curves.h \
+	digit.h \
 	encoding.c \
+	ffilest.h \
 	filenames.c \
 	filenames.h \
+	font.h \
 	fontfcn.c \
 	fontfcn.h \
+	fontfile.h \
+	fontmisc.h \
+	fonts.h \
+	fontstruct.h \
+	fontxlfd.h \
+	fsmasks.h \
+	hdigit.h \
 	hints.c \
 	hints.h \
 	lines.c \
@@ -308,22 +321,32 @@ ps2pk_SOURCES = \
 	objects.h \
 	paths.c \
 	paths.h \
+	pictures.h \
 	pkout.c \
 	pkout.h \
 	ps2pk.c \
+	psearch.h \
         regions.c \
         regions.h \
 	scanfont.c \
 	spaces.c \
 	spaces.h \
+	strokes.h \
 	t1funcs.c \
+	t1hdigit.h \
+	t1imager.h \
 	t1info.c \
+	t1intf.h \
 	t1io.c \
         t1snap.c \
+	t1stdio.h \
 	t1stub.c \
 	token.c \
 	token.h \
+	tokst.h \
+	trig.h \
 	type1.c \
+	types.h \
 	util.c \
 	util.h
 
@@ -334,40 +357,17 @@ EXTRA_DIST = \
 	INSTALLATION \
 	README.14m \
 	README.type1 \
-	Xstuff.h \
 	basename.c \
-	blues.h \
-	cluts.h \
-	digit.h \
-	ffilest.h \
 	flisearch.c \
-	font.h \
-	fontfile.h \
-	fontmisc.h \
-	fonts.h \
-	fontstruct.h \
-	fontxlfd.h \
-	fsmasks.h \
-	hdigit.h \
-	pictures.h \
 	pktest.c \
 	protos.h \
 	psearch.c \
-	psearch.h \
 	sexpr.c \
 	strexpr.c \
 	strexpr.h \
-	strokes.h \
-	t1hdigit.h \
-	t1imager.h \
-	t1intf.h \
-	t1stdio.h \
 	t1test.c \
 	texfiles.c \
 	texfiles.h \
-	tokst.h \
-	trig.h \
-	types.h \
 	usenet
 
 all: c-auto.h
diff --git a/Build/source/texk/ps2pkm/basics.c b/Build/source/texk/ps2pkm/basics.c
index ca543a60fc8..273d4d245b8 100644
--- a/Build/source/texk/ps2pkm/basics.c
+++ b/Build/source/texk/ps2pkm/basics.c
@@ -4,14 +4,7 @@
  * VERSION: 1.0 (September 1995)
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>   /* stat() */
-#if defined(WIN32) && !defined(__MINGW32__)
-#include <win32lib.h>
-#endif
+#include "basics.h"
 
 /* Give up ... */
 void fatal(char *fmt, ...)