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

[svn_grass at osgeo.org]

Author: neteler
Date: 2012-10-06 10:01:39 -0700 (Sat, 06 Oct 2012)
New Revision: 53327

Modified:
   grass/branches/develbranch_6/gui/Makefile
   grass/branches/develbranch_6/lib/Makefile
Log:
enable Python code compilation only if Python present (fixes trac #1758)

Modified: grass/branches/develbranch_6/gui/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/Makefile	2012-10-06 17:00:17 UTC (rev 53326)
+++ grass/branches/develbranch_6/gui/Makefile	2012-10-06 17:01:39 UTC (rev 53327)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ..
 
-SUBDIRS = icons images scripts xml wxpython
+SUBDIRS = icons images scripts xml
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
@@ -9,6 +9,11 @@
     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-06 17:00:17 UTC (rev 53326)
+++ grass/branches/develbranch_6/lib/Makefile	2012-10-06 17:01:39 UTC (rev 53327)
@@ -35,8 +35,7 @@
 	init \
 	cdhc \
 	stats \
-	arraystats \
-	python
+	arraystats
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
@@ -58,6 +57,11 @@
     SUBDIRS += iostream
 endif
 
+#compile if python present:
+ifneq ($(USE_PYTHON),)
+    SUBDIRS += python
+endif
+
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: headers