[GRASS-SVN] r30999 - grass/branches/releasebranch_6_3/imagery

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-04-15 03:45:43 -0400 (Tue, 15 Apr 2008)
New Revision: 30999

Modified:
   grass/branches/releasebranch_6_3/imagery/Makefile
Log:
only compile modules needing Xmons if we have X11 (merge from trunk)

Modified: grass/branches/releasebranch_6_3/imagery/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/imagery/Makefile	2008-04-15 07:44:07 UTC (rev 30998)
+++ grass/branches/releasebranch_6_3/imagery/Makefile	2008-04-15 07:45:43 UTC (rev 30999)
@@ -3,7 +3,6 @@
 SUBDIRS1 = \
 	i.ask \
 	i.atcorr \
-	i.class \
 	i.cluster \
 	i.find \
 	i.gensig \
@@ -11,13 +10,10 @@
 	i.group \
 	i.his.rgb \
 	i.maxlik \
-	i.ortho.photo \
-	i.points \
 	i.rectify \
 	i.rgb.his \
 	i.smap \
 	i.target \
-	i.vpoints \
 	i.pca \
 	i.cca
 
@@ -25,14 +21,17 @@
 
 FFTWBASED = i.fft i.ifft i.zc
 
+XMONBASED = i.class i.ortho.photo i.points i.vpoints
+
 #compile if FFTW present:
 ifneq ($(strip $(FFTWLIB)),)
-    SUBDIRS2 = $(SUBDIRS1) $(FFTWBASED)
-else
-    SUBDIRS2 = $(SUBDIRS1)
+    SUBDIRS += $(FFTWBASED)
 endif
 
-SUBDIRS = $(SUBDIRS2)
+#compile if interactive Xmons are present:
+ifneq ($(USE_X11),)
+    SUBDIRS += $(XMONBASED)
+endif
 
 PGM = imageryintro