[GRASS-SVN] r33771 - in grass/branches/develbranch_6/gui/wxpython: nviz vdigit

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2008-10-08 23:42:43 -0400 (Wed, 08 Oct 2008)
New Revision: 33771

Modified:
   grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
   grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
Log:
PYTHONLDFLAGS not needed on OSX for Python modules

Modified: grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/nviz/Makefile	2008-10-09 03:26:38 UTC (rev 33770)
+++ grass/branches/develbranch_6/gui/wxpython/nviz/Makefile	2008-10-09 03:42:43 UTC (rev 33771)
@@ -7,7 +7,12 @@
 SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
 
 EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS) $(XCFLAGS) $(XMINC)
-EXTRA_LIBS = $(GISLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS) $(OGSFLIB) $(NVIZLIB) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_LIBS = $(GISLIB) $(WXWIDGETSLIB) $(OGSFLIB) $(NVIZLIB) $(OPENGLLIB) $(OPENGLULIB)
+ifeq ($(findstring darwin,$(ARCH)),darwin)
+EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
+else
+EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS)
+endif
 
 LOCAL_HEADERS = nviz.h
 

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile	2008-10-09 03:26:38 UTC (rev 33770)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile	2008-10-09 03:42:43 UTC (rev 33771)
@@ -7,11 +7,11 @@
 SHLIB_OBJS := $(patsubst %.cpp, $(OBJDIR)/%.o, $(SOURCES))
 
 EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
-EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB) $(PYTHONLDFLAGS)
+EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
 EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
 else
-EXTRA_LIBS := $(EXTRA_LIBS) -lgdi
+EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS) -lgdi
 endif
 
 LOCAL_HEADERS = digit.h driver.h