[GRASS-SVN] r31353 - grass/trunk/raster

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-05-15 07:21:35 -0400 (Thu, 15 May 2008)
New Revision: 31353

Modified:
   grass/trunk/raster/Makefile
Log:
make r.digit and r.out.gdal conditional (sync w devbr6)

Modified: grass/trunk/raster/Makefile
===================================================================
--- grass/trunk/raster/Makefile	2008-05-15 11:16:17 UTC (rev 31352)
+++ grass/trunk/raster/Makefile	2008-05-15 11:21:35 UTC (rev 31353)
@@ -19,7 +19,6 @@
 	r.covar \
 	r.cross \
 	r.describe \
-	r.digit \
 	r.distance \
 	r.drain \
 	r.fill.dir \
@@ -50,7 +49,6 @@
 	r.out.arc \
 	r.out.ascii \
 	r.out.bin \
-	r.out.gdal \
 	r.out.gridatb \
 	r.out.mat \
 	r.out.mpeg \
@@ -112,7 +110,7 @@
 	simwe \
 	wildfire
 
-GDALBASED = r.in.gdal
+GDALBASED = r.in.gdal r.out.gdal
 
 FFTWBASED = r.surf.fractal
 
@@ -122,6 +120,9 @@
 
 TIFFBASED = r.out.tiff
 
+XMONBASED = r.digit
+
+
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
 #compile if GDAL present:
@@ -149,6 +150,12 @@
     SUBDIRS += $(TIFFBASED)
 endif
 
+#compile if interactive Xmons are present:
+ifneq ($(USE_X11),)
+    SUBDIRS += $(XMONBASED)
+endif
+
+
 PGM = rasterintro
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make