[GRASS-SVN] r38893 - in grass/trunk: imagery/i.ortho.photo/lib
include/Make lib/arraystats lib/bitmap lib/btree
lib/cairodriver lib/cdhc lib/cluster lib/datetime
lib/db/dbmi_base lib/db/dbmi_client lib/db/dbmi_driver
lib/db/sqlp lib/db/stubs lib/display lib/driver lib/dspf
lib/external/shapelib lib/form lib/g3d lib/gis lib/gmath
lib/gpde lib/htmldriver lib/imagery lib/iostream lib/linkm
lib/manage lib/nviz lib/ogsf lib/pngdriver lib/proj
lib/psdriver lib/raster lib/rowio lib/rst/data
lib/rst/interp_float lib/rst/qtree lib/segment lib/sites
lib/stats lib/symbol lib/vector/Vlib lib/vector/dglib
lib/vector/diglib lib/vector/rtree lib/vector/transform
lib/vector/vedit raster/r.li/r.li.cwed
raster/r.li/r.li.daemon raster/r.li/r.li.dominance
raster/r.li/r.li.edgedensity raster/r.li/r.li.mpa
raster/r.li/r.li.mps raster/r.li/r.li.padcv
raster/r.li/r.li.padrange raster/r.li/r.li.padsd
raster/r.li/r.li.patchdensity raster/r.li/r.li.patchnum
raster/r.li/r.li.richness raster/r.li/r.li.shannon
raster/r.li/r.li.shape raster/r.li/r.li.simpson
raster/simwe/simlib vector/lidar/lidarlib vector/v.lrs/lib
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Aug 27 18:44:28 EDT 2009
Author: glynn
Date: 2009-08-27 18:44:28 -0400 (Thu, 27 Aug 2009)
New Revision: 38893
Modified:
grass/trunk/imagery/i.ortho.photo/lib/Makefile
grass/trunk/include/Make/Grass.make
grass/trunk/include/Make/Lib.make
grass/trunk/lib/arraystats/Makefile
grass/trunk/lib/bitmap/Makefile
grass/trunk/lib/btree/Makefile
grass/trunk/lib/cairodriver/Makefile
grass/trunk/lib/cdhc/Makefile
grass/trunk/lib/cluster/Makefile
grass/trunk/lib/datetime/Makefile
grass/trunk/lib/db/dbmi_base/Makefile
grass/trunk/lib/db/dbmi_client/Makefile
grass/trunk/lib/db/dbmi_driver/Makefile
grass/trunk/lib/db/sqlp/Makefile
grass/trunk/lib/db/stubs/Makefile
grass/trunk/lib/display/Makefile
grass/trunk/lib/driver/Makefile
grass/trunk/lib/dspf/Makefile
grass/trunk/lib/external/shapelib/Makefile
grass/trunk/lib/form/Makefile
grass/trunk/lib/g3d/Makefile
grass/trunk/lib/gis/Makefile
grass/trunk/lib/gmath/Makefile
grass/trunk/lib/gpde/Makefile
grass/trunk/lib/htmldriver/Makefile
grass/trunk/lib/imagery/Makefile
grass/trunk/lib/iostream/Makefile
grass/trunk/lib/linkm/Makefile
grass/trunk/lib/manage/Makefile
grass/trunk/lib/nviz/Makefile
grass/trunk/lib/ogsf/Makefile
grass/trunk/lib/pngdriver/Makefile
grass/trunk/lib/proj/Makefile
grass/trunk/lib/psdriver/Makefile
grass/trunk/lib/raster/Makefile
grass/trunk/lib/rowio/Makefile
grass/trunk/lib/rst/data/Makefile
grass/trunk/lib/rst/interp_float/Makefile
grass/trunk/lib/rst/qtree/Makefile
grass/trunk/lib/segment/Makefile
grass/trunk/lib/sites/Makefile
grass/trunk/lib/stats/Makefile
grass/trunk/lib/symbol/Makefile
grass/trunk/lib/vector/Vlib/Makefile
grass/trunk/lib/vector/dglib/Makefile
grass/trunk/lib/vector/diglib/Makefile
grass/trunk/lib/vector/rtree/Makefile
grass/trunk/lib/vector/transform/Makefile
grass/trunk/lib/vector/vedit/Makefile
grass/trunk/raster/r.li/r.li.cwed/Makefile
grass/trunk/raster/r.li/r.li.daemon/Makefile
grass/trunk/raster/r.li/r.li.dominance/Makefile
grass/trunk/raster/r.li/r.li.edgedensity/Makefile
grass/trunk/raster/r.li/r.li.mpa/Makefile
grass/trunk/raster/r.li/r.li.mps/Makefile
grass/trunk/raster/r.li/r.li.padcv/Makefile
grass/trunk/raster/r.li/r.li.padrange/Makefile
grass/trunk/raster/r.li/r.li.padsd/Makefile
grass/trunk/raster/r.li/r.li.patchdensity/Makefile
grass/trunk/raster/r.li/r.li.patchnum/Makefile
grass/trunk/raster/r.li/r.li.richness/Makefile
grass/trunk/raster/r.li/r.li.shannon/Makefile
grass/trunk/raster/r.li/r.li.shape/Makefile
grass/trunk/raster/r.li/r.li.simpson/Makefile
grass/trunk/raster/simwe/simlib/Makefile
grass/trunk/vector/lidar/lidarlib/Makefile
grass/trunk/vector/v.lrs/lib/Makefile
Log:
Keep all library dependencies in Grass.make
Modified: grass/trunk/imagery/i.ortho.photo/lib/Makefile
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/imagery/i.ortho.photo/lib/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,9 +1,7 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS=$(GISLIB) $(IMAGERYLIB)
+LIB = IORTHO
-LIB_NAME = $(IORTHO_LIBNAME)
-
include $(MODULE_TOPDIR)/include/Make/Lib.make
default: lib
Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/include/Make/Grass.make 2009-08-27 22:44:28 UTC (rev 38893)
@@ -103,6 +103,9 @@
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 @@
PSDRIVER:psdriver \
QTREE:qtree \
RASTER:raster \
+ RLI:rli \
ROWIO:rowio \
RTREE:rtree \
SEGMENT:segment \
@@ -173,42 +177,80 @@
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
endif
Modified: grass/trunk/include/Make/Lib.make
===================================================================
--- grass/trunk/include/Make/Lib.make 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/include/Make/Lib.make 2009-08-27 22:44:28 UTC (rev 38893)
@@ -9,6 +9,11 @@
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)
Modified: grass/trunk/lib/arraystats/Makefile
===================================================================
--- grass/trunk/lib/arraystats/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/arraystats/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,9 +1,8 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB)
-LIB_NAME = $(ARRAYSTATS_LIBNAME)
+LIB = ARRAYSTATS
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/bitmap/Makefile
===================================================================
--- grass/trunk/lib/bitmap/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/bitmap/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,11 +4,10 @@
MOD_OBJS := bitmap.o sparse.o
-LIB_NAME = $(BITMAP_LIBNAME)
+LIB = BITMAP
include $(MODULE_TOPDIR)/include/Make/Lib.make
-EXTRA_LIBS = $(LINKMLIB)
default: lib
Modified: grass/trunk/lib/btree/Makefile
===================================================================
--- grass/trunk/lib/btree/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/btree/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,7 +4,7 @@
MOD_OBJS := $(filter-out try.o,$(AUTO_OBJS))
-LIB_NAME = $(BTREE_LIBNAME)
+LIB = BTREE
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/cairodriver/Makefile
===================================================================
--- grass/trunk/lib/cairodriver/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/cairodriver/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/cdhc/Makefile
===================================================================
--- grass/trunk/lib/cdhc/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/cdhc/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../..
-LIB_NAME = $(CDHC_LIBNAME)
+LIB = CDHC
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/cluster/Makefile
===================================================================
--- grass/trunk/lib/cluster/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/cluster/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/datetime/Makefile
===================================================================
--- grass/trunk/lib/datetime/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/datetime/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,7 +1,7 @@
MODULE_TOPDIR = ../..
-LIB_NAME = $(DATETIME_LIBNAME)
+LIB = DATETIME
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/db/dbmi_base/Makefile
===================================================================
--- grass/trunk/lib/db/dbmi_base/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/db/dbmi_base/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/db/dbmi_client/Makefile
===================================================================
--- grass/trunk/lib/db/dbmi_client/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/db/dbmi_client/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/db/dbmi_driver/Makefile
===================================================================
--- grass/trunk/lib/db/dbmi_driver/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/db/dbmi_driver/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/db/sqlp/Makefile
===================================================================
--- grass/trunk/lib/db/sqlp/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/db/sqlp/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-LIB_NAME = $(SQLP_LIBNAME)
+LIB = SQLP
PGM = sql
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/db/stubs/Makefile
===================================================================
--- grass/trunk/lib/db/stubs/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/db/stubs/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,8 +1,7 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS=$(DBMIBASELIB) $(GISLIB)
-LIB_NAME = $(DBSTUBS_LIBNAME)
+LIB = DBSTUBS
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/display/Makefile
===================================================================
--- grass/trunk/lib/display/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/display/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/driver/Makefile
===================================================================
--- grass/trunk/lib/driver/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/driver/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -3,8 +3,7 @@
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
Modified: grass/trunk/lib/dspf/Makefile
===================================================================
--- grass/trunk/lib/dspf/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/dspf/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,7 +1,6 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB)
-LIB_NAME = $(DSPF_LIBNAME)
+LIB = DSPF
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/external/shapelib/Makefile
===================================================================
--- grass/trunk/lib/external/shapelib/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/external/shapelib/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-LIB_NAME = $(SHAPE_LIBNAME)
+LIB = SHAPE
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/form/Makefile
===================================================================
--- grass/trunk/lib/form/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/form/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,11 +4,10 @@
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
Modified: grass/trunk/lib/g3d/Makefile
===================================================================
--- grass/trunk/lib/g3d/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/g3d/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/gis/Makefile
===================================================================
--- grass/trunk/lib/gis/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/gis/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/gmath/Makefile
===================================================================
--- grass/trunk/lib/gmath/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/gmath/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/gpde/Makefile
===================================================================
--- grass/trunk/lib/gpde/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/gpde/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,8 +4,7 @@
#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
Modified: grass/trunk/lib/htmldriver/Makefile
===================================================================
--- grass/trunk/lib/htmldriver/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/htmldriver/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -2,8 +2,7 @@
EXTRA_CFLAGS=-I../driver
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB)
-LIB_NAME = $(HTMLDRIVER_LIBNAME)
+LIB = HTMLDRIVER
PGM = htmldriver
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/imagery/Makefile
===================================================================
--- grass/trunk/lib/imagery/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/imagery/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/iostream/Makefile
===================================================================
--- grass/trunk/lib/iostream/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/iostream/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../..
-LIB_NAME = $(IOSTREAM_LIBNAME)
+LIB = IOSTREAM
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/linkm/Makefile
===================================================================
--- grass/trunk/lib/linkm/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/linkm/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,7 +1,7 @@
MODULE_TOPDIR = ../..
-LIB_NAME = $(LINKM_LIBNAME)
+LIB = LINKM
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/manage/Makefile
===================================================================
--- grass/trunk/lib/manage/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/manage/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/nviz/Makefile
===================================================================
--- grass/trunk/lib/nviz/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/nviz/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,19 +1,11 @@
MODULE_TOPDIR = ../..
-LIB_NAME = $(NVIZ_LIBNAME)
+LIB = NVIZ
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(OPENGLLIB) \
- $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
- $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB) $(RASTERLIB)
-
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
Modified: grass/trunk/lib/ogsf/Makefile
===================================================================
--- grass/trunk/lib/ogsf/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/ogsf/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/pngdriver/Makefile
===================================================================
--- grass/trunk/lib/pngdriver/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/pngdriver/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -6,12 +6,11 @@
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
Modified: grass/trunk/lib/proj/Makefile
===================================================================
--- grass/trunk/lib/proj/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/proj/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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)
Modified: grass/trunk/lib/psdriver/Makefile
===================================================================
--- grass/trunk/lib/psdriver/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/psdriver/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -2,8 +2,7 @@
EXTRA_CFLAGS=-I../driver
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB)
-LIB_NAME = $(PSDRIVER_LIBNAME)
+LIB = PSDRIVER
PGM = psdriver
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/raster/Makefile
===================================================================
--- grass/trunk/lib/raster/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/raster/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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,14 +18,7 @@
ifneq ($(GDAL_DYNAMIC),)
EXTRA_CFLAGS += -DGDAL_DYNAMIC=1
-ifneq ($(MINGW),)
-EXTRA_LIBS += -lkernel32
-else
-EXTRA_LIBS += $(DLLIB)
endif
-else
-EXTRA_LIBS += $(GDALLIBS)
-endif
endif
Modified: grass/trunk/lib/rowio/Makefile
===================================================================
--- grass/trunk/lib/rowio/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/rowio/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/rst/data/Makefile
===================================================================
--- grass/trunk/lib/rst/data/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/rst/data/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-LIB_NAME = $(INTERPDATA_LIBNAME)
+LIB = INTERPDATA
DEPENDENCIES = $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/rst/interp_float/Makefile
===================================================================
--- grass/trunk/lib/rst/interp_float/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/rst/interp_float/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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)
Modified: grass/trunk/lib/rst/qtree/Makefile
===================================================================
--- grass/trunk/lib/rst/qtree/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/rst/qtree/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-LIB_NAME = $(QTREE_LIBNAME)
+LIB = QTREE
DEPENDENCIES = $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/segment/Makefile
===================================================================
--- grass/trunk/lib/segment/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/segment/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/lib/sites/Makefile
===================================================================
--- grass/trunk/lib/sites/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/sites/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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)
Modified: grass/trunk/lib/stats/Makefile
===================================================================
--- grass/trunk/lib/stats/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/stats/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,8 +1,7 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB) $(RASTERLIB)
-LIB_NAME = $(STATS_LIBNAME)
+LIB = STATS
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/symbol/Makefile
===================================================================
--- grass/trunk/lib/symbol/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/symbol/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,8 +1,7 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB)
-LIB_NAME = $(SYMB_LIBNAME)
+LIB = SYMB
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/vector/Vlib/Makefile
===================================================================
--- grass/trunk/lib/vector/Vlib/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/vector/Vlib/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -2,9 +2,8 @@
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 \
Modified: grass/trunk/lib/vector/dglib/Makefile
===================================================================
--- grass/trunk/lib/vector/dglib/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/vector/dglib/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,7 +4,7 @@
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
Modified: grass/trunk/lib/vector/diglib/Makefile
===================================================================
--- grass/trunk/lib/vector/diglib/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/vector/diglib/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,7 +4,7 @@
MOD_OBJS := $(filter-out test.o port_test.o,$(AUTO_OBJS))
-LIB_NAME = $(DIG2_LIBNAME)
+LIB = DIG2
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/vector/rtree/Makefile
===================================================================
--- grass/trunk/lib/vector/rtree/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/vector/rtree/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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),)
Modified: grass/trunk/lib/vector/transform/Makefile
===================================================================
--- grass/trunk/lib/vector/transform/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/vector/transform/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,7 +1,7 @@
MODULE_TOPDIR = ../../..
-LIB_NAME = $(TRANS_LIBNAME)
+LIB = TRANS
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/trunk/lib/vector/vedit/Makefile
===================================================================
--- grass/trunk/lib/vector/vedit/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/lib/vector/vedit/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/raster/r.li/r.li.cwed/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.cwed/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.daemon/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.daemon/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -1,8 +1,6 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS=$(GISLIB) $(RASTERLIB)
-
-LIB_NAME = grass_rli
+LIB = RLI
PGM = r.li.daemon
DEPENDENCIES = $(GISDEP) $(RASTERDEP)
Modified: grass/trunk/raster/r.li/r.li.dominance/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.dominance/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.edgedensity/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.edgedensity/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.mpa/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.mpa/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.mps/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.mps/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.padcv/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.padcv/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.padrange/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.padrange/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.padsd/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.padsd/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.patchdensity/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.patchdensity/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.patchnum/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.patchnum/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.richness/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.richness/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.shannon/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.shannon/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.shape/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.shape/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/r.li/r.li.simpson/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/r.li/r.li.simpson/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -4,13 +4,11 @@
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
Modified: grass/trunk/raster/simwe/simlib/Makefile
===================================================================
--- grass/trunk/raster/simwe/simlib/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/raster/simwe/simlib/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/vector/lidar/lidarlib/Makefile
===================================================================
--- grass/trunk/vector/lidar/lidarlib/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/vector/lidar/lidarlib/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
Modified: grass/trunk/vector/v.lrs/lib/Makefile
===================================================================
--- grass/trunk/vector/v.lrs/lib/Makefile 2009-08-27 22:42:07 UTC (rev 38892)
+++ grass/trunk/vector/v.lrs/lib/Makefile 2009-08-27 22:44:28 UTC (rev 38893)
@@ -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
More information about the grass-commit
mailing list