summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-04-30 07:24:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-04-30 07:24:49 +0000
commit454131785ebed861f160849932a6a78c491e7fd1 (patch)
tree1bcb52eb7ef5b8bb04371def285ca494868b471f /Build/source/texk
parente189f66ff7d2eafecce99612bcac308b61b1deec (diff)
Clean up new simpletypes.h
git-svn-id: svn://tug.org/texlive/trunk@33761 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/Makefile.am1
-rw-r--r--Build/source/texk/kpathsea/Makefile.in5
-rw-r--r--Build/source/texk/kpathsea/simpletypes.h2
4 files changed, 9 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index cfd8f87f2bf..3d0041bba98 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (normal_headers): Add simpletypes.h.
+ * simpletypes.h: Don't '#include <kpathsea/simpletypes.h>'.
+
2014-04-29 Karl Berry <karl@tug.org>
* simpletypes.h: new file, defining just boolean, string, address, etc.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index de98f01b5ed..15952e907c1 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -159,6 +159,7 @@ normal_headers = \
proginit.h \
progname.h \
readable.h \
+ simpletypes.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 a17e5f6eefa..ab38ce8cf18 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -109,8 +109,8 @@ EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT)
DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/c-auto.in putenv.c strtol.c \
- strstr.c strcasecmp.c $(dist_noinst_SCRIPTS) \
+ $(am__configure_deps) $(srcdir)/c-auto.in strcasecmp.c \
+ strtol.c putenv.c strstr.c $(dist_noinst_SCRIPTS) \
$(dist_web2c_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \
$(dist_noinst_DATA) $(dist_web2c_DATA) $(kpseinclude_HEADERS) \
$(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \
@@ -748,6 +748,7 @@ normal_headers = \
proginit.h \
progname.h \
readable.h \
+ simpletypes.h \
str-list.h \
str-llist.h \
systypes.h \
diff --git a/Build/source/texk/kpathsea/simpletypes.h b/Build/source/texk/kpathsea/simpletypes.h
index 8403f55ab55..fc515213562 100644
--- a/Build/source/texk/kpathsea/simpletypes.h
+++ b/Build/source/texk/kpathsea/simpletypes.h
@@ -26,8 +26,6 @@
#ifndef KPATHSEA_SIMPLETYPES_H
#define KPATHSEA_SIMPLETYPES_H
-#include <kpathsea/simpletypes.h>
-
#ifdef __cplusplus
extern "C" {
#endif