[GRASS-SVN] r48686 - in grass/branches/releasebranch_6_4: misc misc/m.nviz.image visualization

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-09 03:28:34 -0700 (Sun, 09 Oct 2011)
New Revision: 48686

Removed:
   grass/branches/releasebranch_6_4/visualization/nviz2/
Modified:
   grass/branches/releasebranch_6_4/misc/Makefile
   grass/branches/releasebranch_6_4/misc/m.nviz.image/Makefile
   grass/branches/releasebranch_6_4/visualization/Makefile
Log:
nviz_cmd -> m.nviz.image (part 3)
	 (merge r48569 from devbr6)


Modified: grass/branches/releasebranch_6_4/misc/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/misc/Makefile	2011-10-09 10:24:35 UTC (rev 48685)
+++ grass/branches/releasebranch_6_4/misc/Makefile	2011-10-09 10:28:34 UTC (rev 48686)
@@ -1,8 +1,14 @@
 MODULE_TOPDIR = ..
 
+include $(MODULE_TOPDIR)/include/Make/Platform.make
+
 SUBDIRS = \
 	m.cogo
 
+ifneq ($(strip $(OPENGLLIB)),)
+    SUBDIRS += m.nviz.image
+endif
+
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs

Modified: grass/branches/releasebranch_6_4/misc/m.nviz.image/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/misc/m.nviz.image/Makefile	2011-10-09 10:24:35 UTC (rev 48685)
+++ grass/branches/releasebranch_6_4/misc/m.nviz.image/Makefile	2011-10-09 10:28:34 UTC (rev 48686)
@@ -1,4 +1,4 @@
-MODULE_TOPDIR = ../../..
+MODULE_TOPDIR = ../..
 
 PGM = m.nviz.image
 

Modified: grass/branches/releasebranch_6_4/visualization/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/visualization/Makefile	2011-10-09 10:24:35 UTC (rev 48685)
+++ grass/branches/releasebranch_6_4/visualization/Makefile	2011-10-09 10:28:34 UTC (rev 48686)
@@ -11,11 +11,6 @@
 endif
 endif
 
-#compile if OpenGL present
-ifneq ($(strip $(OPENGLLIB)),)
-    SUBDIRS += nviz2
-endif
-
 #compile if Motif present:
 ifneq ($(strip $(XMLIB)),)
     SUBDIRS += xganim