[GRASS-SVN] r48561 - in grass/trunk: include/Make raster

[svn_grass at osgeo.org]

Author: glynn
Date: 2011-09-29 16:35:42 -0700 (Thu, 29 Sep 2011)
New Revision: 48561

Modified:
   grass/trunk/include/Make/Html.make
   grass/trunk/raster/Makefile
Log:
Fix handling of image files, esp. for parallel make


Modified: grass/trunk/include/Make/Html.make
===================================================================
--- grass/trunk/include/Make/Html.make	2011-09-29 20:25:41 UTC (rev 48560)
+++ grass/trunk/include/Make/Html.make	2011-09-29 23:35:42 UTC (rev 48561)
@@ -10,14 +10,10 @@
 htmldesc = $(call run_grass,$(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(2))
 
 IMGSRC := $(wildcard *.png) $(wildcard *.jpg)
+IMGDST := $(patsubst %,$(HTMLDIR)/%,$(IMGSRC))
 
-$(HTMLDIR)/%.html: %.html %.tmp.html $(HTMLSRC) | $(HTMLDIR)
+$(HTMLDIR)/%.html: %.html %.tmp.html $(HTMLSRC) $(IMGDST) | $(HTMLDIR)
 	$(PYTHON) $(GISBASE)/tools/mkhtml.py $* $(GRASS_VERSION_DATE) > $@
-ifneq ($(strip $(IMGSRC)),)
-	if test -n "$(IMGSRC)" ; then \
-		$(MAKE) $(patsubst %,$(HTMLDIR)/%,$(IMGSRC)) ; \
-	fi
-endif
 
 $(HTMLDIR)/%.png: %.png | $(HTMLDIR)
 	$(INSTALL_DATA) $< $@

Modified: grass/trunk/raster/Makefile
===================================================================
--- grass/trunk/raster/Makefile	2011-09-29 20:25:41 UTC (rev 48560)
+++ grass/trunk/raster/Makefile	2011-09-29 23:35:42 UTC (rev 48561)
@@ -137,3 +137,9 @@
 	$(MAKE) htmldir 
 
 htmldir: parsubdirs
+
+$(HTMLDIR)/r.in.png:
+	# no-op - override Html.make rule for .png image files
+
+$(HTMLDIR)/r.out.png:
+	# no-op - override Html.make rule for .png image files