From 29503e94a1553e5307a26f495f59d714aaa562fc Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 5 Aug 2011 10:21:50 +0000 Subject: kpathsea: Do not install kpathsea internal headers git-svn-id: svn://tug.org/texlive/trunk@23423 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 4 +++ Build/source/texk/kpathsea/Makefile.am | 48 +++++++++++++++--------------- Build/source/texk/kpathsea/Makefile.in | 53 +++++++++++++++++----------------- 3 files changed, 55 insertions(+), 50 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index d3bc3105ecb..3a61e5b53d0 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -4,6 +4,10 @@ * Makefile.am (kpseinclude_HEADERS): Remove recorder.h. * recorder.h (removed): Empty file. + * Makefile.am: Do not install kpathsea internal headers. + + * xdirtest.c: Additional test data. + 2011-08-04 Peter Breitenlohner More diffs between TeX Live and W32TeX. diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index 07da8d81e3d..d5040794466 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -110,7 +110,17 @@ nodist_kpseinclude_HEADERS = \ kpathsea.h \ paths.h -kpseinclude_HEADERS = \ +kpseinclude_HEADERS = $(special_headers) $(normal_headers) + +# Headers treated specially when building kpathsea.h +# +special_headers = \ + config.h \ + knj.h \ + mingw32.h \ + win32lib.h + +normal_headers = \ absolute.h \ c-ctype.h \ c-dir.h \ @@ -128,20 +138,13 @@ kpseinclude_HEADERS = \ c-unistd.h \ cnf.h \ concatn.h \ - config.h \ - db.h \ debug.h \ - default.h \ expand.h \ - fn.h \ - fontmap.h \ getopt.h \ hash.h \ - knj.h \ lib.h \ line.h \ magstep.h \ - mingw32.h \ pathsearch.h \ proginit.h \ progname.h \ @@ -153,12 +156,17 @@ kpseinclude_HEADERS = \ tex-glyph.h \ tex-hush.h \ tex-make.h \ - tilde.h \ - truncate.h \ types.h \ variable.h \ - version.h \ - win32lib.h \ + version.h + +noinst_HEADERS = \ + db.h \ + default.h \ + fn.h \ + fontmap.h \ + tilde.h \ + truncate.h \ xopendir.h \ xstat.h @@ -192,18 +200,10 @@ stamp-paths: texmf.cnf bsnl.awk cnf-to-paths.awk kpathsea.h: Makefile paths.h rm -f $@ echo '/* This is a generated file */' >$@ - echo '/* collecting all kpathsea headers. */' >>$@ - echo '#include ' >>$@ - echo '#include ' >>$@ - echo '#include ' >>$@ - (cd $(srcdir) && ls -1 *.h) \ - | sed -e '/^config\.h/d' \ - -e '/^paths\.h/d' \ - -e '/^knj\.h/d' \ - -e '/^kpathsea\.h/d' \ - -e '/^mingw32\.h/d' \ - -e '/^win32lib\.h/d' \ - -e 's,^,#include ,' >>$@ + echo '/* collecting all public kpathsea headers. */' >>$@ + for f in config.h c-auto.h paths.h $(normal_headers); do \ + echo "#include " >>$@; \ + done EXTRA_DIST += bsnl.awk cnf-to-paths.awk diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 779e6f241f4..b6efd2fa0a9 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -47,7 +47,7 @@ EXTRA_PROGRAMS = xdirtest$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_noinst_DATA) \ $(dist_noinst_SCRIPTS) $(dist_web2c_DATA) \ - $(dist_web2c_SCRIPTS) $(kpseinclude_HEADERS) \ + $(dist_web2c_SCRIPTS) $(kpseinclude_HEADERS) $(noinst_HEADERS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/depcomp \ @@ -198,7 +198,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) -HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) +HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \ + $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -392,7 +393,17 @@ nodist_kpseinclude_HEADERS = \ kpathsea.h \ paths.h -kpseinclude_HEADERS = \ +kpseinclude_HEADERS = $(special_headers) $(normal_headers) + +# Headers treated specially when building kpathsea.h +# +special_headers = \ + config.h \ + knj.h \ + mingw32.h \ + win32lib.h + +normal_headers = \ absolute.h \ c-ctype.h \ c-dir.h \ @@ -410,20 +421,13 @@ kpseinclude_HEADERS = \ c-unistd.h \ cnf.h \ concatn.h \ - config.h \ - db.h \ debug.h \ - default.h \ expand.h \ - fn.h \ - fontmap.h \ getopt.h \ hash.h \ - knj.h \ lib.h \ line.h \ magstep.h \ - mingw32.h \ pathsearch.h \ proginit.h \ progname.h \ @@ -435,12 +439,17 @@ kpseinclude_HEADERS = \ tex-glyph.h \ tex-hush.h \ tex-make.h \ - tilde.h \ - truncate.h \ types.h \ variable.h \ - version.h \ - win32lib.h \ + version.h + +noinst_HEADERS = \ + db.h \ + default.h \ + fn.h \ + fontmap.h \ + tilde.h \ + truncate.h \ xopendir.h \ xstat.h @@ -1803,18 +1812,10 @@ stamp-paths: texmf.cnf bsnl.awk cnf-to-paths.awk kpathsea.h: Makefile paths.h rm -f $@ echo '/* This is a generated file */' >$@ - echo '/* collecting all kpathsea headers. */' >>$@ - echo '#include ' >>$@ - echo '#include ' >>$@ - echo '#include ' >>$@ - (cd $(srcdir) && ls -1 *.h) \ - | sed -e '/^config\.h/d' \ - -e '/^paths\.h/d' \ - -e '/^knj\.h/d' \ - -e '/^kpathsea\.h/d' \ - -e '/^mingw32\.h/d' \ - -e '/^win32lib\.h/d' \ - -e 's,^,#include ,' >>$@ + echo '/* collecting all public kpathsea headers. */' >>$@ + for f in config.h c-auto.h paths.h $(normal_headers); do \ + echo "#include " >>$@; \ + done install-exec-hook: @WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \ -- cgit v1.2.3