[GRASS-SVN] r33922 - in grass/branches/develbranch_6: gui/wxpython/nviz gui/wxpython/vdigit lib/ogsf

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2008-10-16 12:20:57 -0400 (Thu, 16 Oct 2008)
New Revision: 33922

Modified:
   grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
   grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
   grass/branches/develbranch_6/lib/ogsf/Makefile
Log:
use += for EXTRA_* additions

Modified: grass/branches/develbranch_6/gui/wxpython/nviz/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/nviz/Makefile	2008-10-16 14:57:51 UTC (rev 33921)
+++ grass/branches/develbranch_6/gui/wxpython/nviz/Makefile	2008-10-16 16:20:57 UTC (rev 33922)
@@ -9,15 +9,15 @@
 EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
 EXTRA_LIBS = $(GISLIB) $(WXWIDGETSLIB) $(OGSFLIB) $(NVIZLIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
-EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
+EXTRA_LIBS += -bundle -undefined dynamic_lookup
 else
-EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS)
+EXTRA_LIBS += $(PYTHONLDFLAGS)
 endif
 ifeq ($(OPENGL_X11),1)
-EXTRA_LIBS := $(EXTRA_LIBS) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB)
-EXTRA_CFLAGS := $(EXTRA_CFLAGS) $(XCFLAGS) $(XMINC)
+EXTRA_LIBS += $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_CFLAGS += $(XCFLAGS) $(XMINC)
 else
-EXTRA_LIBS := $(EXTRA_LIBS) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_LIBS += $(OPENGLLIB) $(OPENGLULIB)
 endif
 
 LOCAL_HEADERS = nviz.h

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile	2008-10-16 14:57:51 UTC (rev 33921)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/Makefile	2008-10-16 16:20:57 UTC (rev 33922)
@@ -9,9 +9,9 @@
 EXTRA_CFLAGS = $(SHLIB_CFLAGS) $(GDALCFLAGS) $(PYTHONCFLAGS) $(WXWIDGETSCXXFLAGS)
 EXTRA_LIBS = $(VECTLIB) $(GISLIB) $(GDALLIBS) $(VEDITLIB) $(WXWIDGETSLIB)
 ifeq ($(findstring darwin,$(ARCH)),darwin)
-EXTRA_LIBS := -bundle -undefined dynamic_lookup $(EXTRA_LIBS)
+EXTRA_LIBS += -bundle -undefined dynamic_lookup
 else
-EXTRA_LIBS := $(PYTHONLDFLAGS) $(EXTRA_LIBS) -lgdi
+EXTRA_LIBS += $(PYTHONLDFLAGS) -lgdi
 endif
 
 LOCAL_HEADERS = digit.h driver.h

Modified: grass/branches/develbranch_6/lib/ogsf/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/Makefile	2008-10-16 14:57:51 UTC (rev 33921)
+++ grass/branches/develbranch_6/lib/ogsf/Makefile	2008-10-16 16:20:57 UTC (rev 33922)
@@ -3,9 +3,9 @@
 EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB)
 
 ifeq ($(OPENGL_X11),1)
-EXTRA_LIBS := $(EXTRA_LIBS) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_LIBS += $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB)
 else
-EXTRA_LIBS := $(EXTRA_LIBS) $(OPENGLLIB) $(OPENGLULIB)
+EXTRA_LIBS += $(OPENGLLIB) $(OPENGLULIB)
 endif
 
 LIB_NAME = $(OGSF_LIBNAME)
@@ -17,7 +17,7 @@
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
 ifeq ($(OPENGL_X11),1)
-EXTRA_CFLAGS := $(EXTRA_CFLAGS) $(XCFLAGS)
+EXTRA_CFLAGS += $(XCFLAGS)
 endif
 
 default: lib