diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-02-29 09:01:39 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-02-29 09:01:39 +0000 |
commit | b3b83f29f4b772d782b82d7d6fc11ae6e4017e5e (patch) | |
tree | 4bf8d7941c181e91aa060c2cf1e16b934cbb6ab0 /Build | |
parent | 42ed754b638337823d5fc5db98b9a8ab960e4b2b (diff) |
build system: Specify that libptexenc requires libkpathsea (required for Cygwin DLL)
git-svn-id: svn://tug.org/texlive/trunk@25538 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/ptexenc/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/Makefile.in | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/Build/source/texk/ptexenc/ChangeLog b/Build/source/texk/ptexenc/ChangeLog index 1d316aa8691..23ecf51a44d 100644 --- a/Build/source/texk/ptexenc/ChangeLog +++ b/Build/source/texk/ptexenc/ChangeLog @@ -1,3 +1,8 @@ +2012-02-29 Ken Brown <kbrow1i@gmail.com> + + * Makefile.am (libptexenc_la_LIBADD): Add $(KPATHSEA_LIBS) as + required with `-no-undefined' (at least for Cygwin). + 2012-01-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * ptexenc/ptexenc.h, ptexenc.c: add set_prior_file_enc() in order to diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am index a3bcac840ca..299711bf896 100644 --- a/Build/source/texk/ptexenc/Makefile.am +++ b/Build/source/texk/ptexenc/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/ptexenc/ ## -## Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -29,6 +29,10 @@ libptexenc_la_SOURCES = \ unicode-jp.c \ unicode.c +$(libptexenc_la_OBJECTS): $(KPATHSEA_DEPEND) + +libptexenc_la_LIBADD = $(KPATHSEA_LIBS) + ## Rebuild libkpathsea @KPATHSEA_RULE@ diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index 4740431bf17..a95de7c9b41 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/Makefile.in @@ -97,7 +97,8 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libptexenc_la_LIBADD = +am__DEPENDENCIES_1 = +libptexenc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libptexenc_la_OBJECTS = libptexenc_la-kanjicnv.lo \ libptexenc_la-ptexenc.lo libptexenc_la-unicode-jp.lo \ libptexenc_la-unicode.lo @@ -277,6 +278,7 @@ libptexenc_la_SOURCES = \ unicode-jp.c \ unicode.c +libptexenc_la_LIBADD = $(KPATHSEA_LIBS) nobase_include_HEADERS = \ ptexenc/ptexenc.h \ ptexenc/unicode.h @@ -810,6 +812,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS .PHONY: rebuild rebuild: all +$(libptexenc_la_OBJECTS): $(KPATHSEA_DEPEND) + @KPATHSEA_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. |