[GRASS-SVN] r32542 - in grass/trunk: include/Make lib/iostream

[svn_grass at osgeo.org]

Author: pkelly
Date: 2008-08-05 15:09:41 -0400 (Tue, 05 Aug 2008)
New Revision: 32542

Modified:
   grass/trunk/include/Make/Grass.make.in
   grass/trunk/lib/iostream/Makefile
Log:
Compile iostream lib as static to work around C++ linking problems
on some OSes


Modified: grass/trunk/include/Make/Grass.make.in
===================================================================
--- grass/trunk/include/Make/Grass.make.in	2008-08-05 14:09:39 UTC (rev 32541)
+++ grass/trunk/include/Make/Grass.make.in	2008-08-05 19:09:41 UTC (rev 32542)
@@ -284,6 +284,7 @@
 # These always static
 ISMAPDEP    = $(ARCH_LIBDIR)/$(STLIB_PREFIX)$(ISMAP_LIBNAME)$(STLIB_SUFFIX)
 MANAGEDEP   = $(ARCH_LIBDIR)/$(STLIB_PREFIX)$(MANAGE_LIBNAME)$(STLIB_SUFFIX)
+IOSTREAMDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(IOSTREAM_LIBNAME)$(STLIB_SUFFIX)
 
 ARRAYSTATSDEP    = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(ARRAYSTATS_LIBNAME)$(LIB_SUFFIX)
 BITMAPDEP   = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(BITMAP_LIBNAME)$(LIB_SUFFIX)
@@ -309,7 +310,6 @@
 ICONDEP     = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(ICON_LIBNAME)$(LIB_SUFFIX)
 IMAGERYDEP  = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(IMAGERY_LIBNAME)$(LIB_SUFFIX)
 IORTHODEP   = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(IORTHO_LIBNAME)$(LIB_SUFFIX)
-IOSTREAMDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(IOSTREAM_LIBNAME)$(LIB_SUFFIX)
 LINKMDEP    = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(LINKM_LIBNAME)$(LIB_SUFFIX)
 LOCKDEP     = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(LOCK_LIBNAME)$(LIB_SUFFIX)
 RASTERDEP   = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(RASTER_LIBNAME)$(LIB_SUFFIX)

Modified: grass/trunk/lib/iostream/Makefile
===================================================================
--- grass/trunk/lib/iostream/Makefile	2008-08-05 14:09:39 UTC (rev 32541)
+++ grass/trunk/lib/iostream/Makefile	2008-08-05 19:09:41 UTC (rev 32542)
@@ -9,4 +9,4 @@
 	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
 endif
 
-default: lib
+default: stlib