[GRASS-SVN] r53334 - in grass/branches/develbranch_6: gui lib

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-08 04:43:42 -0700 (Mon, 08 Oct 2012)
New Revision: 53334

Modified:
   grass/branches/develbranch_6/gui/Makefile
   grass/branches/develbranch_6/lib/Makefile
Log:
revert r53327


Modified: grass/branches/develbranch_6/gui/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/Makefile	2012-10-08 11:31:58 UTC (rev 53333)
+++ grass/branches/develbranch_6/gui/Makefile	2012-10-08 11:43:42 UTC (rev 53334)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ..
 
-SUBDIRS = icons images scripts xml
+SUBDIRS = icons images scripts xml wxpython
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
@@ -9,11 +9,6 @@
     SUBDIRS += tcltk
 endif
 
-#compile if python present:
-ifneq ($(USE_PYTHON),)
-    SUBDIRS += wxpython
-endif
-
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs

Modified: grass/branches/develbranch_6/lib/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/Makefile	2012-10-08 11:31:58 UTC (rev 53333)
+++ grass/branches/develbranch_6/lib/Makefile	2012-10-08 11:43:42 UTC (rev 53334)
@@ -35,7 +35,8 @@
 	init \
 	cdhc \
 	stats \
-	arraystats
+	arraystats \
+	python
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
@@ -57,11 +58,6 @@
     SUBDIRS += iostream
 endif
 
-#compile if python present:
-ifneq ($(USE_PYTHON),)
-    SUBDIRS += python
-endif
-
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: headers