Change $(VECTLIB) -> $(VECTORLIB)

Eliminate unnecessary $(DBMILIB) usage


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50760 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.extract/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 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)
 

display/d.what.vect/Makefile

@@ -3,9 +3,9 @@ MODULE_TOPDIR = ../..
 
 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)

display/d.zoom/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 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)
 

doc/vector/v.example/Makefile

@@ -4,8 +4,8 @@ MODULE_TOPDIR = ../../..
 
 PGM = v.example
 
-LIBES = $(VECTLIB) $(GISLIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP)
+LIBES = $(VECTORLIB) $(GISLIB)
+DEPENDENCIES= $(VECTORDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

general/manage/lister/Makefile

@@ -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)
 

imagery/i.vpoints/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 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)
 

include/Make/Grass.make

@@ -216,7 +216,7 @@ RLIDEPS          = $(RASTERLIB) $(GISLIB) $(MATHLIB)
 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 @@ endif
 
 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)

lib/manage/Makefile

@@ -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

lib/python/ctypes/Makefile

@@ -18,7 +18,7 @@ raster_LIBS     = $(RASTERLIB)
 gmath_LIBS      = $(GMATHLIB)
 proj_LIBS       = $(GPROJLIB)
 imagery_LIBS    = $(IMAGERYLIB)
-vector_LIBS     = $(VECTLIB)
+vector_LIBS     = $(VECTORLIB)
 display_LIBS    = $(DISPLAYLIB)
 stats_LIBS      = $(STATSLIB)
 dbmi_LIBS       = $(DBMILIB)

lib/temporal/t.connect/Makefile

@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-LIBES = $(TEMPORALLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(TEMPORALDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(TEMPORALLIB) $(GISLIB)
+DEPENDENCIES = $(TEMPORALDEP) $(GISDEP)
 
 PGM = t.connect
 

lib/vector/neta/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../../..
 
 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)
 

lib/vector/vedit/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../../..
 
 LIB = VEDIT
 
-DEPENDENCIES = $(VECTDEP) $(GISDEP)
+DEPENDENCIES = $(VECTORDEP) $(GISDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

raster/r.le/r.le.setup/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../../..
 
 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

raster/r.resamp.bspline/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 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)
 

raster/simwe/simlib/Makefile

@@ -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)
 

vector/v.clean/test/Makefile

@@ -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)
 

vector/v.in.dwg/Makefile

@@ -4,8 +4,8 @@ PGM=v.in.dwg
 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)
 

vector/v.label.sa/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 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)
 

vector/v.out.ascii/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 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)
 

vector/v.vect.stats/Makefile

@@ -3,12 +3,12 @@ MODULE_TOPDIR = ../..
 
 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	

visualization/nviz/src/Makefile

@@ -40,9 +40,9 @@ EXTRA_LDFLAGS=$(TCLTKLIBPATH)
 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)