[GRASS-SVN] r54213 - grass/trunk/include/Make

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Dec 5 09:31:53 PST 2012


Author: martinl
Date: 2012-12-05 09:31:52 -0800 (Wed, 05 Dec 2012)
New Revision: 54213

Modified:
   grass/trunk/include/Make/GuiScript.make
Log:
fix GuiScript.make for parallel builds (patch provided by Glynn Clements)


Modified: grass/trunk/include/Make/GuiScript.make
===================================================================
--- grass/trunk/include/Make/GuiScript.make	2012-12-05 16:34:48 UTC (rev 54212)
+++ grass/trunk/include/Make/GuiScript.make	2012-12-05 17:31:52 UTC (rev 54213)
@@ -11,7 +11,10 @@
 GUIHTML  := $(patsubst %,$(HTMLDIR)/wxGUI.%.html,$(MODULES))
 PYFILES  := $(patsubst %,$(SCRIPTDIR)/g.gui.%,$(MODULES))
 
-guiscript: $(CMDHTML) $(GUIHTML) $(IMGDST) $(PYFILES)
+guiscript: $(IMGDST) $(PYFILES)
+	$(MAKE) $(CMDHTML)
+	-rm -f g.gui.*.tmp.html
+	$(MAKE) $(GUIHTML)
 
 $(HTMLDIR)/g.gui.%.html: g.gui.%.html g.gui.%.tmp.html | $(HTMLDIR)
 	$(PYTHON) $(GISBASE)/tools/mkhtml.py g.gui.$* $(GRASS_VERSION_DATE) > $@
@@ -25,3 +28,5 @@
 
 $(SCRIPTDIR)/g.gui.%: g.gui.%.py | $(SCRIPTDIR)
 	$(INSTALL) $< $@
+
+.PHONY: guiscript



More information about the grass-commit mailing list