[GRASS-SVN] r39071 - in grass/branches/develbranch_6: include/Make swig/python

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-09-07 13:03:05 -0400 (Mon, 07 Sep 2009)
New Revision: 39071

Modified:
   grass/branches/develbranch_6/include/Make/Python.make
   grass/branches/develbranch_6/swig/python/Makefile
Log:
fix PYMOD_LD for OSX
replace OSX archs for swig/python
vector pymod needs GEOSCFLAGS

Modified: grass/branches/develbranch_6/include/Make/Python.make
===================================================================
--- grass/branches/develbranch_6/include/Make/Python.make	2009-09-07 16:02:03 UTC (rev 39070)
+++ grass/branches/develbranch_6/include/Make/Python.make	2009-09-07 17:03:05 UTC (rev 39071)
@@ -1,11 +1,11 @@
 
 PYTHON = python
-PYMOD_LD = $(CXX) -shared
-PYMOD_LDFLAGS = $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
-PYMOD_LDFLAGS := $(PYMOD_LDFLAGS) -bundle -undefined dynamic_lookup
+PYMOD_LD = $(CXX) -bundle -undefined dynamic_lookup
+PYMOD_LDFLAGS := $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR)
 else
-PYMOD_LDFLAGS := $(PYMOD_LDFLAGS) $(PYTHONLDFLAGS)
+PYMOD_LD = $(CXX) -shared
+PYMOD_LDFLAGS := $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR) $(PYTHONLDFLAGS)
 endif
 PYMOD_CFLAGS = $(SHLIB_CFLAGS) $(PYTHONINC) $(PYTHON_CFLAGS)
 

Modified: grass/branches/develbranch_6/swig/python/Makefile
===================================================================
--- grass/branches/develbranch_6/swig/python/Makefile	2009-09-07 16:02:03 UTC (rev 39070)
+++ grass/branches/develbranch_6/swig/python/Makefile	2009-09-07 17:03:05 UTC (rev 39071)
@@ -5,6 +5,12 @@
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
+# substitute OSX arch flags for python
+ifneq ($(MACOSX_ARCHS),)
+CFLAGS := $(subst $(MACOSX_ARCHS),,$(CFLAGS)) $(MACOSX_ARCHS_PYTHON)
+LDFLAGS := $(subst $(MACOSX_ARCHS),,$(LDFLAGS)) $(MACOSX_ARCHS_PYTHON)
+endif
+
 # doxygen:
 DOXNAME=
 DOXINPUT=grasspython.dox
@@ -28,7 +34,7 @@
 trans_LIBS      = $(TRANSLIB)
 vedit_LIBS      = $(VEDITLIB)
 
-EXTRA_INC = $(VECT_INC) $(PROJINC) $(GDALCFLAGS)
+EXTRA_INC = $(VECT_INC) $(PROJINC) $(GDALCFLAGS) $(GEOSCFLAGS)
 
 EXTRA_SWG = ../include/python/my_typemaps.i ../include/python/common.i
 SWIGFLAGS = $(ARCH_INC) -I../include/python -outdir .