changeset 1751:9812d23322ba

Actually revert the depency changes for PNG/PPM images.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 18 Oct 2017 17:56:49 +0300
parents 4db581ac116d
children 1672f44c68d6
files world/Makefile.inc
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/world/Makefile.inc	Wed Oct 18 17:04:10 2017 +0300
+++ b/world/Makefile.inc	Wed Oct 18 17:56:49 2017 +0300
@@ -45,13 +45,13 @@
 ###
 ### PNG images
 ###
-%.script: %.map %.loc title.png $(MAP_FONT) $(MKLOC_BIN)
+%.script: %.map %.loc title.png $(MAP_FONT)
 	$(MKLOC_BIN) -S -m $< -l $(patsubst %.map,%.loc,$<) -f $(MAP_FONT_SCALE) -u $(MAP_UNIT_SIZE) -s $(MAP_SCALE) | \
 	sed -e "s/@OPTS_START@/-font $(MAP_FONT) -pointsize 14 -type TruecolorMatte/g" \
 	-e "s/@OPTS_END@/\t-geometry +0+0 title.png -composite -compose screen \\\\\n\t-pointsize 20 -fill white -box none -draw \"text 5,50 \'@PAF@\n\n\n/g" | \
 	sed -e "/@PAF@/r $(patsubst %.map,%.desc,$<)" -e "s/@PAF@//g" > $@
 
-%.ppm: %.map $(MAP2PPM_BIN)
+%.ppm: %.map
 	$(MAP2PPM_BIN) -s $(MAP_SCALE) $(COLORMAP_EXTRA) $< -o $@
 
 %.png: %.ppm %.script %.desc