fix compilation - add $(RASTRLIB/DEP) + various minor fixes (gis/raster lib)

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

display/d.rast.arrow/main.c

@@ -244,7 +244,7 @@ int main(int argc, char **argv)
 	wind.rows = (wind.north - wind.south) / wind.ns_res;
 	wind.cols = (wind.east - wind.west) / wind.ew_res;
 
-	G_set_window(&wind);
+	Rast_set_window(&wind);
 
 	nrows = wind.rows;
 	ncols = wind.cols;

display/d.rast.num/main.c

@@ -154,7 +154,7 @@ int main(int argc, char **argv)
 	wind.rows = (wind.north - wind.south) / wind.ns_res;
 	wind.cols = (wind.east - wind.west) / wind.ew_res;
 
-	G_set_window(&wind);
+	Rast_set_window(&wind);
 
 	nrows = wind.rows;
 	ncols = wind.cols;

display/d.zoom/set.c

@@ -176,9 +176,9 @@ int set_win(struct Cell_head *window, double ux1, double uy1, double ux2,
 
 	limit = print_limit(window, &defwin);
 
-	Rast_adjust_Cell_head3(window, 0, 0, 0);
+	G_adjust_Cell_head3(window, 0, 0, 0);
 	G_put_window(window);
-	G_set_window(window);
+	Rast_set_window(window);
 	redraw();
     }
 

general/g.region/adjust.c

@@ -5,7 +5,7 @@
 
 void adjust_window(struct Cell_head *window, int row_flag, int col_flag, int depth_flag)
 {
-    const char *err = Rast_adjust_Cell_head3(window, row_flag, col_flag, depth_flag);
+    const char *err = G_adjust_Cell_head3(window, row_flag, col_flag, depth_flag);
 
     if (err)
 	G_fatal_error(_("Invalid region: %s"), err);

general/g.region/main.c

@@ -460,7 +460,7 @@ int main(int argc, char *argv[])
 		    window.west : temp_window.west;
 	    }
 	}
-	Rast_adjust_Cell_head3(&window, 0, 0, 0);
+	G_adjust_Cell_head3(&window, 0, 0, 0);
     }
 
 

general/g.region/zoom.c

@@ -15,7 +15,7 @@ int zoom(struct Cell_head *window, const char *name, const char *mapset)
     double north, south, east, west;
 
     adjust_window(window, 0, 0, 0);
-    G_set_window(window);
+    Rast_set_window(window);
     nrows = window->rows;
     ncols = window->cols;
 

general/g.setproj/main.c

@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("PERMANENT: permission denied"));
     }
     G_get_default_window(&cellhd);
-    if (-1 == G_set_window(&cellhd))
+    if (-1 == Rast_set_window(&cellhd))
 	G_fatal_error(_("Current region cannot be set"));
 
     if (G_get_set_window(&cellhd) == -1)

general/manage/lister/Makefile

@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) 
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(RASTRDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

imagery/i.albedo/Makefile

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

imagery/i.atcorr/Makefile

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

imagery/i.atcorr/main.cpp

@@ -100,7 +100,7 @@ static void adjust_region (char *name, const char *mapset)
 	G_fatal_error (_("Unable to read header of raster map <%s>"),
 		       G_fully_qualified_name(name, mapset));
 
-    if(G_set_window(&iimg_head) < 0) 
+    if(Rast_set_window(&iimg_head) < 0) 
 	G_fatal_error (_("Invalid graphics region coordinates"));
 }
 

imagery/i.cca/Makefile

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

imagery/i.class/analyze_sig.c

@@ -16,7 +16,7 @@ int analyze_sig(void)
     Menu_msg("");
 
     /* allocate row buffers and open raster maps */
-    G_set_window(&Band_cellhd);
+    Rast_set_window(&Band_cellhd);
     nbands = Refer.nfiles;
     open_band_files();
 

imagery/i.class/draw_cell.c

@@ -24,7 +24,7 @@ int draw_cell(View * view, int overlay)
     if (overlay == OVER_WRITE)
 	display_title(view);
 
-    G_set_window(&view->cell.head);
+    Rast_set_window(&view->cell.head);
     nrows = G_window_rows();
     ncols = G_window_cols();
 

imagery/i.class/signature.c

@@ -269,7 +269,7 @@ int display_signature(void)
 	nbands = Refer.nfiles;
 
 	/* build new mask based on current signature and Nstd */
-	G_set_window(&VIEW_MAP1->cell.head);
+	Rast_set_window(&VIEW_MAP1->cell.head);
 	open_band_files();
 
 	if ((fd = Rast_open_cell_new(MASK)) < 0)

imagery/i.cluster/Makefile

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

imagery/i.eb.eta/Makefile

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

imagery/i.eb.evapfr/Makefile

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

imagery/i.eb.h_SEBAL01/Makefile

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

imagery/i.eb.soilheatflux/Makefile

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

imagery/i.emissivity/Makefile

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

imagery/i.evapo.time_integration/Makefile

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

imagery/i.fft/Makefile

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

imagery/i.gensig/Makefile

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

imagery/i.gensigset/Makefile

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

imagery/i.his.rgb/Makefile

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

imagery/i.ifft/Makefile

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

imagery/i.ifft/main.c

@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
 	realhead.ns_res != imaghead.ns_res)
 	G_fatal_error(_("The real and imaginary original windows did not match"));
 
-    G_set_window(&realhead);	/* set the window to the whole cell map */
+    Rast_set_window(&realhead);	/* set the window to the whole cell map */
 
     /* get the rows and columns in the current window */
     rows = G_window_rows();

imagery/i.latlong/Makefile

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

imagery/i.maxlik/Makefile

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

imagery/i.modis.qc/Makefile

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

imagery/i.pca/Makefile

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

imagery/i.points/drawcell.c

@@ -37,7 +37,7 @@ int drawcell(View * view)
 
     set_colors(colors);
 
-    G_set_window(&view->cell.head);
+    Rast_set_window(&view->cell.head);
     nrows = G_window_rows();
     ncols = G_window_cols();
 

imagery/i.rectify/Makefile

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

imagery/i.rectify/rectify.c

@@ -34,14 +34,14 @@ int rectify(char *name, char *mapset, char *result, int order)
      */
 
     select_target_env();
-    G_set_window(&target_window);
+    Rast_set_window(&target_window);
     Rast_set_cell_format(cellhd.format);
     select_current_env();
 
     /* open the file to be rectified
      * set window to cellhd first to be able to read file exactly
      */
-    G_set_window(&cellhd);
+    Rast_set_window(&cellhd);
     infd = Rast_open_cell_old(name, mapset);
     if (infd < 0) {
 	close(infd);

imagery/i.rectify/write.c

@@ -41,7 +41,7 @@ int write_map(char *name)
     int fd, row;
     void *rast;
 
-    G_set_window(&target_window);
+    Rast_set_window(&target_window);
 
     rast = Rast_allocate_raster_buf(map_type);
     close(temp_fd);

imagery/i.rgb.his/Makefile

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

imagery/i.smap/Makefile

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

imagery/i.sunhours/Makefile

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

imagery/i.vi/Makefile

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

imagery/i.vpoints/drawcell.c

@@ -47,7 +47,7 @@ int drawcell(View * view, int initflag)
 	Erase_view(VIEW_MAP2_ZOOM);
     }
 
-    G_set_window(&view->cell.head);
+    Rast_set_window(&view->cell.head);
     nrows = G_window_rows();
     ncols = G_window_cols();
 

imagery/i.vpoints/setup.c

@@ -55,7 +55,7 @@ int dsp_setup(int blank, struct Cell_head *cellhead)
 
     D_check_map_window(cellhead);
 
-    if (G_set_window(cellhead) < 0)
+    if (Rast_set_window(cellhead) < 0)
 	G_fatal_error("Invalid graphics window coordinates");
 
     /* Determine conversion factors */

imagery/i.zc/Makefile

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

lib/display/Makefile

@@ -1,6 +1,7 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(DRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(HTMLDRIVERLIB) 
+EXTRA_LIBS=$(GISLIB) $(DRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) \
+	$(HTMLDRIVERLIB) $(RASTRLIB)
 EXTRA_INC = -I../driver
 
 ifneq ($(USE_CAIRO),)

lib/display/setup.c

@@ -11,6 +11,7 @@
  */
 #include <string.h>
 #include <grass/gis.h>
+#include <grass/Rast.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 
@@ -43,7 +44,7 @@ void D_setup(int clear)
     R_get_window(&dt, &db, &dl, &dr);
 
     G_get_set_window(&region);
-    if (G_set_window(&region) < 0)
+    if (Rast_set_window(&region) < 0)
 	G_fatal_error("Invalid graphics coordinates");
 
     D_do_conversions(&region, dt, db, dl, dr);

lib/g3d/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 LIB_NAME = $(G3D_LIBNAME)
 
-EXTRA_LIBS = $(GISLIB)
+EXTRA_LIBS = $(GISLIB) $(RASTRLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/g3d/g3dregion.c

@@ -155,7 +155,7 @@ void G3d_adjustRegion(G3D_Region * region)
     const char *err;
 
     G3d_regionToCellHead(region, &region2d);
-    if ((err = Rast_adjust_Cell_head3(&region2d, 1, 1, 1)) != NULL) {
+    if ((err = G_adjust_Cell_head3(&region2d, 1, 1, 1)) != NULL) {
 	G_fatal_error("G3d_adjustRegion: %s", err);
     }
     G3d_regionFromToCellHead(&region2d, region);
@@ -184,7 +184,7 @@ void G3d_adjustRegionRes(G3D_Region * region)
     const char *err;
 
     G3d_regionToCellHead(region, &region2d);
-    if ((err = Rast_adjust_Cell_head3(&region2d, 1, 1, 1)) != NULL) {
+    if ((err = G_adjust_Cell_head3(&region2d, 1, 1, 1)) != NULL) {
 	G_fatal_error("G3d_adjustRegionRes: %s", err);
     }
     G3d_regionFromToCellHead(&region2d, region);

lib/gpde/Makefile

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

lib/gpde/N_geom.c

@@ -130,7 +130,7 @@ N_geom_data *N_init_geom_data_2d(struct Cell_head * region,
 	/*make a backup from this region */
 	G_get_set_window(&backup);	/*this function is not thread safe */
 	/*set the current region */
-	G_set_window(region);	/*this function is not thread safe */
+	Rast_set_window(region);	/*this function is not thread safe */
 
 	if (geom == NULL)
 	    geom = N_alloc_geom_data();
@@ -170,7 +170,7 @@ N_geom_data *N_init_geom_data_2d(struct Cell_head * region,
 	}
 
 	/*restore the old region */
-	G_set_window(&backup);	/*this function is not thread safe */
+	Rast_set_window(&backup);	/*this function is not thread safe */
     }
 
     return geom;

lib/gpde/N_pde.h

@@ -16,6 +16,7 @@
 *****************************************************************************/
 
 #include <grass/gis.h>
+#include <grass/Rast.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 

lib/nviz/Makefile

@@ -2,7 +2,9 @@ MODULE_TOPDIR = ../..
 
 LIB_NAME = $(NVIZ_LIBNAME)
 
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB)
+EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(OPENGLLIB) \
+	$(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
+	$(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB) $(RASTRLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

lib/ogsf/Makefile

@@ -1,6 +1,8 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB)
+EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) \
+	$(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
+	$(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(RASTRLIB)
 
 LIB_NAME = $(OGSF_LIBNAME)
 

lib/raster/opencell.c

@@ -368,7 +368,7 @@ int Rast__open_cell_old(const char *name, const char *mapset)
 
   Diagnostics: warning message printed if open fails
  
-  Warning: calls to G_set_window() made after opening a new cell file
+  Warning: calls to Rast_set_window() made after opening a new cell file
   may create confusion and should be avoided the new cell file will be
   created to conform to the window at the time of the open.
 

lib/raster/set_window.c

@@ -40,7 +40,7 @@ int Rast_set_window(struct Cell_head *window)
      */
 
     if ((err = G_adjust_Cell_head(window, 0, 0))) {
-	G_warning("G_set_window(): %s", err);
+	G_warning("Rast_set_window(): %s", err);
 	return -1;
     }
 
@@ -55,7 +55,7 @@ int Rast_set_window(struct Cell_head *window)
 		fcb->cellhd.proj == window->proj)
 		continue;
 	    if (i != maskfd) {
-		G_warning(_("G_set_window(): projection/zone differs from that of "
+		G_warning(_("Rast_set_window(): projection/zone differs from that of "
 			    "currently open raster maps"));
 		return -1;
 	    }
@@ -112,7 +112,7 @@ int Rast_set_window(struct Cell_head *window)
 	fcb->min_null_row = (-1) * NULL_ROWS_INMEM;
 	if(fcb->null_cur_row > 0)
 	{
-	  G_warning(_("Calling G_set_window() in the middle of writing map %s"), 
+	  G_warning(_("Calling Rast_set_window() in the middle of writing map %s"), 
 		    fcb->name);
 	    fcb->null_cur_row = 0;
 	}

lib/rst/interp_float/Makefile

@@ -1,10 +1,11 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) $(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB)
+EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) \
+	$(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB) $(RASTRLIB)
 
 LIB_NAME = $(INTERPFL_LIBNAME)
 
-DEPENDENCIES = $(GISDEP)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

lib/rst/interp_float/output2d.c

@@ -128,7 +128,7 @@ int IL_output_2d(struct interp_params *params, struct Cell_head *cellhd,	/* curr
 	return -1;
     }
 
-    if (G_set_window(cellhd) < 0)
+    if (Rast_set_window(cellhd) < 0)
 	return -1;
 
     if (nrows != G_window_rows()) {

lib/rst/interp_float/resout2d.c

@@ -58,7 +58,7 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
     /* change region to output cell file region */
     fprintf(stderr,
 	    "Temporarily changing the region to desired resolution...\n");
-    if (G_set_window(outhd) < 0) {
+    if (Rast_set_window(outhd) < 0) {
 	fprintf(stderr, "Cannot set region to output region!\n");
 	return -1;
     }
@@ -538,7 +538,7 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
 
     /* change region to initial region */
     fprintf(stderr, "Changing the region back to initial...\n");
-    if (G_set_window(winhd) < 0) {
+    if (Rast_set_window(winhd) < 0) {
 	fprintf(stderr, "Cannot set region to back to initial region!\n");
 	return -1;
     }

lib/stats/Makefile

@@ -1,7 +1,6 @@
-
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB)
+EXTRA_LIBS=$(GISLIB) $(RASTRLIB)
 
 LIB_NAME = $(STATS_LIBNAME)
 

ps/ps.map/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 PGM=ps.map
 PROLOG=$(ETC)/paint/prolog.ps
 
-LIBES     = $(VECTLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(DATETIMELIB) $(IMAGERYLIB) $(GMATHLIB)
-DEPENDENCIES = $(VECTDEP) $(SYMBDEP) $(GISDEP) $(DATETIMEDEP) $(IMAGERYDEP) $(GMATHDEP)
+LIBES     = $(VECTLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(RASTRLIB) $(DATETIMELIB) $(IMAGERYLIB) $(GMATHLIB)
+DEPENDENCIES = $(VECTDEP) $(SYMBDEP) $(GISDEP) $(RASTRDEP) $(DATETIMEDEP) $(IMAGERYDEP) $(GMATHDEP)
 
 EXTRA_INC = $(VECT_INC) $(PROJINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

ps/ps.map/main.c

@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
 
     /* set current window */
     G_get_set_window(&PS.w);
-    if (G_set_window(&PS.w) == -1)
+    if (Rast_set_window(&PS.w) == -1)
 	G_fatal_error(_("Current region cannot be set."));
 
     while (1) {

raster/r.basins.fill/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.basins.fill
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.basins.fill/main.c

@@ -28,9 +28,9 @@
 #include <stdio.h>
 #include <grass/gis.h>
 #include <grass/Rast.h>
-#include "local_proto.h"
 #include <grass/glocale.h>
 
+#include "local_proto.h"
 
 #define NOMASK 1
 
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 
     /* this isn't a nice thing to do. Rast_align_window() should be used first */
     Rast_get_cellhd(drain_name, "", &window);
-    G_set_window(&window);
+    Rast_set_window(&window);
 
     nrows = G_window_rows();
     ncols = G_window_cols();

raster/r.bitpattern/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.bitpattern
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.buffer/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.buffer2
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.carve/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.carve
 
-LIBES     = $(SITESLIB) $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) 
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP)
+LIBES     = $(SITESLIB) $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) $(RASTRLIB) 
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

raster/r.category/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.category
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.category/cats.c

@@ -36,7 +36,7 @@ int get_cats(const char *name, const char *mapset)
 	G_fatal_error(_("Cannot read header of raster map <%s> in <%s>"),
 		      name, mapset);
 
-    G_set_window(&cellhd);
+    Rast_set_window(&cellhd);
 
     /* open the raster map */
     fd = Rast_open_cell_old(name, mapset);

raster/r.circle/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.circle
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.clump/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.clump
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.coin/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.coin
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.coin/main.c

@@ -104,15 +104,15 @@ int main(int argc, char *argv[])
     /* now make a temorary region with the same boundaries only 1 x 1 */
     window.rows = 1;
     window.cols = 1;
-    Rast_adjust_Cell_head(&window, 1, 1);
-    G_set_window(&window);
+    G_adjust_Cell_head(&window, 1, 1);
+    Rast_set_window(&window);
 
     G_begin_cell_area_calculations();
     window_area = G_area_of_cell_at_row(0);
 
     /* restore region back to the original */
     G_get_window(&window);
-    G_set_window(&window);
+    Rast_set_window(&window);
 
     dumpname = G_tempfile();
     statname = G_tempfile();

raster/r.colors.out/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.colors.out
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.colors/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.colors
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.composite/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.composite
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.compress/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.compress
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.compress/main.c

@@ -189,7 +189,7 @@ static int doit(char *name, int uncompress, RASTER_MAP_TYPE map_type)
 
     G_message(_("\n%sCOMPRESS [%s]"), uncompress ? "UN" : "", name);
 
-    G_set_window(&cellhd);
+    Rast_set_window(&cellhd);
 
     old = Rast_open_cell_old(name, G_mapset());
     if (old < 0)

raster/r.contour/Makefile

@@ -3,8 +3,8 @@ MODULE_TOPDIR = ../..
 
 PGM=r.contour
 
-LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
  

raster/r.cost/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.cost
 
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

raster/r.covar/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.covar
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.cross/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.cross
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.describe/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.describe
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.describe/describe.c

@@ -46,7 +46,7 @@ int describe(const char *name, int compact, char *no_data_str,
 	if (Rast_get_cellhd(name, "", &window) < 0)
 	    G_fatal_error(_("Unable to get cell header for <%s>"), name);
 
-	G_set_window(&window);
+	Rast_set_window(&window);
 	get_row = Rast_get_c_raster_row_nomask;
     }
     fd = Rast_open_cell_old(name, "");

raster/r.distance/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.distance
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.drain/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.drain
 
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

raster/r.external/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM  = r.external
 
-LIBES= $(GPROJLIB) $(GISLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(IMAGERYDEP) $(GMATHDEP)
+LIBES= $(GPROJLIB) $(GISLIB) $(RASTRLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP) $(IMAGERYDEP) $(GMATHDEP)
 EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

raster/r.external/main.c

@@ -647,7 +647,7 @@ int main(int argc, char *argv[])
     if (!hBand)
 	G_fatal_error(_("Selected band (%d) does not exist"), band);
 
-    if (G_set_window(&cellhd) < 0)
+    if (Rast_set_window(&cellhd) < 0)
 	G_fatal_error(_("Unable to set window"));
 
     query_band(hBand, output, flag_r->answer, &cellhd, &info);

raster/r.fill.dir/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.fill.dir
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.flow/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM=r.flow
 
-LIBES     = $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) 
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP)
+LIBES     = $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) $(RASTRLIB) 
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
  

raster/r.flow/io.c

@@ -193,7 +193,7 @@ void write_density_file(void)
     double dsmax = 0.0;
     struct Colors colors;
 
-    if (G_set_window(&region) < 0)
+    if (Rast_set_window(&region) < 0)
 	G_fatal_error(_("Cannot reset current region"));
 
     G_message(_("Writing density file"));

raster/r.grow.distance/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.grow.distance
 
-LIBES = $(GISLIB) $(MATHLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB) $(MATHLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.his/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.his
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.horizon/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.horizon
 
-LIBES =  $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP)
+LIBES =  $(GPROJLIB) $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

raster/r.horizon/main.c

@@ -471,7 +471,7 @@ int main(int argc, char *argv[])
 	n100 = ceil(n / 100.);
 	m100 = ceil(m / 100.);
 
-	if (G_set_window(&new_cellhd) == -1)
+	if (Rast_set_window(&new_cellhd) == -1)
 	    exit(EXIT_FAILURE);
     }
 
@@ -512,7 +512,7 @@ int main(int argc, char *argv[])
 
     if (bufferZone > 0.) {
 	/* Set the region window back to the original */
-	if (G_set_window(&cellhd) == -1)
+	if (Rast_set_window(&cellhd) == -1)
 	    exit(EXIT_FAILURE);
     }
 
@@ -522,7 +522,7 @@ int main(int argc, char *argv[])
        OUTGR(cellhd.rows,cellhd.cols);
        }
      */
-    if (G_set_window(&cellhd) == -1)
+    if (Rast_set_window(&cellhd) == -1)
 	exit(EXIT_FAILURE);
 
     exit(EXIT_SUCCESS);
@@ -613,7 +613,7 @@ int OUTGR(int numrows, int numcols)
     int fd1 = 0;
     int i, iarc, j;
 
-    if (G_set_window(&cellhd) < 0)
+    if (Rast_set_window(&cellhd) < 0)
 	exit(EXIT_FAILURE);
 
     if (horizon != NULL) {
@@ -1261,7 +1261,7 @@ void calculate(double xcoord, double ycoord, int buffer_e, int buffer_w,
 
 	    /*return back the buffered region */
 	    if (bufferZone > 0.) {
-		if (G_set_window(&new_cellhd) == -1)
+		if (Rast_set_window(&new_cellhd) == -1)
 		    exit(0);
 	    }
 

raster/r.in.arc/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.in.arc
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.in.arc/gethead.c

@@ -98,7 +98,7 @@ int gethead(FILE * fd, struct Cell_head *cellhd, int *missingval)
 	return 0;
     }
 
-    if (err = Rast_adjust_Cell_head(cellhd, 1, 1)) {
+    if (err = G_adjust_Cell_head(cellhd, 1, 1)) {
 	G_warning(err);
 	return 0;
     }

raster/r.in.arc/main.c

@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
 
     nrows = cellhd.rows;
     ncols = cellhd.cols;
-    if (G_set_window(&cellhd) < 0)
+    if (Rast_set_window(&cellhd) < 0)
 	G_fatal_error(_("Can't set window"));
 
     if (nrows != G_window_rows())

raster/r.in.ascii/Makefile

@@ -2,8 +2,8 @@ MODULE_TOPDIR = ../..
 
 PGM = r.in.ascii
 
-LIBES = $(GISLIB)
-DEPENDENCIES = $(GISDEP)
+LIBES = $(GISLIB) $(RASTRLIB)
+DEPENDENCIES = $(GISDEP) $(RASTRDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.in.ascii/gethead.c

@@ -221,7 +221,7 @@ int gethead(FILE * fd,
 	}
     }
 
-    if ((err = Rast_adjust_Cell_head(cellhd, 1, 1))) {
+    if ((err = G_adjust_Cell_head(cellhd, 1, 1))) {
 	G_warning(err);
 	return 0;
     }

raster/r.in.ascii/main.c

@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
 
     nrows = cellhd.rows;
     ncols = cellhd.cols;
-    if (G_set_window(&cellhd) < 0)
+    if (Rast_set_window(&cellhd) < 0)
 	G_fatal_error(_("Can't set window"));
 
     if (nrows != G_window_rows())