R_() fns moved to display library

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

display/d.barscale/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.barscale
 
-LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(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) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.colors/Makefile

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

display/d.colortable/Makefile

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

display/d.erase/Makefile

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

display/d.extract/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.extract
 
-LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(RASTERDEP) $(DATETIMEDEP)
+LIBES     = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

display/d.font/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.font
 
-LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(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     = $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(RASTERDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.geodesic/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.geodesic
 
-LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(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) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES     = $(SYMBLIB) $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.grid/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.grid
 
-LIBES     = $(SYMBLIB) $(DISPLAYLIB) $(RASTERLIB) $(GPROJLIB) $(GISLIB)
-DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(RASTERDEP) $(GPROJDEP) $(GISDEP)
+LIBES     = $(SYMBLIB) $(DISPLAYLIB) $(GPROJLIB) $(GISLIB)
+DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(GPROJDEP) $(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) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.histogram/Makefile

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

display/d.info/Makefile

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

display/d.labels/Makefile

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

display/d.legend/Makefile

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

display/d.linegraph/Makefile

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

display/d.measure/Makefile

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

display/d.nviz/Makefile

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

display/d.path/Makefile

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

display/d.profile/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.profile
 
-LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(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) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(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) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

display/d.rast/Makefile

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

display/d.rgb/Makefile

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

display/d.rhumbline/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.rhumbline
 
-LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(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) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(GISLIB)
+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) $(RASTERLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
-DEPENDENCIES = $(ARRAYSTATSDEP) $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
+LIBES        = $(ARRAYSTATSLIB) $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
+DEPENDENCIES = $(ARRAYSTATSDEP) $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

display/d.title/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.title
 
-LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES     = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(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) $(RASTERLIB) $(VECTLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES        = $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(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) $(RASTERLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
+LIBES        = $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

display/d.what.rast/Makefile

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

display/d.what.vect/Makefile

@@ -3,9 +3,9 @@ MODULE_TOPDIR = ../..
 
 PGM = d.what.vect
 
-LIBES        = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(FORMLIB) $(DBMILIB) $(GISLIB)
+LIBES        = $(DISPLAYLIB) $(VECTLIB) $(FORMLIB) $(DBMILIB) $(GISLIB)
 
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(FORMDEP) $(GISDEP)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(FORMDEP) $(GISDEP)
 
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 EXTRA_INC = $(VECT_INC)

display/d.where/Makefile

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

display/d.zoom/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = d.zoom
 
-LIBES     = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB) 
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(RASTERDEP) $(DATETIMEDEP)
+LIBES     = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB) 
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

imagery/i.class/Makefile

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

imagery/i.points/Makefile

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

imagery/i.vpoints/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = i.vpoints
 
-LIBES     = $(IMAGERYLIB) $(SYMBLIB) $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(CURSES) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(SYMBDEP) $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(GISDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(SYMBLIB) $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(CURSES) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(SYMBDEP) $(DISPLAYDEP) $(VECTDEP) $(GISDEP) $(GMATHDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

include/Make/Grass.make

@@ -135,7 +135,6 @@ ISMAP_LIBNAME         = grass_ismap
 LINKM_LIBNAME         = grass_linkm
 LOCK_LIBNAME          = grass_lock
 MANAGE_LIBNAME        = grass_manage
-RASTER_LIBNAME        = grass_raster
 ROWIO_LIBNAME         = grass_rowio
 SEGMENT_LIBNAME       = grass_segment
 STATS_LIBNAME	      = grass_stats
@@ -210,7 +209,7 @@ CLUSTERLIB    = -l$(CLUSTER_LIBNAME) $(IMAGERYLIB) $(GISLIB)
 COORCNVLIB    = -l$(COORCNV_LIBNAME)
 DATETIMELIB   = -l$(DATETIME_LIBNAME)
 DBDIALOGLIB   = -l$(DBDIALOG_LIBNAME)
-DISPLAYLIB    = -l$(DISPLAY_LIBNAME) $(GISLIB) $(RASTERLIB) 
+DISPLAYLIB    = -l$(DISPLAY_LIBNAME) $(GISLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB)
 DLGLIB        = -l$(DLG_LIBNAME)
 DSPFLIB       = -l$(DSPF_LIBNAME)
 DRIVERLIB     = -l$(DRIVER_LIBNAME) $(GISLIB) $(FTLIB) $(ICONVLIB) 
@@ -232,7 +231,6 @@ ISMAPLIB      = -l$(ISMAP_LIBNAME)
 LINKMLIB      = -l$(LINKM_LIBNAME)
 LOCKLIB       = -l$(LOCK_LIBNAME)
 MANAGELIB     = -l$(MANAGE_LIBNAME)
-RASTERLIB     = -l$(RASTER_LIBNAME) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB) $(GISLIB) 
 ROWIOLIB      = -l$(ROWIO_LIBNAME)
 SEGMENTLIB    = -l$(SEGMENT_LIBNAME) $(GISLIB) 
 STATSLIB      = -l$(STATS_LIBNAME) $(GISLIB) 
@@ -328,7 +326,6 @@ IMAGERYDEP  = $(BASE_LIBDIR)/$(LIB_PREFIX)$(IMAGERY_LIBNAME)$(LIB_SUFFIX)
 IORTHODEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(IORTHO_LIBNAME)$(LIB_SUFFIX)
 LINKMDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LINKM_LIBNAME)$(LIB_SUFFIX)
 LOCKDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LOCK_LIBNAME)$(LIB_SUFFIX)
-RASTERDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(RASTER_LIBNAME)$(LIB_SUFFIX)
 ROWIODEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(ROWIO_LIBNAME)$(LIB_SUFFIX)
 SEGMENTDEP  = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SEGMENT_LIBNAME)$(LIB_SUFFIX)
 STATSDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(STATS_LIBNAME)$(LIB_SUFFIX)

lib/Makefile

@@ -13,7 +13,6 @@ SUBDIRS = \
 	psdriver \
 	htmldriver \
 	cairodriver \
-	raster \
 	bitmap \
 	btree \
 	display \

lib/display/Makefile

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

lib/raster/Makefile

@@ -1,20 +0,0 @@
-MODULE_TOPDIR = ../..
-
-include $(MODULE_TOPDIR)/include/Make/Vars.make
-
-EXTRA_CFLAGS = -I../driver
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(HTMLDRIVERLIB)
-LIB_NAME = $(RASTER_LIBNAME)
-
-ifneq ($(USE_CAIRO),)
-EXTRA_LIBS +=  $(CAIRODRIVERLIB)
-EXTRA_CFLAGS += -DUSE_CAIRO
-endif
-
-include $(MODULE_TOPDIR)/include/Make/Lib.make
-include $(MODULE_TOPDIR)/include/Make/Doxygen.make
-
-default: lib
-
-#doxygen:
-DOXNAME=rastergraphics

raster/r.digit/Makefile

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

raster/r.le/r.le.setup/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../../..
 
 PGM = r.le.setup
 
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(RASTERDEP) $(DISPLAYDEP) $(SITESDEP) $(VECTDEP) $(GISDEP) $(DATETIMEDEP)
+LIBES = $(DISPLAYLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(DISPLAYDEP) $(SITESDEP) $(VECTDEP) $(GISDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 CLEAN_SUBDIRS = polytocell

raster/r.le/r.le.trace/Makefile

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

raster/r.spread/Makefile

@@ -6,8 +6,8 @@ include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 MOD_OBJS := $(filter-out display.o,$(AUTO_OBJS))
 
-# LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-# DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+# LIBES = $(DISPLAYLIB) $(GISLIB)
+# DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
 LIBES = $(GISLIB)
 DEPENDENCIES = $(GISDEP)
 

swig/python/Makefile

@@ -19,7 +19,6 @@ math_LIBS       = $(GMATHLIB)
 proj_LIBS       = $(GPROJLIB)
 imagery_LIBS    = $(IMAGERYLIB)
 vector_LIBS     = $(VECTLIB)
-raster_LIBS     = $(RASTERLIB)
 display_LIBS    = $(DISPLAYLIB)
 stats_LIBS      = $(STATSLIB)
 dbmi_LIBS       = $(DBMILIB)

vector/v.label.sa/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = v.label.sa
 
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(FTLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(FTLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(VECTDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(FTINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

vector/v.label/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM = v.label
 
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(VECTDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)