summaryrefslogtreecommitdiff
path: root/Build/source/texk/ptexenc
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-04 08:50:20 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-06-04 08:50:20 +0000
commit2300ccb10e93ce75ca3e3dcf2b26bd4600761a47 (patch)
tree37a33bbefeac5a45bf01648b1e27c91c000902c9 /Build/source/texk/ptexenc
parentd99cbbf7e8cc585a93ea5db4531c0da771c1f0ee (diff)
misc cleanup
git-svn-id: svn://tug.org/texlive/trunk@18715 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ptexenc')
-rw-r--r--Build/source/texk/ptexenc/ChangeLog.TL5
-rw-r--r--Build/source/texk/ptexenc/Makefile.am3
-rw-r--r--Build/source/texk/ptexenc/Makefile.in45
3 files changed, 12 insertions, 41 deletions
diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL
index de57a930de3..33cd2cf3db4 100644
--- a/Build/source/texk/ptexenc/ChangeLog.TL
+++ b/Build/source/texk/ptexenc/ChangeLog.TL
@@ -1,6 +1,11 @@
ChangeLog.TL: TeX Live (TL) changes for ptexenc
===============================================
+2010-05-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (nobase_nodist_include_HEADERS): Removed,
+ don't install ptexenc/c-auto.h.
+
2010-05-20 Peter Breitenlohner <peb@mppmu.mpg.de>
Moved headers (except jisx0208.h) to ptexenc/, removed patches/.
diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am
index cbd9e7765ce..200653e4db0 100644
--- a/Build/source/texk/ptexenc/Makefile.am
+++ b/Build/source/texk/ptexenc/Makefile.am
@@ -30,9 +30,6 @@ libptexenc_la_SOURCES = \
## Rebuild libkpathsea
@KPATHSEA_RULE@
-nobase_nodist_include_HEADERS = \
- ptexenc/c-auto.h
-
nobase_include_HEADERS = \
ptexenc/kanjicnv.h \
ptexenc/ptexenc.h \
diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in
index 531b8e4d5ff..140dc928eca 100644
--- a/Build/source/texk/ptexenc/Makefile.in
+++ b/Build/source/texk/ptexenc/Makefile.in
@@ -88,8 +88,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \
- "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libptexenc_la_LIBADD =
am_libptexenc_la_OBJECTS = libptexenc_la-kanjicnv.lo \
@@ -114,7 +113,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libptexenc_la_SOURCES)
DIST_SOURCES = $(libptexenc_la_SOURCES)
-HEADERS = $(nobase_include_HEADERS) $(nobase_nodist_include_HEADERS)
+HEADERS = $(nobase_include_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -264,9 +263,6 @@ libptexenc_la_SOURCES = \
unicode-jp.c \
unicode.c
-nobase_nodist_include_HEADERS = \
- ptexenc/c-auto.h
-
nobase_include_HEADERS = \
ptexenc/kanjicnv.h \
ptexenc/ptexenc.h \
@@ -454,29 +450,6 @@ uninstall-nobase_includeHEADERS:
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(includedir)" && rm -f $$files
-install-nobase_nodist_includeHEADERS: $(nobase_nodist_include_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
- @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
- $(am__nobase_list) | while read dir files; do \
- xfiles=; for file in $$files; do \
- if test -f "$$file"; then xfiles="$$xfiles $$file"; \
- else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
- test -z "$$xfiles" || { \
- test "x$$dir" = x. || { \
- echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
- $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
- echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
- $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
- done
-
-uninstall-nobase_nodist_includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
- $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(includedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -681,7 +654,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -733,8 +706,7 @@ info: info-am
info-am:
-install-data-am: install-nobase_includeHEADERS \
- install-nobase_nodist_includeHEADERS
+install-data-am: install-nobase_includeHEADERS
install-dvi: install-dvi-am
@@ -782,8 +754,7 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \
- uninstall-nobase_nodist_includeHEADERS
+uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS
.MAKE: install-am install-strip
@@ -797,15 +768,13 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-libLTLIBRARIES \
- install-man install-nobase_includeHEADERS \
- install-nobase_nodist_includeHEADERS install-pdf \
+ install-man install-nobase_includeHEADERS install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-libLTLIBRARIES \
- uninstall-nobase_includeHEADERS \
- uninstall-nobase_nodist_includeHEADERS
+ uninstall-nobase_includeHEADERS
# Rebuild