Update LIBES, DEPENDENCIES from linkage database

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

db/db.columns/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.columns
 

db/db.connect/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.connect
 

db/db.copy/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.copy
 

db/db.createdb/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.createdb
 

db/db.databases/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.databases
 

db/db.describe/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.describe
 

db/db.drivers/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.drivers
 

db/db.dropdb/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.dropdb
 

db/db.droptable/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.droptable
 

db/db.execute/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.execute
 

db/db.login/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = db.login
 
-LIBES     = $(DBMILIB) $(GISLIB)
+LIBES = $(DBMILIB) $(GISLIB)
 DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

db/db.select/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.select
 

db/db.tables/Makefile

@@ -1,8 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+LIBES = $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DBMIDEP) $(GISDEP)
 
 PGM = db.tables
 

db/drivers/dbf/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-DEPENDENCIES = $(GISDEP)
+DEPENDENCIES = $(DBMIDRIVERDEP) $(DBMIBASEDEP) $(GISDEP)
 
 PGM = dbf
 
@@ -8,6 +8,6 @@ include $(MODULE_TOPDIR)/include/Make/Vars.make
 MOD_OBJS := $(filter-out main_debug.o,$(AUTO_OBJS))
 include $(MODULE_TOPDIR)/include/Make/DB.make
 
-LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBMIEXTRALIB) $(SQLPLIB) $(SHAPELIB) $(DBSTUBSLIB) $(GISLIB) $(DATETIMELIB)
+LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(GISLIB) $(GDALLIBS) $(SHAPELIB) $(SQLPLIB)
 
 default: dbmi

db/drivers/odbc/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../../..
 PGM = odbc
 include $(MODULE_TOPDIR)/include/Make/DB.make
 
-DEPENDENCIES = $(GISDEP)
+DEPENDENCIES = $(DBMIDRIVERDEP) $(DBMIBASEDEP) $(GISDEP)
 
-LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBMIEXTRALIB) $(DBSTUBSLIB) $(GISLIB) $(DATETIMELIB) $(ODBCLIB)
+LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(GISLIB) $(ODBCLIB)
 
 default: dbmi

db/drivers/ogr/Makefile

@@ -1,13 +1,12 @@
 MODULE_TOPDIR = ../../..
 
-DEPENDENCIES = $(GISDEP)
+DEPENDENCIES = $(DBMIDRIVERDEP) $(DBMIBASEDEP) $(GISDEP)
 
 PGM = ogr
 include $(MODULE_TOPDIR)/include/Make/DB.make
 
-LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBMIEXTRALIB) $(DBSTUBSLIB) \
-	$(GISLIB) $(DATETIMELIB) $(GDALLIBS)
+LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(GISLIB) $(GDALLIBS)
 EXTRA_CFLAGS = $(GDALCFLAGS) $(TCLINCDIR) $(TKINCDIR)
-EXTRA_LDFLAGS = $(PQLIBPATH) $(TCLTKLIBPATH) $(TCLTKLIBS)
+EXTRA_LDFLAGS = $(PQLIBPATH) $(TCLTKLIBPATH) $(TCLTKLIBPATH) $(TCLTKLIBS)
 
 default: dbmi

db/drivers/postgres/Makefile

@@ -1,12 +1,11 @@
 MODULE_TOPDIR = ../../..
 
-DEPENDENCIES = $(GISDEP)
+DEPENDENCIES = $(DBMIDRIVERDEP) $(DBMIBASEDEP) $(GISDEP)
 
 PGM = pg
 include $(MODULE_TOPDIR)/include/Make/DB.make
 
-LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBMIEXTRALIB) $(DBSTUBSLIB) \
-	$(GISLIB) $(DATETIMELIB) $(PQLIB)
+LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(GISLIB) $(PQLIBPATH) $(PQLIB)
 
 EXTRA_CFLAGS = $(PQINCPATH)
 EXTRA_LDFLAGS = $(PQLIBPATH)

db/drivers/sqlite/Makefile

@@ -1,12 +1,11 @@
 MODULE_TOPDIR = ../../..
 
-DEPENDENCIES = $(GISDEP)
+DEPENDENCIES = $(DBMIDRIVERDEP) $(DBMIBASEDEP) $(GISDEP)
 
 PGM = sqlite
 include $(MODULE_TOPDIR)/include/Make/DB.make
 
-LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBMIEXTRALIB) $(DBSTUBSLIB) \
-	$(GISLIB) $(DATETIMELIB) $(SQLITELIB)
+LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(GISLIB) $(SQLITELIBPATH) $(SQLITELIB)
 
 EXTRA_CFLAGS = $(SQLITEINCPATH) 
 EXTRA_LDFLAGS = $(SQLITELIBPATH)

display/d.barscale/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.barscale
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.colorlist/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.colorlist
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.colortable/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.colortable
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.erase/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.erase
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.font/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.font
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.fontlist/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.fontlist
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.geodesic/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.geodesic
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.graph/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.graph
 
-LIBES     = $(SYMBLIB) $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(SYMBLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(SYMBDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.grid/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.grid
 
-LIBES     = $(SYMBLIB) $(DISPLAYLIB) $(GPROJLIB) $(GISLIB)
-DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(GPROJDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GPROJDEP) $(SYMBDEP) $(GISDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

display/d.his/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.his
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.histogram/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.histogram
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.info/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = d.info
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
+LIBES = $(DISPLAYLIB) $(GISLIB)
 DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

display/d.labels/Makefile

@@ -3,7 +3,7 @@ MODULE_TOPDIR = ../..
 
 PGM = d.labels
 
-LIBES        = $(DISPLAYLIB) $(GISLIB)
+LIBES = $(DISPLAYLIB) $(GISLIB) $(MATHLIB)
 
 DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 

display/d.legend/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.legend
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.linegraph/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.linegraph
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.nviz/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.nviz
 
-LIBES        = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.path/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.path
 
-LIBES        = $(DISPLAYLIB) $(VECTLIB) $(GRAPHLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTORLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTORDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

display/d.profile/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.profile
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.rast.arrow/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.rast.arrow
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.rast.num/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.rast.num
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.rast/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.rast
 
-LIBES        = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.rgb/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = d.rgb
 
-LIBES  = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
 DEPLIBS= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

display/d.rhumbline/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.rhumbline
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.text/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.text
 
-LIBES     = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.thematic.area/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.thematic.area
 
-LIBES        = $(ARRAYSTATSLIB) $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
-DEPENDENCIES = $(ARRAYSTATSDEP) $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
+LIBES = $(ARRAYSTATSLIB) $(DISPLAYLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(ARRAYSTATSDEP) $(DISPLAYDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

display/d.title/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.title
 
-LIBES     = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.vect.chart/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.vect.chart
 
-LIBES        = $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

display/d.vect/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.vect
 
-LIBES        = $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(SYMBLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(SYMBDEP)
+LIBES = $(DISPLAYLIB) $(SYMBLIB) $(VECTORLIB) $(DBMILIB) $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(SYMBDEP) $(VECTORDEP) $(DBMIDEP) $(RASTERDEP) $(GISDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

display/d.where/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.where
 
-LIBES     = $(DISPLAYLIB) $(GPROJLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(GPROJDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GPROJLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GPROJDEP) $(GISDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

general/g.access/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.access
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.copy/Makefile

@@ -5,8 +5,8 @@ PGM = g.copy
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-LIBES = $(MANAGELIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(G3DLIB)
-DEPENDENCIES = $(GISDEP) $(VECTDEP) $(DBMIDEP) $(MANAGEDEP) $(G3DDEP)
+LIBES = $(MANAGELIB) $(GISLIB)
+DEPENDENCIES = $(MANAGEDEP) $(GISDEP)
 
 default: cmd
 

general/g.dirseps/Makefile

@@ -2,8 +2,8 @@
 MODULE_TOPDIR = ../..
 
 PGM = g.dirseps
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.filename/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.filename
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.findetc/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.findetc
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.findfile/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.findfile
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.gisenv/Makefile

@@ -2,8 +2,8 @@
 MODULE_TOPDIR = ../..
 
 PGM = g.gisenv
-LIBES     = $(GISLIB) 
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.gui/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.gui
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.list/Makefile

@@ -5,8 +5,8 @@ PGM = g.list
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-LIBES = $(MANAGELIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(G3DLIB)
-DEPENDENCIES = $(GISDEP) $(VECTDEP) $(DBMIDEP) $(MANAGEDEP) $(G3DDEP)
+LIBES = $(MANAGELIB) $(GISLIB)
+DEPENDENCIES = $(MANAGEDEP) $(GISDEP)
 
 default: cmd
 

general/g.mapset/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = g.mapset
 
-LIBES        = $(GISLIB)
+LIBES = $(GISLIB)
 DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

general/g.mapsets/Makefile

@@ -4,8 +4,8 @@ MODULE_TOPDIR = ../..
 PGM = g.mapsets
 GUI = $(ETC)/gui/scripts/g.mapsets_picker.py
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.message/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.message
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.mkfontcap/Makefile

@@ -4,7 +4,7 @@ MODULE_TOPDIR = ../..
 PGM = g.mkfontcap
 CAPFILE = $(ETC)/fontcap
 
-LIBES     = $(GISLIB) $(FTLIB)
+LIBES = $(GISLIB) $(FTLIB)
 DEPENDENCIES = $(GISDEP)
 EXTRA_CFLAGS = $(FTINC)
 

general/g.mlist/Makefile

@@ -3,7 +3,7 @@ MODULE_TOPDIR = ../..
 PGM = g.mlist
 
 EXTRA_INC = $(REGEXINCPATH)
-LIBES = $(MANAGELIB) $(GISLIB) $(REGEXLIBPATH) $(REGEXLIB)
+LIBES = $(MANAGELIB) $(GISLIB)
 DEPENDENCIES = $(MANAGEDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

general/g.mremove/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.mremove
 
-LIBES = $(MANAGELIB) $(VECTLIB) $(G3DLIB) $(GISLIB) $(RASTERLIB) $(REGEXLIBPATH) $(REGEXLIB)
-DEPENDENCIES = $(MANAGEDEP) $(VECTDEP) $(G3DDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(MANAGELIB) $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(MANAGEDEP) $(RASTERDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(REGEXINCPATH)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

general/g.parser/Makefile

@@ -3,7 +3,7 @@ MODULE_TOPDIR = ../..
 PGM = g.parser
 
 LIBES = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.pnmcomp/Makefile

@@ -2,8 +2,8 @@
 MODULE_TOPDIR = ../..
 
 PGM = g.pnmcomp
-LIBES     = $(GISLIB) 
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.proj/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 PGM = g.proj
 
 EXTRA_INC = $(PROJINC)
-LIBES     = $(PROJLIB) $(GPROJLIB) $(GISLIB)
-DEPENDENCIES= $(GPROJDEP) $(GISDEP)
+LIBES = $(GPROJLIB) $(GISLIB) $(GDALLIBS) $(PROJLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.region/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.region
 
-LIBES     = $(VECTLIB) $(G3DLIB) $(GPROJLIB) $(GISLIB) $(RASTERLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(G3DDEP) $(GPROJDEP) $(GISDEP) $(RASTERDEP) $(DATETIMEDEP)
+LIBES = $(GPROJLIB) $(VECTORLIB) $(G3DLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB) $(PROJLIB)
+DEPENDENCIES = $(GPROJDEP) $(VECTORDEP) $(G3DDEP) $(RASTERDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(PROJINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

general/g.remove/Makefile

@@ -5,8 +5,8 @@ PGM = g.remove
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-LIBES = $(MANAGELIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(G3DLIB)
-DEPENDENCIES = $(GISDEP) $(VECTDEP) $(DBMIDEP) $(MANAGEDEP) $(RASTERDEP) $(G3DDEP)
+LIBES = $(MANAGELIB) $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(MANAGEDEP) $(RASTERDEP) $(GISDEP)
 
 default: cmd
 

general/g.rename/Makefile

@@ -5,8 +5,8 @@ PGM = g.rename
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-LIBES = $(MANAGELIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(G3DLIB)
-DEPENDENCIES = $(GISDEP) $(VECTDEP) $(DBMIDEP) $(MANAGEDEP) $(RASTERDEP) $(G3DDEP)
+LIBES = $(MANAGELIB) $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(MANAGEDEP) $(RASTERDEP) $(GISDEP)
 
 default: cmd
 

general/g.tempfile/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.tempfile
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP) 
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.transform/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = g.transform
 
-LIBES     = $(IMAGERYLIB) $(GISLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(IMAGERYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.version/Makefile

@@ -9,8 +9,8 @@ GRASS_CONFIGURE_PARAMS := $(shell head -n 7 $(MODULE_TOPDIR)/config.status | tai
 
 EXTRA_CFLAGS=-DGRASS_VERSION_NUMBER=\"'$(GRASS_VERSION_NUMBER)'\" -DGRASS_VERSION_DATE=\"'$(GRASS_VERSION_DATE)'\" -DGRASS_VERSION_UPDATE_PKG=\"'$(GRASS_VERSION_UPDATE_PKG)'\"  -DGRASS_CONFIGURE_PARAMS="\"$(GRASS_CONFIGURE_PARAMS)\"" -DCOPYING="\"$(COPYING)\""
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.albedo/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.albedo
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.atcorr/Makefile

@@ -4,8 +4,8 @@ PGM = i.atcorr
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-LIBES = $(GISLIB) $(RASTERLIB) 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 LINK = $(CXX)
 

imagery/i.biomass/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.biomass
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.cca/Makefile

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

imagery/i.cluster/Makefile

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

imagery/i.eb.eta/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.eb.eta
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.eb.evapfr/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.eb.evapfr
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.eb.h_SEBAL01/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.eb.h_SEBAL01
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.eb.soilheatflux/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.eb.soilheatflux
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.emissivity/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.emissivity
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.evapo.time_integration/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.evapo.time_integration
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.fft/Makefile

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

imagery/i.find/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.find
 
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Etc.make
 include $(MODULE_TOPDIR)/include/Make/NoHtml.make

imagery/i.gensig/Makefile

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

imagery/i.gensigset/Makefile

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

imagery/i.group/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.group
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB)
+DEPENDENCIES = $(IMAGERYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.his.rgb/Makefile

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

imagery/i.ifft/Makefile

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

imagery/i.latlong/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.latlong
 
-LIBES =  $(GPROJLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(PROJLIB)
+DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

imagery/i.maxlik/Makefile

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

imagery/i.modis.qc/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.modis.qc
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.pca/Makefile

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

imagery/i.rectify/Makefile

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

imagery/i.rgb.his/Makefile

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

imagery/i.smap/Makefile

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

imagery/i.sunhours/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.sunhours
 
-LIBES =  $(GPROJLIB) $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

imagery/i.target/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.target
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GISLIB)
+DEPENDENCIES = $(IMAGERYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

imagery/i.vi/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.vi
 
-LIBES = $(GISLIB) $(RASTERLIB)
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB)
+DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make