summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-01 13:29:00 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-01 13:29:00 +0000
commita7d0d5b80f2b788f11ed7b8c286d46aa26f3a38d (patch)
treeebc6916f9ff3eae18b9f5a9067ac4b151ab0544f /Build/source
parentde175a032d27b2f22d2394b1c4b42734a211271d (diff)
texk/web2c/pdftexdir: build system fix
git-svn-id: svn://tug.org/texlive/trunk@16893 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/TL-Changes29
-rw-r--r--Build/source/texk/web2c/Makefile.in8
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/libpdftex.am4
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am4
5 files changed, 20 insertions, 32 deletions
diff --git a/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/TL-Changes b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/TL-Changes
index 2ee4d8230d3..8df7ba86772 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/TL-Changes
+++ b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/TL-Changes
@@ -13,30 +13,11 @@ Removed:
Converted Dos/Win line ends to native:
docs/README.MSVC6
docs/sdocbook.css
- msvc6/zzcat.dsp
- msvc6/zzdir.dsp
- msvc6/zzip.dsp
- msvc6/zziplib.dsp
- msvc6/zziplib.dsw
- msvc6/zziptest.dsp
- msvc6/zzipwrap.dsp
- msvc6/zzobfuscated.dsp
- msvc7/zzcat.sln
- msvc7/zzdir.sln
- msvc7/zzip.sln
- msvc7/zziplib.sln
- msvc7/zzipself.sln
- msvc7/zzipsetstub.sln
- msvc7/zziptest.sln
- msvc7/zzobfuscated.sln
- msvc8/zzcat.sln
- msvc8/zzdir.sln
- msvc8/zzip.sln
- msvc8/zziplib.sln
- msvc8/zzipself.sln
- msvc8/zzipsetstub.sln
- msvc8/zziptest.sln
- msvc8/zzobfuscated.sln
+ msvc6/*.dsp
+ msvc6/*.dsw
+ msvc7/*.sln
+ msvc8/*.sln
+ msvc8/*.vcproj
zzip/file.h
zzip/stdint.h
zzip/zziplib.wpj
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index b1c1f671ce9..1eaac0518d8 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -7989,8 +7989,8 @@ etrip-clean:
rm -f tripos.tex 8terminal.tex
rm -rf tfm
-# We must create libpdftex.a (and zlib) before building the pdftex_OBJECTS.
-$(pdftex_OBJECTS): libpdftex.a $(ZLIB_DEPEND)
+# We must create libpdftex.a before building the pdftex_OBJECTS.
+$(pdftex_OBJECTS): libpdftex.a
$(pdftex_c_h): pdftex-web2c
@$(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
@@ -8016,8 +8016,8 @@ pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexd
pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
$(tie) -c pdftex.ch $(pdftex_ch_srcs)
-# We must create pdftexd.h (and xpdf) before building the libpdftex_a_OBJECTS.
-$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND)
+# We must create pdftexd.h (and xpdf...) before building the libpdftex_a_OBJECTS.
+$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND)
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 1730f863d95..3151c53a9c6 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/libpdftex.am (libpdftex_a_OBJECTS): Add dependency on
+ $(ZLIB_DEPEND) and $(LIBPNG_DEPEND).
+ * am/pdftex.am (pdftex_OBJECTS): Remove explicit dependency on
+ $(ZLIB_DEPEND) alread implied by libpdftex.a.
+
2010-01-27 Peter Breitenlohner <peb@mppmu.mpg.de>
* avl.c (avl_copy): Proper handling of const.
diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
index 77773d2f0c2..0842c91fd14 100644
--- a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
@@ -53,8 +53,8 @@ libpdftex_a_SOURCES += \
pdftexdir/inc-epdf.h \
pdftexdir/inc-extra.h
-# We must create pdftexd.h (and xpdf) before building the libpdftex_a_OBJECTS.
-$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND)
+# We must create pdftexd.h (and xpdf...) before building the libpdftex_a_OBJECTS.
+$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
## included by pdftexdir/writettf.c
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index 98528582528..6c1e87788c8 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -36,8 +36,8 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
-# We must create libpdftex.a (and zlib) before building the pdftex_OBJECTS.
-$(pdftex_OBJECTS): libpdftex.a $(ZLIB_DEPEND)
+# We must create libpdftex.a before building the pdftex_OBJECTS.
+$(pdftex_OBJECTS): libpdftex.a
pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c pdftexdir/pdftexextra.h