Update LIBES, DEPENDENCIES from linkage database

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38906 15284696-431f-4ddb-bdfa-cd5b030d7da7
rcmaomao · Aug 28, 2009 · d6700ff · d6700ff
1 parent b231707
commit d6700ff
Show file tree

Hide file tree

Showing 320 changed files with 634 additions and 637 deletions.
diff --git a/db/db.columns/Makefile b/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
 

diff --git a/db/db.connect/Makefile b/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
 

diff --git a/db/db.copy/Makefile b/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
 

diff --git a/db/db.createdb/Makefile b/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
 

diff --git a/db/db.databases/Makefile b/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
 

diff --git a/db/db.describe/Makefile b/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
 

diff --git a/db/db.drivers/Makefile b/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
 

diff --git a/db/db.dropdb/Makefile b/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
 

diff --git a/db/db.droptable/Makefile b/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
 

diff --git a/db/db.execute/Makefile b/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
 

diff --git a/db/db.login/Makefile b/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

diff --git a/db/db.select/Makefile b/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
 

diff --git a/db/db.tables/Makefile b/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
 

diff --git a/db/drivers/dbf/Makefile b/db/drivers/dbf/Makefile
@@ -1,13 +1,13 @@
 MODULE_TOPDIR = ../../..
 
-DEPENDENCIES = $(GISDEP)
+DEPENDENCIES = $(DBMIDRIVERDEP) $(DBMIBASEDEP) $(GISDEP)
 
 PGM = dbf
 
 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
diff --git a/db/drivers/odbc/Makefile b/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
diff --git a/db/drivers/ogr/Makefile b/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
diff --git a/db/drivers/postgres/Makefile b/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)

diff --git a/db/drivers/sqlite/Makefile b/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)

diff --git a/display/d.barscale/Makefile b/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
 

diff --git a/display/d.colorlist/Makefile b/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
 

diff --git a/display/d.colortable/Makefile b/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
 

diff --git a/display/d.erase/Makefile b/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
 

diff --git a/display/d.font/Makefile b/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
 

diff --git a/display/d.fontlist/Makefile b/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
 

diff --git a/display/d.geodesic/Makefile b/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
 

diff --git a/display/d.graph/Makefile b/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
 

diff --git a/display/d.grid/Makefile b/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

diff --git a/display/d.his/Makefile b/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
 

diff --git a/display/d.histogram/Makefile b/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
 

diff --git a/display/d.info/Makefile b/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

diff --git a/display/d.labels/Makefile b/display/d.labels/Makefile
@@ -3,7 +3,7 @@ MODULE_TOPDIR = ../..
 
 PGM = d.labels
 
-LIBES        = $(DISPLAYLIB) $(GISLIB)
+LIBES = $(DISPLAYLIB) $(GISLIB) $(MATHLIB)
 
 DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 

diff --git a/display/d.legend/Makefile b/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
 

diff --git a/display/d.linegraph/Makefile b/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
 

diff --git a/display/d.nviz/Makefile b/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
 

diff --git a/display/d.path/Makefile b/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)