Keep all library dependencies in Grass.make

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

imagery/i.ortho.photo/lib/Makefile

@@ -1,8 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(GISLIB) $(IMAGERYLIB)
-
-LIB_NAME = $(IORTHO_LIBNAME)
+LIB = IORTHO
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

include/Make/Grass.make

@@ -103,6 +103,9 @@ MANBASEDIR = $(ARCH_DISTDIR)/man
 MANDIR = $(MANBASEDIR)/man$(MANSECT)
 HTML2MAN = VERSION_NUMBER=$(GRASS_VERSION_NUMBER) $(GISBASE)/tools/g.html2man.py
 
+GDAL_LINK = $(USE_GDAL)
+GDAL_DYNAMIC = 1
+
 ##################### library switches ##################################
 
 libs = \
@@ -154,6 +157,7 @@ libs = \
 	PSDRIVER:psdriver \
 	QTREE:qtree \
 	RASTER:raster \
+	RLI:rli \
 	ROWIO:rowio \
 	RTREE:rtree \
 	SEGMENT:segment \
@@ -173,41 +177,79 @@ libs = \
 	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)
+ARRAYSTATSDEPS  = $(GISLIB)
+BITMAPDEPS      = $(LINKMLIB)
+CAIRODRIVERDEPS = $(DRIVERLIB) $(GISLIB) $(CAIROLIB) $(FCLIB)
+CLUSTERDEPS     = $(IMAGERYLIB) $(GISLIB)
+DBMIBASEDEPS    = $(GISLIB)
+DBMICLIENTDEPS  = $(DBMIBASELIB) $(GISLIB)
+DBMIDRIVERDEPS  = $(DBMIBASELIB) $(DBSTUBSLIB) $(GISLIB)
+DBSTUBSDEPS     = $(DBMIBASELIB) $(GISLIB)
+DIG2DEPS        = $(GISLIB) $(RTREELIB)
+DISPLAYDEPS     = $(GISLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(HTMLDRIVERLIB) \
+		$(DRIVERLIB) $(RASTERLIB)
+DRIVERDEPS      = $(GISLIB) $(FTLIB) $(ICONVLIB)
+FORMDEPS        = $(DBMILIB) $(GISLIB)
+G3DDEPS         = $(RASTERLIB) $(GISLIB)
+GISDEPS         = $(DATETIMELIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(INTLLIB) \
+		$(MATHLIB) $(ZLIBLIBPATH) $(ZLIB)
+GMATHDEPS       = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB)
+GPDEDEPS        = $(GISLIB) $(G3DLIB)
+GPROJDEPS       = $(GISLIB) $(PROJLIB) $(GDALLIBS)
+HTMLDRIVERDEPS  = $(DRIVERLIB) $(GISLIB)
+IMAGERYDEPS     = $(GISLIB)
+INTERPFLDEPS    = $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(INTERPDATALIB) \
+		$(QTREELIB) $(VECTLIB) $(RASTERLIB) $(GISLIB)
+IORTHODEPS      = $(IMAGERYLIB) $(GISLIB)
+LIDARDEPS       = $(VECTLIB) $(DBMILIB) $(RASTERLIB) $(SEGMENTLIB) $(GMATHLIB) \
+		$(GISLIB) $(MATHLIB)
+LRSDEPS         = $(VECTLIB) $(DBMILIB) $(GISLIB)
+MANAGEDEPS	= $(VECTLIB) $(G3DLIB) $(GISLIB)
+NVIZDEPS        = $(BITMAPLIB) $(SITESLIB) $(VECTLIB) $(G3DLIB) $(OGSFLIB) \
+		$(RASTERLIB) $(GISLIB) $(OPENGLLIB)
+OGSFDEPS        = $(SITESLIB) $(G3DLIB) $(RASTERLIB) $(BITMAPLIB) $(VECTLIB) \
+		$(GISLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) \
+		$(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB)
+PNGDRIVERDEPS   = $(DRIVERLIB) $(GISLIB) $(PNGLIB)
+PSDRIVERDEPS    = $(DRIVERLIB) $(GISLIB)
+RASTERDEPS      = $(GISLIB) $(XDRLIB) $(SOCKLIB)
+RLIDEPS         = $(RASTERLIB) $(GISLIB)
+SEGMENTDEPS     = $(GISLIB)
+SIMDEPS         = $(BITMAPLIB) $(GMATHLIB) $(LINKMLIB) $(SITESLIB) $(VECTLIB) \
+		$(DBMILIB) $(GISLIB)
+SITESDEPS       = $(DBMILIB) $(VECTORLIB) $(GISLIB) $(DATETIMELIB) 
+STATSDEPS       = $(GISLIB)
+SYMBDEPS        = $(GISLIB)
+VECTORDEPS      = $(DBMILIB) $(GRAPHLIB) $(DIG2LIB) $(GISLIB) $(LINKMLIB) \
+		$(RTREELIB) $(GDALLIBS) $(GEOSLIBS)
+VEDITDEPS       = $(GISLIB) $(VECTORLIB)
+
+ifneq ($(USE_X11),)
+CAIRODRIVERDEPS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)
+endif
+
+ifneq ($(USE_CAIRO),)
+DISPLAYDEPS += $(CAIRODRIVERLIB) 
+endif
+
+ifneq ($(GDAL_LINK),)
+ifneq ($(GDAL_DYNAMIC),)
+ifneq ($(MINGW),)
+RASTERDEPS += -lkernel32
+else
+RASTERDEPS += $(DLLIB)
+endif
+else
+RASTERDEPS += $(GDALLIBS)
+endif
+endif
+
+ifeq ($(OPENGL_WINDOWS),1)
+NVIZDEPS += -lgdi32
+endif
+ifneq ($(OPENGL_X11),)
+NVIZDEPS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)
+endif
 
 ifeq ($(GRASS_LIBRARY_TYPE),stlib)
 NEED_DEPS = 1

include/Make/Lib.make

@@ -9,6 +9,11 @@ include $(MODULE_TOPDIR)/include/Make/Rules.make
 include $(MODULE_TOPDIR)/include/Make/Html.make
 include $(MODULE_TOPDIR)/include/Make/Compile.make
 
+ifneq ($(LIB),)
+LIB_NAME := $($(LIB)_LIBNAME)
+EXTRA_LIBS := $($(LIB)DEPS)
+endif
+
 STLIB_NAME = $(LIB_NAME)
 STLIB_OBJS = $(ARCH_OBJS)
 SHLIB_NAME = $(LIB_NAME)

lib/arraystats/Makefile

@@ -1,9 +1,8 @@
 
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB)
 
-LIB_NAME = $(ARRAYSTATS_LIBNAME)
+LIB = ARRAYSTATS
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/bitmap/Makefile

@@ -4,11 +4,10 @@ include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 MOD_OBJS := bitmap.o sparse.o
 
-LIB_NAME = $(BITMAP_LIBNAME)
+LIB = BITMAP
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-EXTRA_LIBS = $(LINKMLIB)
 
 default: lib
 

lib/btree/Makefile

@@ -4,7 +4,7 @@ include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 MOD_OBJS := $(filter-out try.o,$(AUTO_OBJS))
 
-LIB_NAME = $(BTREE_LIBNAME)
+LIB = BTREE
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/cairodriver/Makefile

@@ -1,16 +1,14 @@
 MODULE_TOPDIR = ../..
 
 EXTRA_CFLAGS=-I../driver $(CAIROINC) $(FTINC)
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(CAIROLIB) $(FCLIB)
 
 # added constant to /include/Make/Grass.make.in
-LIB_NAME = $(CAIRODRIVER_LIBNAME)
+LIB = CAIRODRIVER
 PGM = cairodriver
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 ifneq ($(USE_X11),)
-EXTRA_LIBS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)
 EXTRA_CFLAGS += $(XCFLAGS) -DUSE_X11=1
 endif
 

lib/cdhc/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(CDHC_LIBNAME)
+LIB = CDHC
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/cluster/Makefile

@@ -1,10 +1,9 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(CLUSTER_LIBNAME)
+LIB = CLUSTER
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-EXTRA_LIBS = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB)
 
 default: lib
 

lib/datetime/Makefile

@@ -1,7 +1,7 @@
 
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(DATETIME_LIBNAME)
+LIB = DATETIME
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/db/dbmi_base/Makefile

@@ -1,9 +1,8 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(GISLIB) $(XDRLIB)
 EXTRA_CFLAGS = $(USE_DIRECT) $(USE_BUFFERED_IO)
 
-LIB_NAME = $(DBMIBASE_LIBNAME)
+LIB = DBMIBASE
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/db/dbmi_client/Makefile

@@ -1,9 +1,8 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(DBMIBASELIB) $(GISLIB)
 EXTRA_CFLAGS = $(USE_DIRECT) $(USE_BUFFERED_IO) -I../dbmi_base
 
-LIB_NAME = $(DBMICLIENT_LIBNAME)
+LIB = DBMICLIENT
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/db/dbmi_driver/Makefile

@@ -1,9 +1,8 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(DBMIBASELIB) $(DBSTUBSLIB) $(GISLIB)
 EXTRA_CFLAGS = $(USE_DIRECT) $(USE_BUFFERED_IO) -I../dbmi_base
 
-LIB_NAME = $(DBMIDRIVER_LIBNAME)
+LIB = DBMIDRIVER
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/db/sqlp/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-LIB_NAME = $(SQLP_LIBNAME)
+LIB = SQLP
 PGM = sql
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/db/stubs/Makefile

@@ -1,8 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(DBMIBASELIB) $(GISLIB)
 
-LIB_NAME = $(DBSTUBS_LIBNAME)
+LIB = DBSTUBS
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/display/Makefile

@@ -1,16 +1,13 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(DRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) \
-	$(HTMLDRIVERLIB) $(RASTERLIB)
 EXTRA_INC = -I../driver
 
 include $(MODULE_TOPDIR)/include/Make/Vars.make
 ifneq ($(USE_CAIRO),)
-EXTRA_LIBS +=  $(CAIRODRIVERLIB)
 EXTRA_CFLAGS += -DUSE_CAIRO
 endif
 
-LIB_NAME = $(DISPLAY_LIBNAME)
+LIB = DISPLAY
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/driver/Makefile

@@ -3,8 +3,7 @@ MODULE_TOPDIR = ../..
 include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 EXTRA_CFLAGS=$(FTINC)
-EXTRA_LIBS=$(GISLIB) $(FTLIB) $(ICONVLIB)
-LIB_NAME = $(DRIVER_LIBNAME)
+LIB = DRIVER
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/dspf/Makefile

@@ -1,7 +1,6 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB)
-LIB_NAME = $(DSPF_LIBNAME)
+LIB = DSPF
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/external/shapelib/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-LIB_NAME = $(SHAPE_LIBNAME)
+LIB = SHAPE
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/form/Makefile

@@ -4,11 +4,10 @@ include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 MOD_OBJS = generate.o open.o
 
-LIB_NAME = $(FORM_LIBNAME)
+LIB = FORM
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-EXTRA_LIBS=$(GISLIB) $(DBMILIB)
 EXTRA_CFLAGS = $(XCFLAGS) $(TCLINCDIR) $(TKINCDIR)
 
 FORMDIR=$(ARCH_DISTDIR)/etc/form

lib/g3d/Makefile

@@ -1,8 +1,7 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(G3D_LIBNAME)
+LIB = G3D
 
-EXTRA_LIBS = $(GISLIB) $(RASTERLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/gis/Makefile

@@ -1,9 +1,7 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(GIS_LIBNAME)
+LIB = GIS
 
-EXTRA_LIBS = $(DATETIMELIB) $(PTHREADLIBPATH) $(PTHREADLIB) \
-	$(INTLLIB) $(MATHLIB) $(ZLIBLIBPATH) $(ZLIB)
 EXTRA_INC = $(ZLIBINCPATH) $(PTHREADINCPATH)
 
 DATASRC = ellipse.table datum.table datumtransform.table FIPS.code state27 state83 projections

lib/gmath/Makefile

@@ -1,10 +1,9 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB)
 
 EXTRA_CFLAGS = $(FFTWINC)
 
-LIB_NAME = $(GMATH_LIBNAME)
+LIB = GMATH
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/gpde/Makefile

@@ -4,8 +4,7 @@ MODULE_TOPDIR = ../..
 #EXTRA_CFLAGS=-fopenmp
 #EXTRA_LIBS=$(GISLIB) $(G3DLIB) -lgomp $(MATHLIB)
 
-EXTRA_LIBS=$(GISLIB) $(G3DLIB) $(RASTERLIB)
-LIB_NAME = $(GPDE_LIBNAME)
+LIB = GPDE
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/htmldriver/Makefile

@@ -2,8 +2,7 @@ MODULE_TOPDIR = ../..
 
 EXTRA_CFLAGS=-I../driver
 
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB)
-LIB_NAME = $(HTMLDRIVER_LIBNAME)
+LIB = HTMLDRIVER
 PGM = htmldriver
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/imagery/Makefile

@@ -1,11 +1,10 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(IMAGERY_LIBNAME)
+LIB = IMAGERY
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-EXTRA_LIBS = $(GMATHLIB) $(GISLIB)
 
 default: lib
 

lib/iostream/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(IOSTREAM_LIBNAME)
+LIB = IOSTREAM
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/linkm/Makefile

@@ -1,7 +1,7 @@
 
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(LINKM_LIBNAME)
+LIB = LINKM
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/manage/Makefile

@@ -1,12 +1,11 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(MANAGE_LIBNAME)
+LIB = MANAGE
 DEPENDENCIES = $(GISDEP) $(VECTDEP) $(G3DDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
-EXTRA_LIBS = $(GISLIB) $(VECTLIB) $(G3DLIB)
 
 default: lib $(ARCH_INCDIR)/list.h

lib/nviz/Makefile

@@ -1,19 +1,11 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(NVIZ_LIBNAME)
-
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(OPENGLLIB) \
-	$(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
-	$(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB) $(RASTERLIB)
+LIB = NVIZ
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-ifeq ($(OPENGL_WINDOWS),1)
-EXTRA_LIBS += -lgdi32
-endif
 ifneq ($(OPENGL_X11),)
-EXTRA_LIBS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)
 EXTRA_CFLAGS += $(XCFLAGS)
 endif
 

lib/ogsf/Makefile

@@ -1,10 +1,7 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) \
-	$(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
-	$(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(RASTERLIB)
 
-LIB_NAME = $(OGSF_LIBNAME)
+LIB = OGSF
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/pngdriver/Makefile

@@ -6,12 +6,11 @@ ifeq ($(USE_PNG),)
   MOD_OBJS := $(filter-out read_png.o write_png.o,$(AUTO_OBJS))
 endif
 
-LIB_NAME = $(PNGDRIVER_LIBNAME)
+LIB = PNGDRIVER
 PGM = pngdriver
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 EXTRA_CFLAGS=$(ZLIBINCPATH) $(PNGINC) -I../driver
 
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(PNGLIB)
 
 default: lib

lib/proj/Makefile

@@ -1,11 +1,10 @@
 MODULE_TOPDIR = ../..
 
-LIB_NAME = $(GPROJ_LIBNAME)
+LIB = GPROJ
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make 
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-EXTRA_LIBS=$(GISLIB) $(PROJLIB) $(GDALLIBS)
 EXTRA_CFLAGS = $(ZLIBINCPATH) $(GDALCFLAGS)
 EXTRA_INC = $(PROJINC)
 

lib/psdriver/Makefile

@@ -2,8 +2,7 @@ MODULE_TOPDIR = ../..
 
 EXTRA_CFLAGS=-I../driver
 
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB)
-LIB_NAME = $(PSDRIVER_LIBNAME)
+LIB = PSDRIVER
 PGM = psdriver
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/raster/Makefile

@@ -1,10 +1,6 @@
 MODULE_TOPDIR = ../..
 
-GDAL_LINK = $(USE_GDAL)
-GDAL_DYNAMIC = 1
-
-LIB_NAME = $(RASTER_LIBNAME)
-EXTRA_LIBS = $(GISLIB) $(XDRLIB) $(SOCKLIB) $(MATHLIB)
+LIB = RASTER
 EXTRA_INC = 
 
 include $(MODULE_TOPDIR)/include/Make/Vars.make
@@ -22,13 +18,6 @@ EXTRA_INC += $(PROJINC) $(GDALCFLAGS)
 
 ifneq ($(GDAL_DYNAMIC),)
 EXTRA_CFLAGS += -DGDAL_DYNAMIC=1
-ifneq ($(MINGW),)
-EXTRA_LIBS += -lkernel32
-else
-EXTRA_LIBS += $(DLLIB)
-endif
-else
-EXTRA_LIBS += $(GDALLIBS)
 endif
 
 endif

lib/rowio/Makefile

@@ -1,7 +1,6 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB)
-LIB_NAME = $(ROWIO_LIBNAME)
+LIB = ROWIO
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/rst/data/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-LIB_NAME = $(INTERPDATA_LIBNAME)
+LIB = INTERPDATA
 DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/rst/interp_float/Makefile

@@ -1,9 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) \
-	$(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB) $(RASTERLIB)
 
-LIB_NAME = $(INTERPFL_LIBNAME)
+LIB = INTERPFL
 
 DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 

lib/rst/qtree/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-LIB_NAME = $(QTREE_LIBNAME)
+LIB = QTREE
 DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/segment/Makefile

@@ -1,8 +1,7 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB)
 
-LIB_NAME = $(SEGMENT_LIBNAME)
+LIB = SEGMENT
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/sites/Makefile

@@ -1,8 +1,7 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(DBMILIB) $(VECTLIB)
 
-LIB_NAME = $(SITES_LIBNAME)
+LIB = SITES
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

lib/stats/Makefile

@@ -1,8 +1,7 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(RASTERLIB)
 
-LIB_NAME = $(STATS_LIBNAME)
+LIB = STATS
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/symbol/Makefile

@@ -1,8 +1,7 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB)
 
-LIB_NAME = $(SYMB_LIBNAME)
+LIB = SYMB
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/vector/Vlib/Makefile

@@ -2,9 +2,8 @@ MODULE_TOPDIR = ../../..
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(ZLIBINCPATH) $(VECT_CFLAGS)
-EXTRA_LIBS=$(GISLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(GDALLIBS) $(GEOSLIBS)
 
-LIB_NAME = $(VECTOR_LIBNAME)
+LIB = VECTOR
 DEPENDENCIES =  $(ARCH_INCDIR)/Vect.h $(ARCH_INCDIR)/V_.h \
 		$(ARCH_INCDIR)/vect/dig_defines.h \
 		$(ARCH_INCDIR)/vect/dig_macros.h $(ARCH_INCDIR)/vect/dig_structs.h \

lib/vector/dglib/Makefile

@@ -4,7 +4,7 @@ include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 MOD_OBJS := $(filter-out %-template.o,$(AUTO_OBJS))
 
-LIB_NAME = $(GRAPH_LIBNAME)
+LIB = GRAPH
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/vector/diglib/Makefile

@@ -4,7 +4,7 @@ include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 MOD_OBJS := $(filter-out test.o port_test.o,$(AUTO_OBJS))
 
-LIB_NAME = $(DIG2_LIBNAME)
+LIB = DIG2
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/vector/rtree/Makefile

@@ -1,10 +1,9 @@
 MODULE_TOPDIR = ../../..
 
-LIB_NAME = $(RTREE_LIBNAME)
+LIB = RTREE
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-EXTRA_LIBS = $(MATHLIB)
 
 #compile if LFS (Large File Support) present:
 ifneq ($(USE_LARGEFILES),)

lib/vector/transform/Makefile

@@ -1,7 +1,7 @@
 
 MODULE_TOPDIR = ../../..
 
-LIB_NAME = $(TRANS_LIBNAME)
+LIB = TRANS
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/vector/vedit/Makefile

@@ -1,12 +1,11 @@
 MODULE_TOPDIR = ../../..
 
-LIB_NAME = $(VEDIT_LIBNAME)
+LIB = VEDIT
 
 DEPENDENCIES = $(VECTDEP) $(GISDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
-EXTRA_LIBS = $(VECTLIB) $(DBMILIB) $(GISLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

raster/r.li/r.li.cwed/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.cwed
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.daemon/Makefile

@@ -1,8 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(GISLIB) $(RASTERLIB)
-
-LIB_NAME = grass_rli
+LIB = RLI
 PGM = r.li.daemon
 
 DEPENDENCIES = $(GISDEP) $(RASTERDEP)

raster/r.li/r.li.dominance/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.dominance
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.edgedensity/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.edgedensity
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.mpa/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.mpa
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.mps/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.mps
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.padcv/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.padcv
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.padrange/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.padrange
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.padsd/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.padsd
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.patchdensity/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.patchdensity
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.patchnum/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.patchnum
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.richness/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.richness
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.shannon/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.shannon
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.shape/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.shape
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.li/r.li.simpson/Makefile

@@ -4,13 +4,11 @@ PGM = r.li.simpson
 
 EXTRA_CLEAN_DIRS=doxygenhtml
 
-LIB_NAME      = grass_rli
 
-RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLILIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(RLIDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/simwe/simlib/Makefile

@@ -1,11 +1,10 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(LINKMLIB) $(XDRLIB) $(SITESLIB) $(VECTLIB)
 DEPENDENCIES = $(GISDEP) $(BITMAPDEP) $(DBMIDEP) $(GMATHDEP) $(LINKMDEP) $(XDRDEP) $(SITESDEP) $(VECTDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
-LIB_NAME = $(SIM_LIBNAME)
+LIB = SIM
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

vector/lidar/lidarlib/Makefile

@@ -1,11 +1,10 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
 DEPENDENCIES= $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
-LIB_NAME = $(LIDAR_LIBNAME)
+LIB = LIDAR
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

vector/v.lrs/lib/Makefile

@@ -1,11 +1,10 @@
 
 MODULE_TOPDIR = ../../..
 
-LIB_NAME = $(LRS_LIBNAME)
+LIB = LRS
 DEPENDENCIES = $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
-EXTRA_LIBS = $(VECTLIB) $(DBMILIB) $(GISLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make