[GRASS-SVN] r38904 - grass/trunk/include/Make

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-08-28 12:12:39 -0400 (Fri, 28 Aug 2009)
New Revision: 38904

Modified:
   grass/trunk/include/Make/Grass.make
Log:
Update dependencies


Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2009-08-28 16:11:29 UTC (rev 38903)
+++ grass/trunk/include/Make/Grass.make	2009-08-28 16:12:39 UTC (rev 38904)
@@ -177,53 +177,50 @@
 	XPM:xpm \
 	IOSTREAM:iostream
 
-ARRAYSTATSDEPS  = $(GISLIB)
-BITMAPDEPS      = $(LINKMLIB)
-CAIRODRIVERDEPS = $(DRIVERLIB) $(GISLIB) $(CAIROLIB) $(FCLIB)
-CLUSTERDEPS     = $(IMAGERYLIB) $(GISLIB)
-DBMIBASEDEPS    = $(GISLIB)
-DBMICLIENTDEPS  = $(DBMIBASELIB) $(GISLIB)
-DBMIDRIVERDEPS  = $(DBMIBASELIB) $(DBSTUBSLIB) $(GISLIB)
-DBSTUBSDEPS     = $(DBMIBASELIB) $(GISLIB)
-DIG2DEPS        = $(GISLIB) $(RTREELIB)
-DISPLAYDEPS     = $(GISLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(HTMLDRIVERLIB) \
-		$(DRIVERLIB) $(RASTERLIB)
-DRIVERDEPS      = $(GISLIB) $(FTLIB) $(ICONVLIB)
-FORMDEPS        = $(DBMILIB) $(GISLIB)
-G3DDEPS         = $(RASTERLIB) $(GISLIB)
-GISDEPS         = $(DATETIMELIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(INTLLIB) \
-		$(MATHLIB) $(ZLIBLIBPATH) $(ZLIB)
-GMATHDEPS       = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB)
-GPDEDEPS        = $(GISLIB) $(G3DLIB)
-GPROJDEPS       = $(GISLIB) $(PROJLIB) $(GDALLIBS)
-HTMLDRIVERDEPS  = $(DRIVERLIB) $(GISLIB)
-IMAGERYDEPS     = $(GISLIB)
-INTERPFLDEPS    = $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(INTERPDATALIB) \
-		$(QTREELIB) $(VECTLIB) $(RASTERLIB) $(GISLIB)
-IORTHODEPS      = $(IMAGERYLIB) $(GISLIB)
-LIDARDEPS       = $(VECTLIB) $(DBMILIB) $(RASTERLIB) $(SEGMENTLIB) $(GMATHLIB) \
-		$(GISLIB) $(MATHLIB)
-LRSDEPS         = $(VECTLIB) $(DBMILIB) $(GISLIB)
-MANAGEDEPS	= $(VECTLIB) $(G3DLIB) $(GISLIB)
-NVIZDEPS        = $(BITMAPLIB) $(SITESLIB) $(VECTLIB) $(G3DLIB) $(OGSFLIB) \
-		$(RASTERLIB) $(GISLIB) $(OPENGLLIB)
-OGSFDEPS        = $(SITESLIB) $(G3DLIB) $(RASTERLIB) $(BITMAPLIB) $(VECTLIB) \
-		$(GISLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) \
-		$(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB)
-PNGDRIVERDEPS   = $(DRIVERLIB) $(GISLIB) $(PNGLIB)
-PSDRIVERDEPS    = $(DRIVERLIB) $(GISLIB)
-RASTERDEPS      = $(GISLIB) $(XDRLIB) $(SOCKLIB)
-RLIDEPS         = $(RASTERLIB) $(GISLIB)
-SEGMENTDEPS     = $(GISLIB)
-SIMDEPS         = $(BITMAPLIB) $(GMATHLIB) $(LINKMLIB) $(SITESLIB) $(VECTLIB) \
-		$(DBMILIB) $(GISLIB)
-SITESDEPS       = $(DBMILIB) $(VECTORLIB) $(GISLIB) $(DATETIMELIB) 
-STATSDEPS       = $(GISLIB)
-SYMBDEPS        = $(GISLIB)
-VECTORDEPS      = $(DBMILIB) $(GRAPHLIB) $(DIG2LIB) $(GISLIB) $(LINKMLIB) \
-		$(RTREELIB) $(GDALLIBS) $(GEOSLIBS)
-VEDITDEPS       = $(GISLIB) $(VECTORLIB)
 
+ARRAYSTATSDEPS   = $(GISLIB) $(MATHLIB)
+BITMAPDEPS       = $(LINKMLIB)
+CAIRODRIVERDEPS  = $(DRIVERLIB) $(GISLIB) $(CAIROLIB) $(FCLIB)
+CDHCDEPS         = $(MATHLIB)
+CLUSTERDEPS      = $(IMAGERYLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DBMIBASEDEPS     = $(GISLIB)
+DBMICLIENTDEPS   = $(DBMIBASELIB) $(GISLIB)
+DBMIDRIVERDEPS   = $(DBMIBASELIB) $(DBSTUBSLIB) $(GISLIB)
+DBSTUBSDEPS      = $(DBMIBASELIB) $(GISLIB)
+DIG2DEPS         = $(GISLIB) $(RTREELIB) $(MATHLIB)
+DISPLAYDEPS      = $(HTMLDRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DRIVERDEPS       = $(GISLIB) $(FTLIB) $(ICONVLIB) $(MATHLIB)
+DSPFDEPS         = $(GISLIB)
+FORMDEPS         = $(DBMILIB) $(GISLIB)
+G3DDEPS          = $(RASTERLIB) $(GISLIB)
+GISDEPS          = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(INTLLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
+GMATHDEPS        = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB)
+GPDEDEPS         = $(G3DLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+GPROJDEPS        = $(GISLIB) $(GDALLIBS) $(PROJLIB) $(MATHLIB)
+HTMLDRIVERDEPS   = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
+IMAGERYDEPS      = $(GISLIB) $(MATHLIB)
+INTERPFLDEPS     = $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(INTERPDATALIB) $(QTREELIB) $(VECTORLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+#IORTHODEPS       = $(IMAGERYLIB) $(GISLIB)
+LIDARDEPS        = $(VECTORLIB) $(DBMILIB) $(GMATHLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+LRSDEPS          = $(DBMILIB) $(GISLIB)
+MANAGEDEPS       = $(G3DLIB) $(VECTORLIB) $(GISLIB)
+NVIZDEPS         = $(OGSFLIB) $(GISLIB) $(OPENGLLIB)
+OGSFDEPS         = $(BITMAPLIB) $(G3DLIB) $(VECTORLIB) $(RASTERLIB) $(GISLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(TIFFLIBPATH) $(TIFFLIB) $(OPENGLLIB) $(OPENGLULIB) $(MATHLIB)
+PNGDRIVERDEPS    = $(DRIVERLIB) $(GISLIB) $(PNGLIB) $(MATHLIB)
+PSDRIVERDEPS     = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
+RASTERDEPS       = $(GISLIB) $(XDRLIB) $(SOCKLIB) $(MATHLIB)
+RLIDEPS          = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+ROWIODEPS        = $(GISLIB)
+RTREEDEPS        = $(MATHLIB)
+SEGMENTDEPS      = $(GISLIB)
+#SIMDEPS          = $(VECTLIB) $(BITMAPLIB) $(GMATHLIB) $(LINKMLIB) $(SITESLIB) $(DBMILIB) $(GISLIB)
+SITESDEPS        = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+STATSDEPS        = $(RASTERLIB) $(GISLIB) $(MATHLIB)	# NB: doesn't use libgis directly
+SYMBDEPS         = $(GISLIB) $(MATHLIB)
+TRANSDEPS        = $(MATHLIB)
+VECTORDEPS       = $(DBMILIB) $(GRAPHLIB) $(DIG2LIB) $(LINKMLIB) $(RTREELIB) $(GISLIB) $(GEOSLIB) $(GDALLIBS) $(MATHLIB)
+VEDITDEPS        = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
+
 ifneq ($(USE_X11),)
 CAIRODRIVERDEPS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)
 endif