[GRASS-SVN] r57805 - grass/trunk/raster/r.colors

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Sep 22 03:47:08 PDT 2013


Author: martinl
Date: 2013-09-22 03:47:08 -0700 (Sun, 22 Sep 2013)
New Revision: 57805

Modified:
   grass/trunk/raster/r.colors/Makefile
Log:
r.colors: no need to thumbnails sed tricks, see r57804

Modified: grass/trunk/raster/r.colors/Makefile
===================================================================
--- grass/trunk/raster/r.colors/Makefile	2013-09-22 10:45:38 UTC (rev 57804)
+++ grass/trunk/raster/r.colors/Makefile	2013-09-22 10:47:08 UTC (rev 57805)
@@ -10,21 +10,8 @@
 
 include $(MODULE_TOPDIR)/include/Make/Multi.make
 
-default: multi
+default: multi thumbnails
 
-# Insert thumbnail previews
-r.colors.tmp.html: $(BIN)/r.colors$(EXE) thumbnails
-	$(call htmldesc,$<,$@)
-	sed 's!^<dd><b>\([a-z0-9._]*\)</b>:!<dd><img width="80" height="12" src="colortables/\1.png"> <b>\1</b>:!' "$@" > "$@.tmp"
-	mv -f "$@.tmp" "$@"
-	$(MAKE) thumbnails
-
-r3.colors.tmp.html: $(BIN)/r3.colors$(EXE) thumbnails
-	$(call htmldesc,$<,$@)
-	sed 's!^<dd><b>\([a-z0-9._]*\)</b>:!<dd><img width="80" height="12" src="colortables/\1.png"> <b>\1</b>:!' "$@" > "$@.tmp"
-	mv -f "$@.tmp" "$@"
-	$(MAKE) thumbnails
-
 thumbnails: $(BIN)/r.mapcalc$(EXE) $(HTMLDIR)/colortables
 	-$(call run_grass, $(GRASS_HOME)/tools/thumbnails.py)
 
@@ -35,7 +22,3 @@
 	$(MAKE) -C ../r.mapcalc
 
 .PHONY: thumbnails
-
-.INTERMEDIATE: r.colors.tmp.html r3.colors.tmp.html
-
-



More information about the grass-commit mailing list