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

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-02-07 02:30:25 -0800 (Tue, 07 Feb 2012)
New Revision: 50699

Modified:
   grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
   grass/branches/develbranch_6/raster/r.le/Makefile
Log:
specify r.le modules that need xterms and xmons (r.le.setup is interactive with an xmon, r.le.trace draws to a display driver but also is interactive in the terminal window)

Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2012-02-07 05:35:30 UTC (rev 50698)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2012-02-07 10:30:25 UTC (rev 50699)
@@ -1445,7 +1445,7 @@
 	      <label>Output</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/develbranch_6/raster/r.le/Makefile
===================================================================
--- grass/branches/develbranch_6/raster/r.le/Makefile	2012-02-07 05:35:30 UTC (rev 50698)
+++ grass/branches/develbranch_6/raster/r.le/Makefile	2012-02-07 10:30:25 UTC (rev 50699)
@@ -3,11 +3,16 @@
 
 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
+
+#compile if interactive Xmons are present:
+ifneq ($(USE_X11),)
+    SUBDIRS += $(XMONBASED)
+endif
+
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs