|
@@ -146,7 +146,7 @@ XPM_LIBNAME = grass_Xpm
|
|
|
# Vector
|
|
|
DIG_LIBNAME = grass_dig
|
|
|
DIG2_LIBNAME = grass_dig2
|
|
|
-VECTR_LIBNAME = grass_vect
|
|
|
+VECTOR_LIBNAME = grass_vector
|
|
|
TRANS_LIBNAME = grass_trans
|
|
|
|
|
|
SHAPE_LIBNAME = grass_shape
|
|
@@ -251,22 +251,22 @@ DBMILIB = $(DBMICLIENTLIB) $(DBMIBASELIB) $(DBMIEXTRALIB)
|
|
|
# Vector
|
|
|
DIGLIB = -l$(DIG_LIBNAME)
|
|
|
DIG2LIB = -l$(DIG2_LIBNAME) $(GISLIB) $(RTREELIB)
|
|
|
-VECTRLIB = -l$(VECTR_LIBNAME) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GRAPHLIB) $(DIG2LIB) $(GISLIB) $(LINKMLIB) $(RTREELIB)
|
|
|
+VECTORLIB = -l$(VECTOR_LIBNAME) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GRAPHLIB) $(DIG2LIB) $(GISLIB) $(LINKMLIB) $(RTREELIB)
|
|
|
TRANSLIB = -l$(TRANS_LIBNAME)
|
|
|
SHAPELIB = -l$(SHAPE_LIBNAME)
|
|
|
GRAPHLIB = -l$(GRAPH_LIBNAME)
|
|
|
RTREELIB = -l$(RTREE_LIBNAME)
|
|
|
-VEDITLIB = -l$(VEDIT_LIBNAME) $(GISLIB) $(VECTRLIB)
|
|
|
-VECTLIB = $(VECTRLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(GDALLIBS) $(GEOSLIBS)
|
|
|
+VEDITLIB = -l$(VEDIT_LIBNAME) $(GISLIB) $(VECTORLIB)
|
|
|
+VECTLIB = $(VECTORLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(GDALLIBS) $(GEOSLIBS)
|
|
|
|
|
|
# Interpolation
|
|
|
INTERPDATALIB = -l$(INTERPDATA_LIBNAME)
|
|
|
-INTERPFLLIB = -l$(INTERPFL_LIBNAME) $(BITMAPLIB) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(GMATHLIB) $(INTERPDATALIB) $(QTREELIB) $(VECTRLIB)
|
|
|
+INTERPFLLIB = -l$(INTERPFL_LIBNAME) $(BITMAPLIB) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(GMATHLIB) $(INTERPDATALIB) $(QTREELIB) $(VECTORLIB)
|
|
|
QTREELIB = -l$(QTREE_LIBNAME)
|
|
|
|
|
|
# NVIZ related
|
|
|
-OGSFLIB = -l$(OGSF_LIBNAME) $(BITMAPLIB) $(G3DLIB) $(GISLIB) $(SITESLIB) $(VECTRLIB)
|
|
|
-NVIZLIB = -l$(NVIZ_LIBNAME) $(BITMAPLIB) $(G3DLIB) $(GISLIB) $(VECTRLIB)
|
|
|
+OGSFLIB = -l$(OGSF_LIBNAME) $(BITMAPLIB) $(G3DLIB) $(GISLIB) $(SITESLIB) $(VECTORLIB)
|
|
|
+NVIZLIB = -l$(NVIZ_LIBNAME) $(BITMAPLIB) $(G3DLIB) $(GISLIB) $(VECTORLIB)
|
|
|
|
|
|
# triangulation libraries
|
|
|
SOSLIB = -l$(SOS_LIBNAME)
|
|
@@ -284,13 +284,13 @@ SYMBLIB = -l$(SYMB_LIBNAME) $(GISLIB)
|
|
|
CDHCLIB = -l$(CDHC_LIBNAME)
|
|
|
|
|
|
# Lidar
|
|
|
-LIDARLIB = -l$(LIDAR_LIBNAME) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(GMATHLIB) $(VECTRLIB)
|
|
|
+LIDARLIB = -l$(LIDAR_LIBNAME) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(GMATHLIB) $(VECTORLIB)
|
|
|
|
|
|
# Raster/SIMWE
|
|
|
SIMLIB = -l$(SIM_LIBNAME) $(GISLIB) $(SITESLIB)
|
|
|
|
|
|
# Sites (legacy)
|
|
|
-SITESLIB = -l$(SITES_LIBNAME) $(DATETIMELIB) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(VECTRLIB)
|
|
|
+SITESLIB = -l$(SITES_LIBNAME) $(DATETIMELIB) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(VECTORLIB)
|
|
|
|
|
|
# LRS
|
|
|
LRSLIB = -l$(LRS_LIBNAME) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB)
|
|
@@ -347,13 +347,13 @@ DBSTUBSDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DBSTUBS_LIBNAME)$(LIB_SUFFIX)
|
|
|
# Vector
|
|
|
DIGDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DIG_LIBNAME)$(LIB_SUFFIX)
|
|
|
DIG2DEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DIG2_LIBNAME)$(LIB_SUFFIX)
|
|
|
-VECTRDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(VECTR_LIBNAME)$(LIB_SUFFIX)
|
|
|
+VECTORDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(VECTOR_LIBNAME)$(LIB_SUFFIX)
|
|
|
TRANSDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(TRANS_LIBNAME)$(LIB_SUFFIX)
|
|
|
SHAPEDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SHAPE_LIBNAME)$(LIB_SUFFIX)
|
|
|
GRAPHDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(GRAPH_LIBNAME)$(LIB_SUFFIX)
|
|
|
RTREEDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(RTREE_LIBNAME)$(LIB_SUFFIX)
|
|
|
VEDITDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(VEDIT_LIBNAME)$(LIB_SUFFIX)
|
|
|
-VECTDEP = $(VECTRDEP) $(DIG2DEP) $(GRAPHDEP) $(RTREEDEP) $(LINKMDEP) $(DBMIDEP)
|
|
|
+VECTDEP = $(VECTORDEP) $(DIG2DEP) $(GRAPHDEP) $(RTREEDEP) $(LINKMDEP) $(DBMIDEP)
|
|
|
|
|
|
# Interpolation
|
|
|
INTERPDATADEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(INTERPDATA_LIBNAME)$(LIB_SUFFIX)
|