r7877 - software/branches/thumbnails/smp_optipng/debian

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-26 09:08:16 +0000 (Sat, 26 Jul 2008)
New Revision: 7877

Modified:
   software/branches/thumbnails/smp_optipng/debian/rules
Log:
break the optipng and jpegoptim stages out into separate target so -jX can parallelize them

Modified: software/branches/thumbnails/smp_optipng/debian/rules
===================================================================
--- software/branches/thumbnails/smp_optipng/debian/rules	2008-07-26 08:40:05 UTC (rev 7876)
+++ software/branches/thumbnails/smp_optipng/debian/rules	2008-07-26 09:08:16 UTC (rev 7877)
@@ -25,33 +25,35 @@
 	dh_clean -k 
 	dh_installdirs
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_install -i
+INPUTPNG := $(wildcard *png)
+INPUTJPG := $(wildcard *jpg)
 
+THUMBDEST := debian/games-thumbnails/usr/share/games/thumbnails
+OUTPUTPNG := $(addprefix $(THUMBDEST)/, $(INPUTPNG))
+OUTPUTJPG := $(addprefix $(THUMBDEST)/, $(INPUTJPG))
+
+$(OUTPUTPNG): $(THUMBDEST)/%.png: %.png install
+	cp -p $< $@
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 # http://lists.debian.org/debian-devel-games/2008/03/msg00123.html
-	cd "$(CURDIR)/debian/games-thumbnails/" && \
-	for i in `find usr/share/games/thumbnails/ -name "*.png"`; do \
-		echo "Optimizing image $$i"; \
-		optipng -q "$$i" ; \
-		advpng -q -z4 "$$i" ; \
-		done
+	optipng -q $@
+	advpng -q -z4 $@
 endif
 
+$(OUTPUTJPG): $(THUMBDEST)/%.jpg: %.jpg install
+	cp -p $< $@
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	cd "$(CURDIR)/debian/games-thumbnails/" && \
-	for i in `find usr/share/games/thumbnails/ -name "*.jpeg"` \
-			`find usr/share/games/thumbnails/ -name "*.jpg"` ; do \
-		echo "Optimizing image $$i"; \
-		jpegoptim -q "$$i" ; \
-		done
+	jpegoptim -q $@
 endif
 
+crunchedpics: $(OUTPUTJPG) $(OUTPUTPNG)
+
+# Build architecture-independent files here.
+binary-indep: build install crunchedpics
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
 	dh_link
 	dh_compress -i
 	dh_fixperms -i
@@ -64,4 +66,4 @@
 binary-arch: build install
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure crunchedpics