[GRASS-SVN] r50703 - in grass/branches/releasebranch_6_4: gui/wxpython/xml raster/r.le

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-02-07 03:13:10 -0800 (Tue, 07 Feb 2012)
New Revision: 50703

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml
   grass/branches/releasebranch_6_4/raster/r.le/Makefile
Log:
these r.le modules need Xterms and Xmons (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml	2012-02-07 11:11:21 UTC (rev 50702)
+++ grass/branches/releasebranch_6_4/gui/wxpython/xml/menudata.xml	2012-02-07 11:13:10 UTC (rev 50703)
@@ -1420,10 +1420,10 @@
 	      <command>r.le.patch</command>
 	    </menuitem>
 	    <menuitem>
-	      <label>Output</label>
+	      <label>Summary and display (requires XTerm)</label>
 	      <help>Displays the boundary of each r.le patch and shows how the boundary is traced, displays the attribute, size, perimeter and shape indices for each patch and saves the data in an output file.</help>
 	      <keywords>raster,landscape structure analysis,patch index</keywords>
-	      <handler>OnMenuCmd</handler>
+	      <handler>OnXTerm</handler>
 	      <command>r.le.trace</command>
 	    </menuitem>
 	  </items>

Modified: grass/branches/releasebranch_6_4/raster/r.le/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.le/Makefile	2012-02-07 11:11:21 UTC (rev 50702)
+++ grass/branches/releasebranch_6_4/raster/r.le/Makefile	2012-02-07 11:13:10 UTC (rev 50703)
@@ -3,11 +3,20 @@
 
 SUBDIRS = \
 	r.le.patch \
-	r.le.pixel \
-	r.le.setup \
-	r.le.trace
+	r.le.pixel
 # r.le.setup/polytocell
 
+XMONBASED = r.le.setup r.le.trace
+
+
+include $(MODULE_TOPDIR)/include/Make/Platform.make
+
+#compile if interactive Xmons are present:
+ifneq ($(USE_X11),)
+    SUBDIRS += $(XMONBASED)
+endif
+
+
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs