[GRASS-SVN] r31328 - grass/branches/develbranch_6/visualization

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-05-13 03:06:24 -0400 (Tue, 13 May 2008)
New Revision: 31328

Modified:
   grass/branches/develbranch_6/visualization/Makefile
Log:
Don't compile NVIZ if Tcl/Tk isn't enabled, fixed by Glynn (merged from trunk)

Modified: grass/branches/develbranch_6/visualization/Makefile
===================================================================
--- grass/branches/develbranch_6/visualization/Makefile	2008-05-13 07:00:14 UTC (rev 31327)
+++ grass/branches/develbranch_6/visualization/Makefile	2008-05-13 07:06:24 UTC (rev 31328)
@@ -2,19 +2,18 @@
 
 SUBDIRS =
 
-OPENGLBASED = nviz
-MOTIFBASED = xganim
-
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
-#compile if OPENGLBASED present:
+#compile if OpenGL and Tcl/Tk present:
 ifneq ($(strip $(OPENGLLIB)),)
-    SUBDIRS += $(OPENGLBASED)
+ifneq ($(strip $(TCLTKLIBS)),)
+    SUBDIRS += nviz
 endif
+endif
 
-#compile if MOTIFBASED present:
+#compile if Motif present:
 ifneq ($(strip $(XMLIB)),)
-    SUBDIRS += $(MOTIFBASED)
+    SUBDIRS += xganim
 endif
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make