[GRASS-SVN] r45762 - in grass-addons/gui/wxpython/psmap: docs images

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Mar 26 10:43:25 EDT 2011


Author: martinl
Date: 2011-03-26 07:43:25 -0700 (Sat, 26 Mar 2011)
New Revision: 45762

Modified:
   grass-addons/gui/wxpython/psmap/docs/Makefile
   grass-addons/gui/wxpython/psmap/images/Makefile
Log:
wxGUI/psmap: use Makefiles from GRASS6


Modified: grass-addons/gui/wxpython/psmap/docs/Makefile
===================================================================
--- grass-addons/gui/wxpython/psmap/docs/Makefile	2011-03-26 14:04:00 UTC (rev 45761)
+++ grass-addons/gui/wxpython/psmap/docs/Makefile	2011-03-26 14:43:25 UTC (rev 45762)
@@ -1,7 +1,16 @@
 MODULE_TOPDIR = ../../..
 
-include $(MODULE_TOPDIR)/include/Make/Other.make
+HTML_SOURCES := $(wildcard *.html)
+HTML_FILES := $(filter-out $(wildcard *.tmp.html),$(HTML_SOURCES))
+FILES := $(subst .html,,$(HTML_FILES))
 
-FILES := $(wildcard *.html)
+include $(MODULE_TOPDIR)/include/Make/Platform.make
+include $(MODULE_TOPDIR)/include/Make/Grass.make
+include $(MODULE_TOPDIR)/include/Make/Rules.make
 
-default: $(patsubst %,$(HTMLDIR)/%,$(FILES))
+default:
+	for file in $(FILES) ; do \
+	    rm -f $$file.tmp.html ; \
+	    rm -f "$(GISBASE)/docs/html/$$file.html"; \
+	    $(MAKE) htmldir PGM=$$file; \
+	done

Modified: grass-addons/gui/wxpython/psmap/images/Makefile
===================================================================
--- grass-addons/gui/wxpython/psmap/images/Makefile	2011-03-26 14:04:00 UTC (rev 45761)
+++ grass-addons/gui/wxpython/psmap/images/Makefile	2011-03-26 14:43:25 UTC (rev 45762)
@@ -1,6 +1,8 @@
 MODULE_TOPDIR = ../..
 
-include $(MODULE_TOPDIR)/include/Make/Other.make
+include $(MODULE_TOPDIR)/include/Make/Platform.make
+include $(MODULE_TOPDIR)/include/Make/Grass.make
+include $(MODULE_TOPDIR)/include/Make/Rules.make
 
 ETCDIR = $(ETC)/gui/images
 



More information about the grass-commit mailing list