diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-08-22 07:27:58 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-08-22 07:27:58 +0000 |
| commit | ed85084d9945941b0d27169d252280f00d7aa1d8 (patch) | |
| tree | c104688e7b15286759a6ca22f8027a8f3aaf4e3d | |
| parent | 1612bfd9e3f1db86e943626640b71cdf3df5b9a0 (diff) | |
texk/dvipng: Add explicit dependency on freetype2 and libpng
git-svn-id: svn://tug.org/texlive/trunk@35007 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/dvipng/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/Makefile.am | 8 | ||||
| -rw-r--r-- | Build/source/texk/dvipng/Makefile.in | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 7103cb8c332..6b16ab99351 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2014-08-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Add explicit dependency on freetype2 and libpng. + 2014-02-26 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Drop AC_FUNC_{ALLOCA,FORK} (results not used). diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index d382ac58fb6..98c7fbbdcac 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipng/ ## -## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -64,7 +64,7 @@ nodist_dvipng_SOURCES += \ @DVIPNG_TREE@/tfm.c endif have_ft2 -dvipng_dependencies = $(KPATHSEA_DEPEND) $(GD_DEPEND) +dvipng_dependencies = $(KPATHSEA_DEPEND) $(GD_DEPEND) $(FREETYPE2_DEPEND) $(LIBPNG_DEPEND) $(dvipng_OBJECTS): config.force @@ -86,6 +86,10 @@ dvigif_LDADD = @KPATHSEA_RULE@ ## Rebuild gd @GD_RULE@ +## Rebuild freetype2 +@FREETYPE2_RULE@ +## Rebuild libpng +@LIBPNG_RULE@ include $(srcdir)/../../am/bin_links.am diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 3465b0b5a25..9b92d2fa0b7 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -646,7 +646,7 @@ nodist_dvipng_SOURCES = @DVIPNG_TREE@/color.c @DVIPNG_TREE@/draw.c \ @DVIPNG_TREE@/papersiz.c @DVIPNG_TREE@/pk.c \ @DVIPNG_TREE@/ppagelist.c @DVIPNG_TREE@/set.c \ @DVIPNG_TREE@/special.c @DVIPNG_TREE@/vf.c $(am__append_1) -dvipng_dependencies = $(KPATHSEA_DEPEND) $(GD_DEPEND) +dvipng_dependencies = $(KPATHSEA_DEPEND) $(GD_DEPEND) $(FREETYPE2_DEPEND) $(LIBPNG_DEPEND) DISTCLEANFILES = config.force LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) \ $(ZLIB_LIBS) @@ -1496,6 +1496,8 @@ config.force: $(dvipng_dependencies) @KPATHSEA_RULE@ @GD_RULE@ +@FREETYPE2_RULE@ +@LIBPNG_RULE@ .PHONY: install-bin-links uninstall-bin-links install-bin-links: |