summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-06 09:40:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-06 09:40:06 +0000
commit832b5ce3848de5ca76c493570fc066f450ec8011 (patch)
tree52b629b6cd51b3769658ae55dc1f511c0bcac222 /Build/source/texk/dvipng
parent7d7828afcc587d0e0889fb0a62cdfe25c53cb9d2 (diff)
build system: Move Makefile fragments from libs/am/ and texk/am/ to top-level/am.
git-svn-id: svn://tug.org/texlive/trunk@31117 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng')
-rw-r--r--Build/source/texk/dvipng/ChangeLog10
-rw-r--r--Build/source/texk/dvipng/Makefile.am4
-rw-r--r--Build/source/texk/dvipng/Makefile.in8
-rw-r--r--Build/source/texk/dvipng/doc/Makefile.am2
-rw-r--r--Build/source/texk/dvipng/doc/Makefile.in12
-rwxr-xr-xBuild/source/texk/dvipng/dvipng.test6
6 files changed, 28 insertions, 14 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 423687e527e..eede51b66d7 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,13 @@
+2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, doc/Makefile.am:
+ Moved Makefile fragments to ../../am/.
+
+2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * dvipng.test: ALso run 'dvipng --gif'.
+ * Makefile.am (CLEANFILES): Adapted.
+
2013-05-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* version.ac (new): Define dvipng version.
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index 5093a596ab3..641a39d92d6 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -89,7 +89,7 @@ dvigif_LDADD =
## Rebuild gd
@GD_RULE@
-include $(srcdir)/../am/bin_links.am
+include $(srcdir)/../../am/bin_links.am
bin_links = dvipng$(EXEEXT):dvigif
@@ -106,5 +106,5 @@ TESTS = dvipng.test
EXTRA_DIST += dvipng.test dvipng-test.dvi
-CLEANFILES = dvipng-test*.png
+CLEANFILES = dvipng-test*.gif dvipng-test*.png
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 08fcb30640a..33c42843e63 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -86,7 +86,7 @@ bin_PROGRAMS = dvipng$(EXEEXT) $(am__EXEEXT_1)
@have_ft2_TRUE@ @DVIPNG_TREE@/sfd.c \
@have_ft2_TRUE@ @DVIPNG_TREE@/tfm.c
-DIST_COMMON = $(srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/../../am/bin_links.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
$(top_srcdir)/../texlive/w32_wrapper/callexe.c \
@@ -657,7 +657,7 @@ nodist_dvigif_SOURCES = callexe.c
dvigif_LDADD =
bin_links = dvipng$(EXEEXT):dvigif
TESTS = dvipng.test
-CLEANFILES = dvipng-test*.png
+CLEANFILES = dvipng-test*.gif dvipng-test*.png
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -665,7 +665,7 @@ all: config.h
.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -688,7 +688,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../am/bin_links.am:
+$(srcdir)/../../am/bin_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
diff --git a/Build/source/texk/dvipng/doc/Makefile.am b/Build/source/texk/dvipng/doc/Makefile.am
index 7be4acd76e4..a0deb0c362c 100644
--- a/Build/source/texk/dvipng/doc/Makefile.am
+++ b/Build/source/texk/dvipng/doc/Makefile.am
@@ -42,7 +42,7 @@ dvipng.1: dvipng.texi readme.texi
# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
man1_links = dvipng:dvigif
-include $(top_srcdir)/../am/man1_links.am
+include $(top_srcdir)/../../am/man1_links.am
if have_gif
install-data-hook: install-man1-links
diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in
index 1a8f8194a1d..ba8fc30f957 100644
--- a/Build/source/texk/dvipng/doc/Makefile.in
+++ b/Build/source/texk/dvipng/doc/Makefile.in
@@ -78,10 +78,10 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/../am/man1_links.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(dist_noinst_SCRIPTS) \
- $(dvipng_TEXINFOS) $(top_srcdir)/../../build-aux/texinfo.tex \
- $(dist_man1_MANS)
+DIST_COMMON = $(top_srcdir)/../../am/man1_links.am \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(dist_noinst_SCRIPTS) $(dvipng_TEXINFOS) \
+ $(top_srcdir)/../../build-aux/texinfo.tex $(dist_man1_MANS)
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
@@ -363,7 +363,7 @@ all: $(BUILT_SOURCES)
.SUFFIXES:
.SUFFIXES: .dvi .html .info .pdf .ps .texi
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -384,7 +384,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../am/man1_links.am:
+$(top_srcdir)/../../am/man1_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
diff --git a/Build/source/texk/dvipng/dvipng.test b/Build/source/texk/dvipng/dvipng.test
index baaba3c8b77..8aa8eaba249 100755
--- a/Build/source/texk/dvipng/dvipng.test
+++ b/Build/source/texk/dvipng/dvipng.test
@@ -24,4 +24,8 @@ export TEXMFCNF TEXFONTMAPS ENCFONTS TEXMFMAIN TEXMFDIST TEXMFLOCAL
./dvipng -T tight -strict $srcdir/dvipng-test.dvi || exit 1
-echo View the result e.g. with display dvipng-test\*.png
+echo View the result e.g. with display dvipng-test\*.png
+
+./dvipng --gif -T tight -strict $srcdir/dvipng-test.dvi || exit 1
+
+echo View the result e.g. with display dvipng-test\*.gif