[GRASS-SVN] r50760 - in grass/trunk: display/d.extract display/d.what.vect display/d.zoom doc/vector/v.example general/manage/lister imagery/i.vpoints include/Make lib/manage lib/python/ctypes lib/temporal/t.connect lib/vector/neta lib/vector/vedit raster/r.le/r.le.setup raster/r.resamp.bspline raster/simwe/simlib vector/v.clean/test vector/v.in.dwg vector/v.label.sa vector/v.out.ascii vector/v.vect.stats visualization/nviz/src

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Feb 10 17:00:48 EST 2012 

Author: glynn
Date: 2012-02-10 14:00:47 -0800 (Fri, 10 Feb 2012)
New Revision: 50760

Modified:
   grass/trunk/display/d.extract/Makefile
   grass/trunk/display/d.what.vect/Makefile
   grass/trunk/display/d.zoom/Makefile
   grass/trunk/doc/vector/v.example/Makefile
   grass/trunk/general/manage/lister/Makefile
   grass/trunk/imagery/i.vpoints/Makefile
   grass/trunk/include/Make/Grass.make
   grass/trunk/lib/manage/Makefile
   grass/trunk/lib/python/ctypes/Makefile
   grass/trunk/lib/temporal/t.connect/Makefile
   grass/trunk/lib/vector/neta/Makefile
   grass/trunk/lib/vector/vedit/Makefile
   grass/trunk/raster/r.le/r.le.setup/Makefile
   grass/trunk/raster/r.resamp.bspline/Makefile
   grass/trunk/raster/simwe/simlib/Makefile
   grass/trunk/vector/v.clean/test/Makefile
   grass/trunk/vector/v.in.dwg/Makefile
   grass/trunk/vector/v.label.sa/Makefile
   grass/trunk/vector/v.out.ascii/Makefile
   grass/trunk/vector/v.vect.stats/Makefile
   grass/trunk/visualization/nviz/src/Makefile
Log:
Change $(VECTLIB) -> $(VECTORLIB)
Eliminate unnecessary $(DBMILIB) usage


Modified: grass/trunk/display/d.extract/Makefile
===================================================================
--- grass/trunk/display/d.extract/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/display/d.extract/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -2,8 +2,8 @@
 
 PGM = d.extract
 
-LIBES     = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(DATETIMEDEP)
+LIBES     = $(DISPLAYLIB) $(VECTORLIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES= $(VECTORDEP) $(GISDEP) $(DISPLAYDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/display/d.what.vect/Makefile
===================================================================
--- grass/trunk/display/d.what.vect/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/display/d.what.vect/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -3,9 +3,9 @@
 
 PGM = d.what.vect
 
-LIBES        = $(DISPLAYLIB) $(VECTLIB) $(FORMLIB) $(DBMILIB) $(GISLIB)
+LIBES        = $(DISPLAYLIB) $(VECTORLIB) $(FORMLIB) $(DBMILIB) $(GISLIB)
 
-DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(FORMDEP) $(GISDEP)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTORDEP) $(DBMIDEP) $(FORMDEP) $(GISDEP)
 
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 EXTRA_INC = $(VECT_INC)

Modified: grass/trunk/display/d.zoom/Makefile
===================================================================
--- grass/trunk/display/d.zoom/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/display/d.zoom/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -3,8 +3,8 @@
 
 PGM = d.zoom
 
-LIBES     = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB) 
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(DATETIMEDEP)
+LIBES     = $(DISPLAYLIB) $(VECTORLIB) $(GISLIB) $(DATETIMELIB) 
+DEPENDENCIES= $(VECTORDEP) $(GISDEP) $(DISPLAYDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/doc/vector/v.example/Makefile
===================================================================
--- grass/trunk/doc/vector/v.example/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/doc/vector/v.example/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -4,8 +4,8 @@
 
 PGM = v.example
 
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP)
+LIBES = $(VECTORLIB) $(GISLIB)
+DEPENDENCIES= $(VECTORDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/general/manage/lister/Makefile
===================================================================
--- grass/trunk/general/manage/lister/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/general/manage/lister/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTORDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/imagery/i.vpoints/Makefile
===================================================================
--- grass/trunk/imagery/i.vpoints/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/imagery/i.vpoints/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -2,8 +2,8 @@
 
 PGM = i.vpoints
 
-LIBES     = $(IMAGERYLIB) $(SYMBLIB) $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(CURSES) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(SYMBDEP) $(DISPLAYDEP) $(VECTDEP) $(GISDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(SYMBLIB) $(DISPLAYLIB) $(VECTORLIB) $(GISLIB) $(CURSES) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(SYMBDEP) $(DISPLAYDEP) $(VECTORDEP) $(GISDEP) $(GMATHDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/include/Make/Grass.make	2012-02-10 22:00:47 UTC (rev 50760)
@@ -216,7 +216,7 @@
 ROWIODEPS        = $(GISLIB)
 RTREEDEPS        = $(GISLIB) $(MATHLIB)
 SEGMENTDEPS      = $(GISLIB)
-SIMDEPS          = $(VECTLIB) $(RASTERLIB)
+SIMDEPS          = $(VECTORLIB) $(RASTERLIB)
 SITESDEPS        = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(DATETIMELIB)
 STATSDEPS        = $(RASTERLIB) $(GISLIB) $(MATHLIB)
 SYMBDEPS         = $(GISLIB) $(MATHLIB)
@@ -283,8 +283,6 @@
 
 DBMILIB     = $(DBMICLIENTLIB) $(DBMIBASELIB) $(DBMIEXTRALIB)
 GEOMLIB     = $(OPTRILIB) $(SOSLIB) $(LIALIB) $(BASICLIB)
-VECTLIB     = $(VECTORLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(BTREE2LIB) $(GPROJLIB)
 
 DBMIDEPS    = $(DBMICLIENTDEPS) $(DBMIBASEDEPS)
 GEOMDEPS    = $(OPTRIDEPS) $(SOSDEPS) $(LIADEPS) $(BASICDEPS)
-VECTDEPS    = $(VECTORDEPS) $(DIG2DEPS) $(GRAPHDEPS) $(RTREEDEPS) $(LINKMDEPS) $(DBMIDEPS) $(GPROJDEPS)

Modified: grass/trunk/lib/manage/Makefile
===================================================================
--- grass/trunk/lib/manage/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/lib/manage/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../..
 
 LIB = MANAGE
-DEPENDENCIES = $(GISDEP) $(VECTDEP) $(RASTER3DDEP)
+DEPENDENCIES = $(GISDEP) $(VECTORDEP) $(RASTER3DDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

Modified: grass/trunk/lib/python/ctypes/Makefile
===================================================================
--- grass/trunk/lib/python/ctypes/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/lib/python/ctypes/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -18,7 +18,7 @@
 gmath_LIBS      = $(GMATHLIB)
 proj_LIBS       = $(GPROJLIB)
 imagery_LIBS    = $(IMAGERYLIB)
-vector_LIBS     = $(VECTLIB)
+vector_LIBS     = $(VECTORLIB)
 display_LIBS    = $(DISPLAYLIB)
 stats_LIBS      = $(STATSLIB)
 dbmi_LIBS       = $(DBMILIB)

Modified: grass/trunk/lib/temporal/t.connect/Makefile
===================================================================
--- grass/trunk/lib/temporal/t.connect/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/lib/temporal/t.connect/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-LIBES = $(TEMPORALLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(TEMPORALDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(TEMPORALLIB) $(GISLIB)
+DEPENDENCIES = $(TEMPORALDEP) $(GISDEP)
 
 PGM = t.connect
 

Modified: grass/trunk/lib/vector/neta/Makefile
===================================================================
--- grass/trunk/lib/vector/neta/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/lib/vector/neta/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -2,8 +2,8 @@
 
 LIB = NETA
 
-LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(GRAPHLIB)
-DEPENDENCIES= $(VECTDEP) $(DBMIDEP) $(GISDEP) 
+LIBES = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(GRAPHLIB)
+DEPENDENCIES= $(VECTORDEP) $(DBMIDEP) $(GISDEP) 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/lib/vector/vedit/Makefile
===================================================================
--- grass/trunk/lib/vector/vedit/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/lib/vector/vedit/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -2,7 +2,7 @@
 
 LIB = VEDIT
 
-DEPENDENCIES = $(VECTDEP) $(GISDEP)
+DEPENDENCIES = $(VECTORDEP) $(GISDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

Modified: grass/trunk/raster/r.le/r.le.setup/Makefile
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/raster/r.le/r.le.setup/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -2,8 +2,8 @@
 
 PGM = r.le.setup
 
-LIBES = $(DISPLAYLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(DISPLAYDEP) $(SITESDEP) $(VECTDEP) $(GISDEP) $(DATETIMEDEP)
+LIBES = $(DISPLAYLIB) $(SITESLIB) $(VECTORLIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(DISPLAYDEP) $(SITESDEP) $(VECTORDEP) $(GISDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 CLEAN_SUBDIRS = polytocell

Modified: grass/trunk/raster/r.resamp.bspline/Makefile
===================================================================
--- grass/trunk/raster/r.resamp.bspline/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/raster/r.resamp.bspline/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -2,8 +2,8 @@
 
 PGM = r.resamp.bspline
 
-LIBES = $(LIDARLIB) $(GMATHLIB) $(VECTORLIB) $(DBMILIB) $(RASTERLIB) $(SEGMENTLIB) $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(LIDARDEP) $(GMATHDEP) $(VECTORDEP) $(DBMIDEP) $(RASTERDEP) $(SEGMENTDEP) $(GISDEP)
+LIBES = $(LIDARLIB) $(GMATHLIB) $(VECTORLIB) $(RASTERLIB) $(SEGMENTLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(LIDARDEP) $(GMATHDEP) $(VECTORDEP) $(RASTERDEP) $(SEGMENTDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/raster/simwe/simlib/Makefile
===================================================================
--- grass/trunk/raster/simwe/simlib/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/raster/simwe/simlib/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-LIBES = $(GISLIB) $(DATETIMELIB) $(GMATHLIB) $(RASTERLIB) $(VECTLIB)
-DEPENDENCIES = $(GISDEP) $(BITMAPDEP) $(DBMIDEP) $(GMATHDEP) $(LINKMDEP) $(XDRDEP) $(SITESDEP) $(VECTDEP) $(RASTERDEP) $(VECTDEP)
+LIBES = $(GISLIB) $(DATETIMELIB) $(GMATHLIB) $(RASTERLIB) $(VECTORLIB)
+DEPENDENCIES = $(GISDEP) $(BITMAPDEP) $(DBMIDEP) $(GMATHDEP) $(LINKMDEP) $(XDRDEP) $(SITESDEP) $(VECTORDEP) $(RASTERDEP) $(VECTORDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.clean/test/Makefile
===================================================================
--- grass/trunk/vector/v.clean/test/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/vector/v.clean/test/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -2,8 +2,8 @@
 MODULE_TOPDIR = ../../..
 PGM = v.topo.check
 
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP)
+LIBES = $(VECTORLIB) $(GISLIB)
+DEPENDENCIES = $(VECTORDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.in.dwg/Makefile
===================================================================
--- grass/trunk/vector/v.in.dwg/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/vector/v.in.dwg/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -4,8 +4,8 @@
 ADINIT = $(ETC)/adinit.dat
 ADINITSRC := $(shell echo $(OPENDWGINCPATH) | cut -b3- )/adinit/adinit.dat
 
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
-LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(OPENDWGLIBPATH) $(OPENDWGLIB)
+DEPENDENCIES = $(VECTORDEP) $(DBMIDEP) $(GISDEP)
+LIBES     = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(OPENDWGLIBPATH) $(OPENDWGLIB)
 EXTRA_INC = $(VECT_INC) $(OPENDWGINCPATH)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.label.sa/Makefile
===================================================================
--- grass/trunk/vector/v.label.sa/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/vector/v.label.sa/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -3,8 +3,8 @@
 
 PGM = v.label.sa
 
-LIBES = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(FTLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(VECTDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTORLIB) $(GISLIB) $(FTLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(VECTORDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(FTINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.out.ascii/Makefile
===================================================================
--- grass/trunk/vector/v.out.ascii/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/vector/v.out.ascii/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -2,8 +2,8 @@
 
 PGM = v.out.ascii
 
-LIBES = $(VECTORLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(VECTORDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(VECTORLIB) $(GISLIB)
+DEPENDENCIES = $(VECTORDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.vect.stats/Makefile
===================================================================
--- grass/trunk/vector/v.vect.stats/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/vector/v.vect.stats/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -3,12 +3,12 @@
 
 PGM=v.vect.stats
 
-LIBES = $(VECTLIB) $(VECTLIB_REAL) $(STATSLIB) $(GISLIB)
-DEPENDENCIES= $(VECTDEP) $(STATSDEP) $(GISDEP)
+LIBES = $(VECTORLIB) $(STATSLIB) $(GISLIB)
+DEPENDENCIES= $(VECTORDEP) $(STATSDEP) $(GISDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
- 
+
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd	

Modified: grass/trunk/visualization/nviz/src/Makefile
===================================================================
--- grass/trunk/visualization/nviz/src/Makefile	2012-02-10 19:38:42 UTC (rev 50759)
+++ grass/trunk/visualization/nviz/src/Makefile	2012-02-10 22:00:47 UTC (rev 50760)
@@ -40,9 +40,9 @@
 EXTRA_LIBS = $(TCLTKLIBS) $(OGL_LIBS)
 
 LIBES = $(SURFLIB) \
-	$(VECTLIB) $(FORMLIB) $(DBMILIB) \
+	$(VECTORLIB) $(FORMLIB) $(DBMILIB) \
 	$(GISLIB)
 
-DEPENDENCIES = $(VECTDEP) $(BITMAPDEP) $(LINKMDEP) $(FORMDEP) $(DBMIDEP) $(GISDEP)
+DEPENDENCIES = $(VECTORDEP) $(BITMAPDEP) $(LINKMDEP) $(FORMDEP) $(DBMIDEP) $(GISDEP)
 
 default: $(BIN)/$(PGM)$(EXE)

More information about the grass-commit mailing list