[GRASS-SVN] r39446 - in grass/branches/develbranch_6: gui/wxpython gui/wxpython/nviz gui/wxpython/vdigit include/Make swig/python swig/python/NumPtr

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-10-08 08:14:07 -0400 (Thu, 08 Oct 2009)
New Revision: 39446

Modified:
   grass/branches/develbranch_6/gui/wxpython/Makefile
   grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
   grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
   grass/branches/develbranch_6/include/Make/Platform.make.in
   grass/branches/develbranch_6/include/Make/Python.make
   grass/branches/develbranch_6/swig/python/Makefile
   grass/branches/develbranch_6/swig/python/NumPtr/Makefile
Log:
Glynn: Use $(PYTHON) instead of hard-coded "python"
       (merge r39443 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/Makefile	2009-10-08 12:06:58 UTC (rev 39445)
+++ grass/branches/develbranch_6/gui/wxpython/Makefile	2009-10-08 12:14:07 UTC (rev 39446)
@@ -34,7 +34,7 @@
 
 menustrings.py: gui_modules/menudata.py xml/menudata.xml
 	GISBASE="$(GISBASE)" \
-	python $< > $@
+	$(PYTHON) $< > $@
 
 #doxygen:
 DOXNAME=wxpython

Modified: grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/nviz/Makefile	2009-10-08 12:06:58 UTC (rev 39445)
+++ grass/branches/develbranch_6/gui/wxpython/nviz/Makefile	2009-10-08 12:14:07 UTC (rev 39446)
@@ -35,7 +35,7 @@
 $(LIB_NAME).py: $(SHLIB)
 
 $(SHLIB): $(LIB_NAME).i
-	python setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
+	$(PYTHON) setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
 
 .NOTPARALLEL: $(LIB_NAME).py $(LIB_NAME)_wrap.cpp
 

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile	2009-10-08 12:06:58 UTC (rev 39445)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile	2009-10-08 12:14:07 UTC (rev 39446)
@@ -33,7 +33,7 @@
 $(LIB_NAME).py: $(SHLIB)
 
 $(SHLIB): $(LIB_NAME).i
-	python setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
+	$(PYTHON) setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
 
 .NOTPARALLEL: $(LIB_NAME).py $(LIB_NAME)_wrap.cpp
 

Modified: grass/branches/develbranch_6/include/Make/Platform.make.in
===================================================================
--- grass/branches/develbranch_6/include/Make/Platform.make.in	2009-10-08 12:06:58 UTC (rev 39445)
+++ grass/branches/develbranch_6/include/Make/Platform.make.in	2009-10-08 12:14:07 UTC (rev 39446)
@@ -216,6 +216,7 @@
 USE_CAIRO           = @USE_CAIRO@
 
 #Python
+PYTHON              = python
 PYTHONINC           = @PYTHONINC@
 PYTHONCFLAGS        = @PYTHONCFLAGS@
 PYTHONLDFLAGS       = @PYTHONLDFLAGS@

Modified: grass/branches/develbranch_6/include/Make/Python.make
===================================================================
--- grass/branches/develbranch_6/include/Make/Python.make	2009-10-08 12:06:58 UTC (rev 39445)
+++ grass/branches/develbranch_6/include/Make/Python.make	2009-10-08 12:14:07 UTC (rev 39446)
@@ -1,5 +1,4 @@
 
-PYTHON = python
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 PYMOD_LD = $(CXX) -bundle -undefined dynamic_lookup
 PYMOD_LDFLAGS := $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR)

Modified: grass/branches/develbranch_6/swig/python/Makefile
===================================================================
--- grass/branches/develbranch_6/swig/python/Makefile	2009-10-08 12:06:58 UTC (rev 39445)
+++ grass/branches/develbranch_6/swig/python/Makefile	2009-10-08 12:14:07 UTC (rev 39446)
@@ -50,13 +50,14 @@
 
 LIBFILES := $(patsubst %,$(DSTDIR)/_%.so,$(MODULES))
 PYFILES  := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
+PYCFILES  := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
 LLIBFILES := $(patsubst %,_%.so,$(MODULES))
 WRAPFILES := $(patsubst %,%_wrap.c,$(MODULES))
 LPYFILES := $(patsubst %,%.py,$(MODULES))
 
 default:
 	$(MAKE) $(DSTDIR)
-	$(MAKE) $(LLIBFILES) $(WRAPFILES) $(LPYFILES) $(LIBFILES) $(PYFILES)
+	$(MAKE) $(LLIBFILES) $(WRAPFILES) $(LPYFILES) $(LIBFILES) $(PYFILES) $(PYCFILES)
 
 %_wrap.c %.py: ../include/%.i $(EXTRA_SWIG)
 	$(SWIG) $(SWIGFLAGS) -python -o $*_wrap.c -module $* -shadow $<

Modified: grass/branches/develbranch_6/swig/python/NumPtr/Makefile
===================================================================
--- grass/branches/develbranch_6/swig/python/NumPtr/Makefile	2009-10-08 12:06:58 UTC (rev 39445)
+++ grass/branches/develbranch_6/swig/python/NumPtr/Makefile	2009-10-08 12:14:07 UTC (rev 39446)
@@ -3,9 +3,9 @@
 all: numptr
 
 numptr:
-	python setup.py build --build-lib build/lib
+	$(PYTHON) setup.py build --build-lib build/lib
 	# build bytecode .pyc file
-	python build/lib/test.py
+	$(PYTHON) build/lib/test.py >& /dev/null
 
 clean:
 	-rm -rf build/