cleanup texk/web2c/ headers

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

5 files changed, 7 insertions, 14 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 53ffcd96351..ce4483a839a 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* c-auto.h, config.h (removed): Obsolete, all mplibdir/ and
+	luatexdir/ files are now changed to directly #include
+	<w2c/c-auto.h> or <w2c/config.h>.
+
 2010-06-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (AM_CPPFLAGS, INCLUDES): Move $(KPATHSEA_INCLUDES).
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 925dee799d8..32f05b8287d 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -194,10 +194,6 @@ include $(srcdir)/synctexdir/am/synctex.am
 ## libmd5
 include $(srcdir)/libmd5/am/md5.am
 
-## Temporary
-##
-EXTRA_DIST += c-auto.h config.h
-
 ## Eventually delete these files
 ##
 EXTRA_DIST += Makefile.in.orig configure.in.orig
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 8d1d5d157a5..b49dbe979e0 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1381,8 +1381,7 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	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 \
-	libmd5/md5.test c-auto.h config.h Makefile.in.orig \
-	configure.in.orig
+	libmd5/md5.test Makefile.in.orig configure.in.orig
 DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	tangle-web2c tangleboot.c tangleboot.h tangleboot.p \
 	tangleboot-web2c ctangle.c cweb.c cweb.h ctangle-ctangle \
diff --git a/Build/source/texk/web2c/c-auto.h b/Build/source/texk/web2c/c-auto.h
deleted file mode 100644
index 0e33f8eba7b..00000000000
--- a/Build/source/texk/web2c/c-auto.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* FIXME: This file is needed temporarily until the files
- * luatexdir/image/epdf.h and luatexdir/lua51/luaconf.h
- * include <w2c/c-auto.h> instead if <c-auto.h> or "c-auto.h".  */
-#include <w2c/c-auto.h>
diff --git a/Build/source/texk/web2c/config.h b/Build/source/texk/web2c/config.h
deleted file mode 100644
index fc925f52abd..00000000000
--- a/Build/source/texk/web2c/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* FIXME: This file is needed temporarily until all
- * luatexdir/ and mplibdir/ files
- * include <w2c/config.h> instead if <config.h> or "config.h".  */
-#include <w2c/config.h>