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

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-12-25 13:07:51 -0800 (Sat, 25 Dec 2010)
New Revision: 44723

Modified:
   grass/trunk/include/Make/Grass.make
Log:
Fix LIB/DEP/DEPS confusion



Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2010-12-25 20:43:32 UTC (rev 44722)
+++ grass/trunk/include/Make/Grass.make	2010-12-25 21:07:51 UTC (rev 44723)
@@ -221,9 +221,9 @@
 STATSDEPS        = $(RASTERLIB) $(GISLIB) $(MATHLIB)	# NB: doesn't use libgis directly
 SYMBDEPS         = $(GISLIB) $(MATHLIB)
 TRANSDEPS        = $(MATHLIB)
-VECTORDEPS       = $(DBMILIB) $(GRAPHLIB) $(DIG2LIB) $(LINKMLIB) $(RTREELIB) $(GISLIB) $(GEOSLIBS) $(GDALLIBS) $(MATHLIB) $(BTREE2LIB) $(GPROJDEP)
+VECTORDEPS       = $(DBMILIB) $(GRAPHLIB) $(DIG2LIB) $(LINKMLIB) $(RTREELIB) $(GISLIB) $(GEOSLIBS) $(GDALLIBS) $(MATHLIB) $(BTREE2LIB) $(GPROJLIB)
 VEDITDEPS        = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
-NETADEPS         = $(VECTORDEP) $(DBMIDEP) $(GISDEP)
+NETADEPS         = $(VECTORLIB) $(DBMILIB) $(GISLIB)
 
 ifneq ($(USE_X11),)
 CAIRODRIVERDEPS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)
@@ -280,6 +280,6 @@
 GEOMLIB     = $(OPTRILIB) $(SOSLIB) $(LIALIB) $(BASICLIB)
 VECTLIB     = $(VECTORLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(BTREE2LIB) $(GPROJLIB)
 
-DBMIDEP     = $(DBMICLIENTDEP) $(DBMIBASEDEP)
-GEOMDEP     = $(OPTRIDEP) $(SOSDEP) $(LIADEP) $(BASICDEP)
-VECTDEP     = $(VECTORDEP) $(DIG2DEP) $(GRAPHDEP) $(RTREEDEP) $(LINKMDEP) $(DBMIDEP) $(GPROJDEP)
+DBMIDEPS    = $(DBMICLIENTDEPS) $(DBMIBASEDEPS)
+GEOMDEPS    = $(OPTRIDEPS) $(SOSDEPS) $(LIADEPS) $(BASICDEPS)
+VECTDEPS    = $(VECTORDEPS) $(DIG2DEPS) $(GRAPHDEPS) $(RTREEDEPS) $(LINKMDEPS) $(DBMIDEPS) $(GPROJDEPS)