Put dependencies where they belong

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

imagery/i.fft/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = i.fft
 
-LIBES     = $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(FFTWLIB) $(MATHLIB)
+LIBES     = $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(MATHLIB)
 DEPENDENCIES= $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

imagery/i.ifft/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = i.ifft
 
-LIBES     = $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(FFTWLIB) $(MATHLIB)
+LIBES     = $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(MATHLIB)
 DEPENDENCIES= $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

imagery/i.zc/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = i.zc
 
-LIBES     = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(FFTWLIB)
+LIBES     = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB)
 DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

include/Make/Grass.make

@@ -103,291 +103,136 @@ MANBASEDIR = $(ARCH_DISTDIR)/man
 MANDIR = $(MANBASEDIR)/man$(MANSECT)
 HTML2MAN = VERSION_NUMBER=$(GRASS_VERSION_NUMBER) $(GISBASE)/tools/g.html2man.py
 
-##################### library names #####################################
-
-ARRAYSTATS_LIBNAME        = grass_arraystats
-BITMAP_LIBNAME        = grass_bitmap
-BTREE_LIBNAME         = grass_btree
-CLUSTER_LIBNAME       = grass_cluster
-COORCNV_LIBNAME       = grass_coorcnv
-DATETIME_LIBNAME      = grass_datetime
-DBDIALOG_LIBNAME      = grass_dbdialog
-DISPLAY_LIBNAME       = grass_display
-DLG_LIBNAME           = grass_dlg
-DSPF_LIBNAME          = grass_dspf
-DRIVER_LIBNAME        = grass_driver
-PNGDRIVER_LIBNAME     = grass_pngdriver
-PSDRIVER_LIBNAME      = grass_psdriver
-CAIRODRIVER_LIBNAME   = grass_cairodriver
-HTMLDRIVER_LIBNAME    = grass_htmldriver
-EDIT_LIBNAME          = grass_edit
-G3D_LIBNAME	      = grass_g3d
-GIS_LIBNAME	      = grass_gis
-GMATH_LIBNAME         = grass_gmath
-GPDE_LIBNAME          = grass_gpde
-GPROJ_LIBNAME         = grass_gproj
-IBTREE_LIBNAME        = grass_ibtree
-ICON_LIBNAME          = grass_icon
-IMAGERY_LIBNAME       = grass_imagery
-IORTHO_LIBNAME        = grass_Iortho
-IOSTREAM_LIBNAME      = grass_iostream
-ISMAP_LIBNAME         = grass_ismap
-LINKM_LIBNAME         = grass_linkm
-LOCK_LIBNAME          = grass_lock
-MANAGE_LIBNAME        = grass_manage
-RASTER_LIBNAME        = grass_raster
-ROWIO_LIBNAME         = grass_rowio
-SEGMENT_LIBNAME       = grass_segment
-STATS_LIBNAME	      = grass_stats
-XGD_LIBNAME	      = grass_Xgd
-XGI_LIBNAME	      = grass_Xgi
-XPM_LIBNAME	      = grass_Xpm
-
-# Vector
-DIG_LIBNAME           = grass_dig
-DIG2_LIBNAME          = grass_dig2
-VECTOR_LIBNAME        = grass_vector
-TRANS_LIBNAME         = grass_trans
-
-SHAPE_LIBNAME         = grass_shape
-GRAPH_LIBNAME         = grass_dgl
-RTREE_LIBNAME         = grass_rtree
-
-VEDIT_LIBNAME         = grass_vedit
-
-# Interpolation
-INTERPDATA_LIBNAME    = grass_interpdata
-INTERPFL_LIBNAME      = grass_interpfl
-QTREE_LIBNAME         = grass_qtree
-
-# NVIZ related
-OGSF_LIBNAME          = grass_ogsf
-NVIZ_LIBNAME          = grass_nviz
-
-# triangulation libraries
-SOS_LIBNAME           = grass_sos
-LIA_LIBNAME           = grass_lia
-OPTRI_LIBNAME         = grass_optri
-BASIC_LIBNAME         = grass_basic
-
-XDISPLAY_LIBNAME      = grass_Xdisplay
-
-# DBMI
-DBMI_LIBNAME          = grass_dbmi
-DBMIBASE_LIBNAME      = grass_dbmibase
-DBMICLIENT_LIBNAME    = grass_dbmiclient
-DBMIDRIVER_LIBNAME    = grass_dbmidriver
-SQLP_LIBNAME          = grass_sqlp
-DBSTUBS_LIBNAME       = grass_dbstubs
-
-# database forms
-FORM_LIBNAME          = grass_form
-
-# Symbols (icons, patterns)
-SYMB_LIBNAME          = grass_symb
-
-# Normality
-CDHC_LIBNAME          = grass_cdhc
-
-# Lidar
-LIDAR_LIBNAME         = grass_lidar
-
-# Raster/SIMWE
-SIM_LIBNAME           = grass_sim
-
-# Sites (legacy)
-SITES_LIBNAME         = grass_sites
-
-# LRS
-LRS_LIBNAME           = grass_lrs
-
 ##################### library switches ##################################
 
-ARRAYSTATSLIB = -l$(ARRAYSTATS_LIBNAME) $(GISLIB) 
-BITMAPLIB     = -l$(BITMAP_LIBNAME) $(LINKMLIB) 
-BTREELIB      = -l$(BTREE_LIBNAME)
-CLUSTERLIB    = -l$(CLUSTER_LIBNAME) $(IMAGERYLIB) $(GISLIB)
-COORCNVLIB    = -l$(COORCNV_LIBNAME)
-DATETIMELIB   = -l$(DATETIME_LIBNAME)
-DBDIALOGLIB   = -l$(DBDIALOG_LIBNAME)
-DISPLAYLIB    = -l$(DISPLAY_LIBNAME) $(GISLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB)
-DLGLIB        = -l$(DLG_LIBNAME)
-DSPFLIB       = -l$(DSPF_LIBNAME)
-DRIVERLIB     = -l$(DRIVER_LIBNAME) $(GISLIB) $(FTLIB) $(ICONVLIB) 
-PNGDRIVERLIB  = -l$(PNGDRIVER_LIBNAME) $(DRIVERLIB) $(GISLIB) $(PNGLIB) 
-PSDRIVERLIB   = -l$(PSDRIVER_LIBNAME) $(DRIVERLIB) $(GISLIB) 
-CAIRODRIVERLIB= -l$(CAIRODRIVER_LIBNAME) $(DRIVERLIB) $(GISLIB)
-HTMLDRIVERLIB = -l$(HTMLDRIVER_LIBNAME) $(DRIVERLIB) $(GISLIB)
-G3DLIB        = -l$(G3D_LIBNAME) $(GISLIB) 
-GISLIB        = -l$(GIS_LIBNAME) $(DATETIMELIB) $(INTLLIB) $(ZLIBLIB)
-GMATHLIB      = -l$(GMATH_LIBNAME) $(GISLIB) 
-GPDELIB       = -l$(GPDE_LIBNAME) $(GISLIB) $(G3DLIB)
-GPROJLIB      = -l$(GPROJ_LIBNAME) $(GISLIB) $(PROJLIB) $(GDALLIBS) 
-IBTREELIB     = -l$(IBTREE_LIBNAME)
-ICONLIB       = -l$(ICON_LIBNAME)
-IMAGERYLIB    = -l$(IMAGERY_LIBNAME) $(GISLIB) 
-IORTHOLIB     = -l$(IORTHO_LIBNAME) $(IMAGERYLIB) $(GISLIB) 
-IOSTREAMLIB   = -l$(IOSTREAM_LIBNAME)
-ISMAPLIB      = -l$(ISMAP_LIBNAME)
-LINKMLIB      = -l$(LINKM_LIBNAME)
-LOCKLIB       = -l$(LOCK_LIBNAME)
-MANAGELIB     = -l$(MANAGE_LIBNAME)
-RASTERLIB     = -l$(RASTER_LIBNAME) $(GISLIB) $(XDRLIB) $(SOCKLIB)
-ROWIOLIB      = -l$(ROWIO_LIBNAME)
-SEGMENTLIB    = -l$(SEGMENT_LIBNAME) $(GISLIB) 
-STATSLIB      = -l$(STATS_LIBNAME) $(GISLIB) 
-XGDLIB        = -l$(XGD_LIBNAME)
-XGILIB        = -l$(XGI_LIBNAME)
-XPMLIB        = -l$(XPM_LIBNAME)
-
-# DBMI
-DBMIBASELIB   = -l$(DBMIBASE_LIBNAME) $(GISLIB) 
-DBMICLIENTLIB = -l$(DBMICLIENT_LIBNAME) $(DBMIBASELIB) $(GISLIB) 
-DBMIDRIVERLIB = -l$(DBMIDRIVER_LIBNAME) $(DBMIBASELIB) $(DBSTUBSLIB) $(GISLIB) 
-SQLPLIB       = -l$(SQLP_LIBNAME)
-DBSTUBSLIB    = -l$(DBSTUBS_LIBNAME) $(DBMIBASELIB) $(GISLIB) 
-DBMILIB       = $(DBMICLIENTLIB) $(DBMIBASELIB) $(DBMIEXTRALIB)
-
-# Vector
-DIGLIB        = -l$(DIG_LIBNAME)
-DIG2LIB       = -l$(DIG2_LIBNAME) $(GISLIB) $(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) $(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) $(VECTORLIB) 
-QTREELIB      = -l$(QTREE_LIBNAME)
-
-# NVIZ related
-OGSFLIB       = -l$(OGSF_LIBNAME) $(BITMAPLIB) $(G3DLIB) $(GISLIB) $(SITESLIB) $(VECTORLIB) 
-NVIZLIB       = -l$(NVIZ_LIBNAME) $(BITMAPLIB) $(G3DLIB) $(GISLIB) $(VECTORLIB) 
-
-# triangulation libraries
-SOSLIB        = -l$(SOS_LIBNAME)
-LIALIB        = -l$(LIA_LIBNAME)
-OPTRILIB      = -l$(OPTRI_LIBNAME)
-BASICLIB      = -l$(BASIC_LIBNAME)
-GEOMLIB       = $(OPTRILIB) $(SOSLIB) $(LIALIB) $(BASICLIB)		
-
-# misc
-XDISPLAYLIB   = -l$(XDISPLAY_LIBNAME)
-FORMLIB       = -l$(FORM_LIBNAME) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) 
-SYMBLIB       = -l$(SYMB_LIBNAME) $(GISLIB) 
-
-# Normality
-CDHCLIB       = -l$(CDHC_LIBNAME)
-
-# Lidar
-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) $(VECTORLIB) 
-
-# LRS
-LRSLIB        = -l$(LRS_LIBNAME) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) 
-
-##################### library dependencies ##############################
-
-# These always static
-ISMAPDEP    = $(BASE_LIBDIR)/$(STLIB_PREFIX)$(ISMAP_LIBNAME)$(STLIB_SUFFIX)
-IOSTREAMDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(IOSTREAM_LIBNAME)$(STLIB_SUFFIX)
-
-ARRAYSTATSDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(ARRAYSTATS_LIBNAME)$(LIB_SUFFIX)
-BITMAPDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(BITMAP_LIBNAME)$(LIB_SUFFIX)
-BTREEDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(BTREE_LIBNAME)$(LIB_SUFFIX)
-COORCNVDEP  = $(BASE_LIBDIR)/$(LIB_PREFIX)$(COORCNV_LIBNAME)$(LIB_SUFFIX)
-CLUSTERDEP  = $(BASE_LIBDIR)/$(LIB_PREFIX)$(CLUSTER_LIBNAME)$(LIB_SUFFIX)
-DATETIMEDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DATETIME_LIBNAME)$(LIB_SUFFIX)
-DBDIALOGDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DBDIALOG_LIBNAME)$(LIB_SUFFIX)
-DISPLAYDEP  = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DISPLAY_LIBNAME)$(LIB_SUFFIX)
-DLGDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DLG_LIBNAME)$(LIB_SUFFIX)
-DRIVERDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DRIVER_LIBNAME)$(LIB_SUFFIX)
-PNGDRIVERDEP= $(BASE_LIBDIR)/$(LIB_PREFIX)$(PNGDRIVER_LIBNAME)$(LIB_SUFFIX)
-PSDRIVERDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(PSDRIVER_LIBNAME)$(LIB_SUFFIX)
-CAIRODRIVERDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(CAIRODRIVER_LIBNAME)$(LIB_SUFFIX)
-HTMLDRIVERDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(HTMLDRIVER_LIBNAME)$(LIB_SUFFIX)
-DSPFDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DSPF_LIBNAME)$(LIB_SUFFIX)
-G3DDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(G3D_LIBNAME)$(LIB_SUFFIX)
-GISDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(GIS_LIBNAME)$(LIB_SUFFIX)
-GMATHDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(GMATH_LIBNAME)$(LIB_SUFFIX)
-GPDEDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(GPDE_LIBNAME)$(LIB_SUFFIX)
-GPROJDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(GPROJ_LIBNAME)$(LIB_SUFFIX)
-IBTREEDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(IBTREE_LIBNAME)$(LIB_SUFFIX)
-ICONDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(ICON_LIBNAME)$(LIB_SUFFIX)
-IMAGERYDEP  = $(BASE_LIBDIR)/$(LIB_PREFIX)$(IMAGERY_LIBNAME)$(LIB_SUFFIX)
-IORTHODEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(IORTHO_LIBNAME)$(LIB_SUFFIX)
-LINKMDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LINKM_LIBNAME)$(LIB_SUFFIX)
-LOCKDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LOCK_LIBNAME)$(LIB_SUFFIX)
-MANAGEDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(MANAGE_LIBNAME)$(LIB_SUFFIX)
-RASTERDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(RASTER_LIBNAME)$(LIB_SUFFIX)
-ROWIODEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(ROWIO_LIBNAME)$(LIB_SUFFIX)
-SEGMENTDEP  = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SEGMENT_LIBNAME)$(LIB_SUFFIX)
-STATSDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(STATS_LIBNAME)$(LIB_SUFFIX)
-XGDDEP	    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(XGD_LIBNAME)$(LIB_SUFFIX)
-XGIDEP	    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(XGI_LIBNAME)$(LIB_SUFFIX)
-XPMDEP	    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(XPM_LIBNAME)$(LIB_SUFFIX)
-
-# DBMI
-DBMIBASEDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DBMIBASE_LIBNAME)$(LIB_SUFFIX)
-DBMICLIENTDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DBMICLIENT_LIBNAME)$(LIB_SUFFIX)
-DBMIDRIVERDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DBMIDRIVER_LIBNAME)$(LIB_SUFFIX)
-DBMIDEP         = $(DBMICLIENTDEP) $(DBMIBASEDEP)
-SQLPDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SQLP_LIBNAME)$(LIB_SUFFIX)
-DBSTUBSDEP  = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DBSTUBS_LIBNAME)$(LIB_SUFFIX)
+libs = \
+	ARRAYSTATS:arraystats \
+	BASIC:basic \
+	BITMAP:bitmap \
+	BTREE:btree \
+	CAIRODRIVER:cairodriver \
+	CDHC:cdhc \
+	CLUSTER:cluster \
+	COORCNV:coorcnv \
+	DATETIME:datetime \
+	DBDIALOG:dbdialog \
+	DBMIBASE:dbmibase \
+	DBMICLIENT:dbmiclient \
+	DBMIDRIVER:dbmidriver \
+	DBSTUBS:dbstubs \
+	DIG2:dig2 \
+	DIG:dig \
+	DISPLAY:display \
+	DLG:dlg \
+	DRIVER:driver \
+	DSPF:dspf \
+	FORM:form \
+	G3D:g3d \
+	GIS:gis \
+	GMATH:gmath \
+	GPDE:gpde \
+	GPROJ:gproj \
+	GRAPH:dgl \
+	HTMLDRIVER:htmldriver \
+	IBTREE:ibtree \
+	ICON:icon \
+	IMAGERY:imagery \
+	INTERPDATA:interpdata \
+	INTERPFL:interpfl \
+	IORTHO:iortho \
+	ISMAP:ismap \
+	LIA:lia \
+	LIDAR:lidar \
+	LINKM:linkm \
+	LOCK:lock \
+	LRS:lrs \
+	MANAGE:manage \
+	NVIZ:nviz \
+	OGSF:ogsf \
+	OPTRI:optri \
+	PNGDRIVER:pngdriver \
+	PSDRIVER:psdriver \
+	QTREE:qtree \
+	RASTER:raster \
+	ROWIO:rowio \
+	RTREE:rtree \
+	SEGMENT:segment \
+	SHAPE:shape \
+	SIM:sim \
+	SITES:sites \
+	SOS:sos \
+	SQLP:sqlp \
+	STATS:stats \
+	SYMB:symb \
+	TRANS:trans \
+	VECTOR:vector \
+	VEDIT:vedit \
+	XDISPLAY:xdisplay \
+	XGD:xgd \
+	XGI:xgi \
+	XPM:xpm \
+	IOSTREAM:iostream
+
+ARRAYSTATSDEPS = $(GISLIB)
+BITMAPDEPS     = $(LINKMLIB)
+CAIRODRIVERDEPS= $(DRIVERLIB) $(GISLIB)
+CLUSTERDEPS    = $(IMAGERYLIB) $(GISLIB)
+DBMIBASEDEPS   = $(GISLIB)
+DBMICLIENTDEPS = $(DBMIBASELIB) $(GISLIB)
+DBMIDRIVERDEPS = $(DBMIBASELIB) $(DBSTUBSLIB) $(GISLIB)
+DBSTUBSDEPS    = $(DBMIBASELIB) $(GISLIB)
+DIG2DEPS       = $(GISLIB) $(RTREELIB)
+DISPLAYDEPS    = $(GISLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB)
+DRIVERDEPS     = $(GISLIB) $(FTLIB) $(ICONVLIB)
+FORMDEPS       = $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB)
+G3DDEPS        = $(GISLIB)
+GISDEPS        = $(DATETIMELIB) $(INTLLIB) $(ZLIBLIB)
+GMATHDEPS      = $(GISLIB) $(FFTWLIB)
+GPDEDEPS       = $(GISLIB) $(G3DLIB)
+GPROJDEPS      = $(GISLIB) $(PROJLIB) $(GDALLIBS)
+HTMLDRIVERDEPS = $(DRIVERLIB) $(GISLIB)
+IMAGERYDEPS    = $(GISLIB)
+INTERPFLDEPS   = $(BITMAPLIB) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(GMATHLIB) $(INTERPDATALIB) $(QTREELIB) $(VECTORLIB)
+IORTHODEPS     = $(IMAGERYLIB) $(GISLIB)
+LIDARDEPS      = $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(GMATHLIB) $(VECTORLIB)
+LRSDEPS        = $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB)
+NVIZDEPS       = $(BITMAPLIB) $(G3DLIB) $(GISLIB) $(VECTORLIB)
+OGSFDEPS       = $(BITMAPLIB) $(G3DLIB) $(GISLIB) $(SITESLIB) $(VECTORLIB)
+PNGDRIVERDEPS  = $(DRIVERLIB) $(GISLIB) $(PNGLIB)
+PSDRIVERDEPS   = $(DRIVERLIB) $(GISLIB)
+RASTERDEPS     = $(GISLIB) $(XDRLIB) $(SOCKLIB)
+SEGMENTDEPS    = $(GISLIB)
+SIMDEPS        = $(GISLIB) $(SITESLIB)
+SITESDEPS      = $(DATETIMELIB) $(DBMIBASELIB) $(DBMICLIENTLIB) $(GISLIB) $(VECTORLIB)
+STATSDEPS      = $(GISLIB)
+SYMBDEPS       = $(GISLIB)
+VECTORDEPS     = $(DBMIBASELIB) $(DBMICLIENTLIB) $(GRAPHLIB) $(DIG2LIB) $(GISLIB) $(LINKMLIB) $(RTREELIB) $(GDALLIBS) $(GEOSLIBS)
+VEDITDEPS      = $(GISLIB) $(VECTORLIB)
+
+ifeq ($(GRASS_LIBRARY_TYPE),stlib)
+NEED_DEPS = 1
+endif
 
-# Vector
-DIGDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DIG_LIBNAME)$(LIB_SUFFIX)
-DIG2DEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DIG2_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     = $(VECTORDEP) $(DIG2DEP) $(GRAPHDEP) $(RTREEDEP) $(LINKMDEP) $(DBMIDEP)
+define lib_rules
+$(1)_LIBNAME = grass_$(2)
+ifneq ($(NEED_DEPS),)
+$(1)LIB = -l$$($(1)_LIBNAME) $$($(1)DEPS)
+else
+$(1)LIB = -l$$($(1)_LIBNAME)
+endif
+ifneq ($(1),IOSTREAM)
+$(1)DEP = $$(BASE_LIBDIR)/$$(LIB_PREFIX)$$($(1)_LIBNAME)$$(LIB_SUFFIX)
+else
+$(1)DEP = $$(BASE_LIBDIR)/$$(STLIB_PREFIX)$$($(1)_LIBNAME)$$(STLIB_SUFFIX)
+endif
+endef
 
-# Interpolation
-INTERPDATADEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(INTERPDATA_LIBNAME)$(LIB_SUFFIX)
-INTERPFLDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(INTERPFL_LIBNAME)$(LIB_SUFFIX)
-QTREEDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(QTREE_LIBNAME)$(LIB_SUFFIX)
+$(foreach lib,$(libs),$(eval $(call lib_rules,$(firstword $(subst :, ,$(lib))),$(lastword $(subst :, ,$(lib))))))
 
-# NVIZ related
-OGSFDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(OGSF_LIBNAME)$(LIB_SUFFIX)
-NVIZDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(NVIZ_LIBNAME)$(LIB_SUFFIX)
+DBMILIB     = $(DBMICLIENTLIB) $(DBMIBASELIB) $(DBMIEXTRALIB)
+GEOMLIB     = $(OPTRILIB) $(SOSLIB) $(LIALIB) $(BASICLIB)
+VECTLIB     = $(VECTORLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB)
 
-# triangulation libraries
-SOSDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SOS_LIBNAME)$(LIB_SUFFIX)
-LIADEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LIA_LIBNAME)$(LIB_SUFFIX)
-OPTRIDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(OPTRI_LIBNAME)$(LIB_SUFFIX)
-BASICDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(BASIC_LIBNAME)$(LIB_SUFFIX)
+DBMIDEP     = $(DBMICLIENTDEP) $(DBMIBASEDEP)
 GEOMDEP     = $(OPTRIDEP) $(SOSDEP) $(LIADEP) $(BASICDEP)
-
-# misc
-XDISPLAYDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(XDISPLAY_LIBNAME)$(LIB_SUFFIX)
-FORMDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(FORM_LIBNAME)$(LIB_SUFFIX)
-SYMBDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SYMB_LIBNAME)$(LIB_SUFFIX)
-
-# Normality
-CDHCDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(CDHC_LIBNAME)$(LIB_SUFFIX)
-
-# Lidar
-LIDARDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LIDAR_LIBNAME)$(LIB_SUFFIX)
-
-# Raster/SIMWE
-SIMDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SIM_LIBNAME)$(LIB_SUFFIX)
-
-# Sites (legacy)
-SITESDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SITES_LIBNAME)$(LIB_SUFFIX)
-
-# LRS
-LRSDEP      = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LRS_LIBNAME)$(LIB_SUFFIX)
-
+VECTDEP     = $(VECTORDEP) $(DIG2DEP) $(GRAPHDEP) $(RTREEDEP) $(LINKMDEP) $(DBMIDEP)

raster/r.surf.fractal/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = r.surf.fractal
 
-LIBES = $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(FFTWLIB)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTERLIB)
 DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(FFTWINC)
 

vector/v.out.pov/Makefile

@@ -5,11 +5,11 @@ PGM=v.out.pov
 
 OBJS = main.o
 
-LIBES     = $(VECTLIB) $(GISLIB) $(GDALLIBS)
+LIBES     = $(VECTLIB) $(GISLIB)
 DEPENDENCIES = $(VECTDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
- 
+
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd