Sun Jun 21 21:49:16 EDT 2009

Author: glynn
Date: 2009-06-21 21:49:13 -0400 (Sun, 21 Jun 2009)
New Revision: 38014

Added:
   grass/trunk/include/raster.h
Removed:
   grass/trunk/include/Rast.h
Modified:
   grass/trunk/display/d.colortable/main.c
   grass/trunk/display/d.graph/do_graph.c
   grass/trunk/display/d.graph/graphics.c
   grass/trunk/display/d.graph/main.c
   grass/trunk/display/d.grid/fiducial.c
   grass/trunk/display/d.grid/main.c
   grass/trunk/display/d.grid/plot.c
   grass/trunk/display/d.grid/plotborder.c
   grass/trunk/display/d.his/his.c
   grass/trunk/display/d.his/main.c
   grass/trunk/display/d.histogram/bar.c
   grass/trunk/display/d.histogram/draw_slice.c
   grass/trunk/display/d.histogram/get_stats.c
   grass/trunk/display/d.histogram/main.c
   grass/trunk/display/d.histogram/pie.c
   grass/trunk/display/d.labels/color.c
   grass/trunk/display/d.labels/do_labels.c
   grass/trunk/display/d.labels/main.c
   grass/trunk/display/d.legend/main.c
   grass/trunk/display/d.nviz/main.c
   grass/trunk/display/d.path/main.c
   grass/trunk/display/d.path/select.c
   grass/trunk/display/d.profile/main.c
   grass/trunk/display/d.rast.arrow/main.c
   grass/trunk/display/d.rast.num/main.c
   grass/trunk/display/d.rast/display.c
   grass/trunk/display/d.rast/main.c
   grass/trunk/display/d.rast/mask.c
   grass/trunk/display/d.rgb/main.c
   grass/trunk/display/d.thematic.area/area.c
   grass/trunk/display/d.thematic.area/main.c
   grass/trunk/display/d.thematic.area/plot1.c
   grass/trunk/display/d.title/fancy.c
   grass/trunk/display/d.title/main.c
   grass/trunk/display/d.title/normal.c
   grass/trunk/display/d.vect.chart/bar.c
   grass/trunk/display/d.vect.chart/main.c
   grass/trunk/display/d.vect.chart/pie.c
   grass/trunk/display/d.vect.chart/plot.c
   grass/trunk/display/d.vect/area.c
   grass/trunk/display/d.vect/attr.c
   grass/trunk/display/d.vect/dir.c
   grass/trunk/display/d.vect/label.c
   grass/trunk/display/d.vect/main.c
   grass/trunk/display/d.vect/plot1.c
   grass/trunk/display/d.vect/topo.c
   grass/trunk/display/d.vect/utils.c
   grass/trunk/display/d.vect/zcoor.c
   grass/trunk/general/g.mremove/check_reclass.c
   grass/trunk/general/g.mremove/wc2regex.c
   grass/trunk/general/g.region/adjust.c
   grass/trunk/general/g.region/main.c
   grass/trunk/general/g.region/printwindow.c
   grass/trunk/general/g.region/zoom.c
   grass/trunk/general/g.remove/main.c
   grass/trunk/general/g.rename/main.c
   grass/trunk/general/manage/lister/Makefile
   grass/trunk/general/manage/lister/cell.c
   grass/trunk/general/manage/lister/vector.c
   grass/trunk/imagery/i.albedo/Makefile
   grass/trunk/imagery/i.albedo/main.c
   grass/trunk/imagery/i.atcorr/Makefile
   grass/trunk/imagery/i.atcorr/main.cpp
   grass/trunk/imagery/i.cca/Makefile
   grass/trunk/imagery/i.cca/main.c
   grass/trunk/imagery/i.cca/matrix.c
   grass/trunk/imagery/i.cca/stats.c
   grass/trunk/imagery/i.cca/transform.c
   grass/trunk/imagery/i.cluster/Makefile
   grass/trunk/imagery/i.cluster/checkpt.c
   grass/trunk/imagery/i.cluster/main.c
   grass/trunk/imagery/i.cluster/open_files.c
   grass/trunk/imagery/i.cluster/print1.c
   grass/trunk/imagery/i.cluster/print2.c
   grass/trunk/imagery/i.cluster/print3.c
   grass/trunk/imagery/i.cluster/print4.c
   grass/trunk/imagery/i.cluster/print5.c
   grass/trunk/imagery/i.cluster/print6.c
   grass/trunk/imagery/i.cluster/timer.c
   grass/trunk/imagery/i.eb.eta/Makefile
   grass/trunk/imagery/i.eb.eta/main.c
   grass/trunk/imagery/i.eb.evapfr/Makefile
   grass/trunk/imagery/i.eb.evapfr/main.c
   grass/trunk/imagery/i.eb.h_SEBAL01/Makefile
   grass/trunk/imagery/i.eb.h_SEBAL01/main.c
   grass/trunk/imagery/i.eb.soilheatflux/Makefile
   grass/trunk/imagery/i.eb.soilheatflux/main.c
   grass/trunk/imagery/i.emissivity/Makefile
   grass/trunk/imagery/i.emissivity/main.c
   grass/trunk/imagery/i.evapo.time_integration/Makefile
   grass/trunk/imagery/i.evapo.time_integration/main.c
   grass/trunk/imagery/i.fft/Makefile
   grass/trunk/imagery/i.fft/main.c
   grass/trunk/imagery/i.gensig/Makefile
   grass/trunk/imagery/i.gensig/alloc.c
   grass/trunk/imagery/i.gensig/can_invert.c
   grass/trunk/imagery/i.gensig/closefiles.c
   grass/trunk/imagery/i.gensig/covariance.c
   grass/trunk/imagery/i.gensig/eigen.c
   grass/trunk/imagery/i.gensig/get_train.c
   grass/trunk/imagery/i.gensig/labels.c
   grass/trunk/imagery/i.gensig/lookup_class.c
   grass/trunk/imagery/i.gensig/means.c
   grass/trunk/imagery/i.gensig/openfiles.c
   grass/trunk/imagery/i.gensig/parse.c
   grass/trunk/imagery/i.gensig/read_train.c
   grass/trunk/imagery/i.gensigset/Makefile
   grass/trunk/imagery/i.gensigset/closefiles.c
   grass/trunk/imagery/i.gensigset/get_train.c
   grass/trunk/imagery/i.gensigset/invert.c
   grass/trunk/imagery/i.gensigset/labels.c
   grass/trunk/imagery/i.gensigset/lookup_class.c
   grass/trunk/imagery/i.gensigset/main.c
   grass/trunk/imagery/i.gensigset/openfiles.c
   grass/trunk/imagery/i.gensigset/parse.c
   grass/trunk/imagery/i.gensigset/read_data.c
   grass/trunk/imagery/i.gensigset/read_train.c
   grass/trunk/imagery/i.gensigset/subcluster.c
   grass/trunk/imagery/i.his.rgb/Makefile
   grass/trunk/imagery/i.his.rgb/closefiles.c
   grass/trunk/imagery/i.his.rgb/his2rgb.c
   grass/trunk/imagery/i.his.rgb/main.c
   grass/trunk/imagery/i.his.rgb/openfiles.c
   grass/trunk/imagery/i.ifft/Makefile
   grass/trunk/imagery/i.ifft/main.c
   grass/trunk/imagery/i.latlong/Makefile
   grass/trunk/imagery/i.latlong/main.c
   grass/trunk/imagery/i.maxlik/Makefile
   grass/trunk/imagery/i.maxlik/classify.c
   grass/trunk/imagery/i.maxlik/hist.c
   grass/trunk/imagery/i.maxlik/invert.c
   grass/trunk/imagery/i.maxlik/main.c
   grass/trunk/imagery/i.maxlik/open.c
   grass/trunk/imagery/i.modis.qc/Makefile
   grass/trunk/imagery/i.modis.qc/main.c
   grass/trunk/imagery/i.pca/Makefile
   grass/trunk/imagery/i.pca/main.c
   grass/trunk/imagery/i.pca/support.c
   grass/trunk/imagery/i.rectify/Makefile
   grass/trunk/imagery/i.rectify/crs.c
   grass/trunk/imagery/i.rectify/exec.c
   grass/trunk/imagery/i.rectify/main.c
   grass/trunk/imagery/i.rectify/perform.c
   grass/trunk/imagery/i.rectify/rectify.c
   grass/trunk/imagery/i.rectify/write.c
   grass/trunk/imagery/i.rgb.his/Makefile
   grass/trunk/imagery/i.rgb.his/closefiles.c
   grass/trunk/imagery/i.rgb.his/main.c
   grass/trunk/imagery/i.rgb.his/openfiles.c
   grass/trunk/imagery/i.rgb.his/rgb2his.c
   grass/trunk/imagery/i.smap/Makefile
   grass/trunk/imagery/i.smap/closefiles.c
   grass/trunk/imagery/i.smap/decimate.c
   grass/trunk/imagery/i.smap/history.c
   grass/trunk/imagery/i.smap/interp.c
   grass/trunk/imagery/i.smap/invert.c
   grass/trunk/imagery/i.smap/labels.c
   grass/trunk/imagery/i.smap/model.c
   grass/trunk/imagery/i.smap/multialloc.c
   grass/trunk/imagery/i.smap/opencell.c
   grass/trunk/imagery/i.smap/openfiles.c
   grass/trunk/imagery/i.smap/parse.c
   grass/trunk/imagery/i.smap/read_block.c
   grass/trunk/imagery/i.smap/write_img.c
   grass/trunk/imagery/i.sunhours/Makefile
   grass/trunk/imagery/i.sunhours/main.c
   grass/trunk/imagery/i.vi/Makefile
   grass/trunk/imagery/i.vi/main.c
   grass/trunk/imagery/i.zc/Makefile
   grass/trunk/imagery/i.zc/main.c
   grass/trunk/include/Make/Grass.make
   grass/trunk/lib/cluster/c_point.c
   grass/trunk/lib/display/Makefile
   grass/trunk/lib/display/raster.c
   grass/trunk/lib/display/raster2.c
   grass/trunk/lib/display/setup.c
   grass/trunk/lib/display/tran_colr.c
   grass/trunk/lib/g3d/Makefile
   grass/trunk/lib/g3d/g3dcats.c
   grass/trunk/lib/g3d/g3dclose.c
   grass/trunk/lib/g3d/g3dcolor.c
   grass/trunk/lib/g3d/g3dfpxdr.c
   grass/trunk/lib/g3d/g3dmisc.c
   grass/trunk/lib/g3d/g3dnull.c
   grass/trunk/lib/g3d/g3drange.c
   grass/trunk/lib/g3d/g3dregion.c
   grass/trunk/lib/g3d/g3dvolume.c
   grass/trunk/lib/g3d/getblock.c
   grass/trunk/lib/g3d/tileread.c
   grass/trunk/lib/g3d/tilewrite.c
   grass/trunk/lib/gpde/Makefile
   grass/trunk/lib/gpde/N_arrays.c
   grass/trunk/lib/gpde/N_arrays_calc.c
   grass/trunk/lib/gpde/N_arrays_io.c
   grass/trunk/lib/gpde/N_pde.h
   grass/trunk/lib/nviz/Makefile
   grass/trunk/lib/nviz/nviz.c
   grass/trunk/lib/ogsf/GS2.c
   grass/trunk/lib/ogsf/Gp3.c
   grass/trunk/lib/ogsf/Gs3.c
   grass/trunk/lib/ogsf/Gvl3.c
   grass/trunk/lib/ogsf/Makefile
   grass/trunk/lib/ogsf/gsd_legend.c
   grass/trunk/lib/raster/Makefile
   grass/trunk/lib/raster/alloc_cell.c
   grass/trunk/lib/raster/auto_mask.c
   grass/trunk/lib/raster/cats.c
   grass/trunk/lib/raster/cell_stats.c
   grass/trunk/lib/raster/cellstats_eq.c
   grass/trunk/lib/raster/closecell.c
   grass/trunk/lib/raster/color_compat.c
   grass/trunk/lib/raster/color_free.c
   grass/trunk/lib/raster/color_get.c
   grass/trunk/lib/raster/color_hist.c
   grass/trunk/lib/raster/color_look.c
   grass/trunk/lib/raster/color_org.c
   grass/trunk/lib/raster/color_rand.c
   grass/trunk/lib/raster/color_read.c
   grass/trunk/lib/raster/color_rule.c
   grass/trunk/lib/raster/color_rules.c
   grass/trunk/lib/raster/color_set.c
   grass/trunk/lib/raster/color_write.c
   grass/trunk/lib/raster/color_xform.c
   grass/trunk/lib/raster/format.c
   grass/trunk/lib/raster/fpreclass.c
   grass/trunk/lib/raster/gdal.c
   grass/trunk/lib/raster/get_cellhd.c
   grass/trunk/lib/raster/get_row.c
   grass/trunk/lib/raster/get_row_colr.c
   grass/trunk/lib/raster/histo_eq.c
   grass/trunk/lib/raster/histogram.c
   grass/trunk/lib/raster/init.c
   grass/trunk/lib/raster/mask_info.c
   grass/trunk/lib/raster/maskfd.c
   grass/trunk/lib/raster/null_val.c
   grass/trunk/lib/raster/opencell.c
   grass/trunk/lib/raster/put_row.c
   grass/trunk/lib/raster/quant.c
   grass/trunk/lib/raster/quant_io.c
   grass/trunk/lib/raster/quant_rw.c
   grass/trunk/lib/raster/range.c
   grass/trunk/lib/raster/raster.c
   grass/trunk/lib/raster/raster_metadata.c
   grass/trunk/lib/raster/reclass.c
   grass/trunk/lib/raster/sample.c
   grass/trunk/lib/raster/set_window.c
   grass/trunk/lib/raster/zero_cell.c
   grass/trunk/lib/rst/interp_float/Makefile
   grass/trunk/lib/rst/interp_float/input2d.c
   grass/trunk/lib/rst/interp_float/interp2d.c
   grass/trunk/lib/rst/interp_float/output2d.c
   grass/trunk/lib/rst/interp_float/resout2d.c
   grass/trunk/lib/rst/interp_float/ressegm2d.c
   grass/trunk/lib/stats/Makefile
   grass/trunk/lib/stats/c_ave.c
   grass/trunk/lib/stats/c_count.c
   grass/trunk/lib/stats/c_intr.c
   grass/trunk/lib/stats/c_kurt.c
   grass/trunk/lib/stats/c_max.c
   grass/trunk/lib/stats/c_maxx.c
   grass/trunk/lib/stats/c_median.c
   grass/trunk/lib/stats/c_min.c
   grass/trunk/lib/stats/c_minx.c
   grass/trunk/lib/stats/c_mode.c
   grass/trunk/lib/stats/c_percentile.c
   grass/trunk/lib/stats/c_range.c
   grass/trunk/lib/stats/c_reg.c
   grass/trunk/lib/stats/c_skew.c
   grass/trunk/lib/stats/c_stddev.c
   grass/trunk/lib/stats/c_sum.c
   grass/trunk/lib/stats/c_var.c
   grass/trunk/lib/stats/sort_cell.c
   grass/trunk/ps/ps.map/Makefile
   grass/trunk/ps/ps.map/catval.c
   grass/trunk/ps/ps.map/distance.c
   grass/trunk/ps/ps.map/do_geogrid.c
   grass/trunk/ps/ps.map/do_masking.c
   grass/trunk/ps/ps.map/do_plt.c
   grass/trunk/ps/ps.map/do_psfiles.c
   grass/trunk/ps/ps.map/do_vectors.c
   grass/trunk/ps/ps.map/error.c
   grass/trunk/ps/ps.map/get_font.c
   grass/trunk/ps/ps.map/input.c
   grass/trunk/ps/ps.map/main.c
   grass/trunk/ps/ps.map/makeprocs.c
   grass/trunk/ps/ps.map/map_setup.c
   grass/trunk/ps/ps.map/outl_io.c
   grass/trunk/ps/ps.map/parse_list.c
   grass/trunk/ps/ps.map/ps_header.c
   grass/trunk/ps/ps.map/ps_info.h
   grass/trunk/ps/ps.map/ps_outline.c
   grass/trunk/ps/ps.map/ps_raster.c
   grass/trunk/ps/ps.map/ps_vareas.c
   grass/trunk/ps/ps.map/ps_vlines.c
   grass/trunk/ps/ps.map/r_group.c
   grass/trunk/ps/ps.map/r_labels.c
   grass/trunk/ps/ps.map/r_vareas.c
   grass/trunk/ps/ps.map/r_vpoints.c
   grass/trunk/ps/ps.map/read_cfg.c
   grass/trunk/ps/ps.map/scale.c
   grass/trunk/ps/ps.map/scan_gis.c
   grass/trunk/ps/ps.map/session.c
   grass/trunk/ps/ps.map/vect.c
   grass/trunk/ps/ps.map/vector.c
   grass/trunk/raster/r.basins.fill/Makefile
   grass/trunk/raster/r.basins.fill/main.c
   grass/trunk/raster/r.basins.fill/read_map.c
   grass/trunk/raster/r.bitpattern/Makefile
   grass/trunk/raster/r.bitpattern/main.c
   grass/trunk/raster/r.buffer/Makefile
   grass/trunk/raster/r.buffer/distance.h
   grass/trunk/raster/r.buffer/find_dist.c
   grass/trunk/raster/r.buffer/init.c
   grass/trunk/raster/r.carve/Makefile
   grass/trunk/raster/r.carve/enforce.h
   grass/trunk/raster/r.carve/enforce_ds.c
   grass/trunk/raster/r.carve/main.c
   grass/trunk/raster/r.carve/raster.c
   grass/trunk/raster/r.carve/support.c
   grass/trunk/raster/r.carve/vect.c
   grass/trunk/raster/r.category/Makefile
   grass/trunk/raster/r.category/cats.c
   grass/trunk/raster/r.category/main.c
   grass/trunk/raster/r.circle/Makefile
   grass/trunk/raster/r.circle/main.c
   grass/trunk/raster/r.clump/Makefile
   grass/trunk/raster/r.clump/clump.c
   grass/trunk/raster/r.clump/main.c
   grass/trunk/raster/r.coin/Makefile
   grass/trunk/raster/r.coin/coin.h
   grass/trunk/raster/r.coin/main.c
   grass/trunk/raster/r.coin/make_coin.c
   grass/trunk/raster/r.colors.out/Makefile
   grass/trunk/raster/r.colors.out/main.c
   grass/trunk/raster/r.colors/Makefile
   grass/trunk/raster/r.colors/local_proto.h
   grass/trunk/raster/r.colors/main.c
   grass/trunk/raster/r.colors/rules.c
   grass/trunk/raster/r.colors/stats.c
   grass/trunk/raster/r.composite/Makefile
   grass/trunk/raster/r.composite/main.c
   grass/trunk/raster/r.compress/Makefile
   grass/trunk/raster/r.compress/main.c
   grass/trunk/raster/r.contour/Makefile
   grass/trunk/raster/r.contour/cont.c
   grass/trunk/raster/r.contour/main.c
   grass/trunk/raster/r.cost/Makefile
   grass/trunk/raster/r.cost/btree.c
   grass/trunk/raster/r.cost/main.c
   grass/trunk/raster/r.cost/memory.c
   grass/trunk/raster/r.covar/Makefile
   grass/trunk/raster/r.covar/main.c
   grass/trunk/raster/r.cross/Makefile
   grass/trunk/raster/r.cross/glob.h
   grass/trunk/raster/r.describe/Makefile
   grass/trunk/raster/r.describe/describe.c
   grass/trunk/raster/r.describe/dumplist.c
   grass/trunk/raster/r.describe/main.c
   grass/trunk/raster/r.describe/tree.c
   grass/trunk/raster/r.distance/Makefile
   grass/trunk/raster/r.distance/defs.h
   grass/trunk/raster/r.distance/main.c
   grass/trunk/raster/r.distance/parse.c
   grass/trunk/raster/r.drain/Makefile
   grass/trunk/raster/r.drain/filldir.c
   grass/trunk/raster/r.drain/main.c
   grass/trunk/raster/r.drain/resolve.c
   grass/trunk/raster/r.drain/tinf.c
   grass/trunk/raster/r.external/Makefile
   grass/trunk/raster/r.external/main.c
   grass/trunk/raster/r.fill.dir/Makefile
   grass/trunk/raster/r.fill.dir/dopolys.c
   grass/trunk/raster/r.fill.dir/filldir.c
   grass/trunk/raster/r.fill.dir/main.c
   grass/trunk/raster/r.fill.dir/ppupdate.c
   grass/trunk/raster/r.fill.dir/resolve.c
   grass/trunk/raster/r.fill.dir/tinf.c
   grass/trunk/raster/r.fill.dir/wtrshed.c
   grass/trunk/raster/r.flow/Makefile
   grass/trunk/raster/r.flow/aspect.c
   grass/trunk/raster/r.flow/aspect.h
   grass/trunk/raster/r.flow/io.h
   grass/trunk/raster/r.flow/main.c
   grass/trunk/raster/r.flow/mem.c
   grass/trunk/raster/r.flow/mem.h
   grass/trunk/raster/r.flow/precomp.c
   grass/trunk/raster/r.flow/r.flow.h
   grass/trunk/raster/r.grow.distance/Makefile
   grass/trunk/raster/r.grow.distance/main.c
   grass/trunk/raster/r.gwflow/main.c
   grass/trunk/raster/r.his/Makefile
   grass/trunk/raster/r.his/his.c
   grass/trunk/raster/r.his/main.c
   grass/trunk/raster/r.horizon/Makefile
   grass/trunk/raster/r.horizon/main.c
   grass/trunk/raster/r.in.arc/Makefile
   grass/trunk/raster/r.in.arc/gethead.c
   grass/trunk/raster/r.in.arc/main.c
   grass/trunk/raster/r.in.ascii/Makefile
   grass/trunk/raster/r.in.ascii/gethead.c
   grass/trunk/raster/r.in.ascii/main.c
   grass/trunk/raster/r.in.bin/Makefile
   grass/trunk/raster/r.in.bin/main.c
   grass/trunk/raster/r.in.gdal/Makefile
   grass/trunk/raster/r.in.gdal/main.c
   grass/trunk/raster/r.in.gridatb/Makefile
   grass/trunk/raster/r.in.gridatb/file_io.c
   grass/trunk/raster/r.in.gridatb/local_proto.h
   grass/trunk/raster/r.in.gridatb/main.c
   grass/trunk/raster/r.in.mat/Makefile
   grass/trunk/raster/r.in.mat/main.c
   grass/trunk/raster/r.in.poly/Makefile
   grass/trunk/raster/r.in.poly/get_item.c
   grass/trunk/raster/r.in.poly/getformat.c
   grass/trunk/raster/r.in.poly/main.c
   grass/trunk/raster/r.in.poly/poly2rast.c
   grass/trunk/raster/r.in.poly/raster.c
   grass/trunk/raster/r.in.xyz/Makefile
   grass/trunk/raster/r.in.xyz/local_proto.h
   grass/trunk/raster/r.in.xyz/main.c
   grass/trunk/raster/r.in.xyz/support.c
   grass/trunk/raster/r.info/Makefile
   grass/trunk/raster/r.info/main.c
   grass/trunk/raster/r.info/reclas_txt.c
   grass/trunk/raster/r.kappa/Makefile
   grass/trunk/raster/r.kappa/calc_kappa.c
   grass/trunk/raster/r.kappa/kappa.h
   grass/trunk/raster/r.kappa/main.c
   grass/trunk/raster/r.kappa/prt_mat.c
   grass/trunk/raster/r.kappa/stats.c
   grass/trunk/raster/r.lake/Makefile
   grass/trunk/raster/r.lake/main.c
   grass/trunk/raster/r.le/r.le.patch/patch.h
   grass/trunk/raster/r.le/r.le.pixel/pixel.h
   grass/trunk/raster/r.le/r.le.setup/setup.h
   grass/trunk/raster/r.le/r.le.trace/r.le.trace.h
   grass/trunk/raster/r.li/r.li.cwed/Makefile
   grass/trunk/raster/r.li/r.li.cwed/cwed.c
   grass/trunk/raster/r.li/r.li.cwed/utility.c
   grass/trunk/raster/r.li/r.li.daemon/GenericCell.h
   grass/trunk/raster/r.li/r.li.daemon/avl.c
   grass/trunk/raster/r.li/r.li.daemon/avlID.c
   grass/trunk/raster/r.li/r.li.daemon/daemon.c
   grass/trunk/raster/r.li/r.li.daemon/daemon.h
   grass/trunk/raster/r.li/r.li.daemon/ipc.c
   grass/trunk/raster/r.li/r.li.daemon/list.c
   grass/trunk/raster/r.li/r.li.daemon/worker.c
   grass/trunk/raster/r.li/r.li.dominance/Makefile
   grass/trunk/raster/r.li/r.li.dominance/dominance.c
   grass/trunk/raster/r.li/r.li.edgedensity/Makefile
   grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
   grass/trunk/raster/r.li/r.li.mpa/Makefile
   grass/trunk/raster/r.li/r.li.mpa/mpa.c
   grass/trunk/raster/r.li/r.li.mps/Makefile
   grass/trunk/raster/r.li/r.li.mps/mps.c
   grass/trunk/raster/r.li/r.li.padcv/Makefile
   grass/trunk/raster/r.li/r.li.padcv/padcv.c
   grass/trunk/raster/r.li/r.li.padrange/Makefile
   grass/trunk/raster/r.li/r.li.padrange/padrange.c
   grass/trunk/raster/r.li/r.li.padsd/Makefile
   grass/trunk/raster/r.li/r.li.padsd/padsd.c
   grass/trunk/raster/r.li/r.li.patchdensity/Makefile
   grass/trunk/raster/r.li/r.li.patchdensity/main.c
   grass/trunk/raster/r.li/r.li.patchnum/Makefile
   grass/trunk/raster/r.li/r.li.patchnum/main.c
   grass/trunk/raster/r.li/r.li.richness/Makefile
   grass/trunk/raster/r.li/r.li.richness/richness.c
   grass/trunk/raster/r.li/r.li.shannon/Makefile
   grass/trunk/raster/r.li/r.li.shannon/shannon.c
   grass/trunk/raster/r.li/r.li.shape/Makefile
   grass/trunk/raster/r.li/r.li.shape/main.c
   grass/trunk/raster/r.li/r.li.simpson/Makefile
   grass/trunk/raster/r.li/r.li.simpson/simpson.c
   grass/trunk/raster/r.los/Makefile
   grass/trunk/raster/r.los/delete.c
   grass/trunk/raster/r.los/main.c
   grass/trunk/raster/r.los/make_list.c
   grass/trunk/raster/r.los/make_point.c
   grass/trunk/raster/r.los/mark_pts.c
   grass/trunk/raster/r.los/pts_elim.c
   grass/trunk/raster/r.los/radians.h
   grass/trunk/raster/r.mapcalc/Makefile
   grass/trunk/raster/r.mapcalc/column_shift.c
   grass/trunk/raster/r.mapcalc/evaluate.c
   grass/trunk/raster/r.mapcalc/expression.c
   grass/trunk/raster/r.mapcalc/map.c
   grass/trunk/raster/r.mapcalc/map3.c
   grass/trunk/raster/r.mapcalc/mapcalc.h
   grass/trunk/raster/r.mapcalc/xabs.c
   grass/trunk/raster/r.mapcalc/xacos.c
   grass/trunk/raster/r.mapcalc/xadd.c
   grass/trunk/raster/r.mapcalc/xand.c
   grass/trunk/raster/r.mapcalc/xand2.c
   grass/trunk/raster/r.mapcalc/xasin.c
   grass/trunk/raster/r.mapcalc/xatan.c
   grass/trunk/raster/r.mapcalc/xbitand.c
   grass/trunk/raster/r.mapcalc/xbitnot.c
   grass/trunk/raster/r.mapcalc/xbitor.c
   grass/trunk/raster/r.mapcalc/xbitxor.c
   grass/trunk/raster/r.mapcalc/xcoor.c
   grass/trunk/raster/r.mapcalc/xcoor3.c
   grass/trunk/raster/r.mapcalc/xcos.c
   grass/trunk/raster/r.mapcalc/xdiv.c
   grass/trunk/raster/r.mapcalc/xdouble.c
   grass/trunk/raster/r.mapcalc/xeq.c
   grass/trunk/raster/r.mapcalc/xeval.c
   grass/trunk/raster/r.mapcalc/xexp.c
   grass/trunk/raster/r.mapcalc/xfloat.c
   grass/trunk/raster/r.mapcalc/xge.c
   grass/trunk/raster/r.mapcalc/xgraph.c
   grass/trunk/raster/r.mapcalc/xgt.c
   grass/trunk/raster/r.mapcalc/xif.c
   grass/trunk/raster/r.mapcalc/xint.c
   grass/trunk/raster/r.mapcalc/xisnull.c
   grass/trunk/raster/r.mapcalc/xle.c
   grass/trunk/raster/r.mapcalc/xlog.c
   grass/trunk/raster/r.mapcalc/xlt.c
   grass/trunk/raster/r.mapcalc/xmax.c
   grass/trunk/raster/r.mapcalc/xmedian.c
   grass/trunk/raster/r.mapcalc/xmin.c
   grass/trunk/raster/r.mapcalc/xmod.c
   grass/trunk/raster/r.mapcalc/xmode.c
   grass/trunk/raster/r.mapcalc/xmul.c
   grass/trunk/raster/r.mapcalc/xne.c
   grass/trunk/raster/r.mapcalc/xneg.c
   grass/trunk/raster/r.mapcalc/xnot.c
   grass/trunk/raster/r.mapcalc/xnull.c
   grass/trunk/raster/r.mapcalc/xor.c
   grass/trunk/raster/r.mapcalc/xor2.c
   grass/trunk/raster/r.mapcalc/xpow.c
   grass/trunk/raster/r.mapcalc/xrand.c
   grass/trunk/raster/r.mapcalc/xres.c
   grass/trunk/raster/r.mapcalc/xres3.c
   grass/trunk/raster/r.mapcalc/xround.c
   grass/trunk/raster/r.mapcalc/xrowcol.c
   grass/trunk/raster/r.mapcalc/xshiftl.c
   grass/trunk/raster/r.mapcalc/xshiftr.c
   grass/trunk/raster/r.mapcalc/xshiftru.c
   grass/trunk/raster/r.mapcalc/xsin.c
   grass/trunk/raster/r.mapcalc/xsqrt.c
   grass/trunk/raster/r.mapcalc/xsub.c
   grass/trunk/raster/r.mapcalc/xtan.c
   grass/trunk/raster/r.mfilter/Makefile
   grass/trunk/raster/r.mfilter/filter.h
   grass/trunk/raster/r.mfilter/getrow.c
   grass/trunk/raster/r.mfilter/main.c
   grass/trunk/raster/r.mode/Makefile
   grass/trunk/raster/r.mode/main.c
   grass/trunk/raster/r.mode/read_stats.c
   grass/trunk/raster/r.neighbors/bufs.c
   grass/trunk/raster/r.neighbors/divr_cats.c
   grass/trunk/raster/r.neighbors/gather.c
   grass/trunk/raster/r.neighbors/intr_cats.c
   grass/trunk/raster/r.neighbors/main.c
   grass/trunk/raster/r.neighbors/null_cats.c
   grass/trunk/raster/r.neighbors/readcell.c
   grass/trunk/raster/r.neighbors/readweights.c
   grass/trunk/raster/r.null/Makefile
   grass/trunk/raster/r.null/main.c
   grass/trunk/raster/r.null/mask.c
   grass/trunk/raster/r.out.arc/Makefile
   grass/trunk/raster/r.out.arc/main.c
   grass/trunk/raster/r.out.ascii/Makefile
   grass/trunk/raster/r.out.ascii/formspecific.c
   grass/trunk/raster/r.out.ascii/main.c
   grass/trunk/raster/r.out.bin/Makefile
   grass/trunk/raster/r.out.bin/main.c
   grass/trunk/raster/r.out.gdal/Makefile
   grass/trunk/raster/r.out.gdal/export_band.c
   grass/trunk/raster/r.out.gdal/main.c
   grass/trunk/raster/r.out.gridatb/Makefile
   grass/trunk/raster/r.out.gridatb/local_proto.h
   grass/trunk/raster/r.out.gridatb/main.c
   grass/trunk/raster/r.out.mat/Makefile
   grass/trunk/raster/r.out.mat/main.c
   grass/trunk/raster/r.out.mpeg/Makefile
   grass/trunk/raster/r.out.mpeg/main.c
   grass/trunk/raster/r.out.mpeg/write.c
   grass/trunk/raster/r.out.png/Makefile
   grass/trunk/raster/r.out.png/main.c
   grass/trunk/raster/r.out.pov/Makefile
   grass/trunk/raster/r.out.pov/main.c
   grass/trunk/raster/r.out.ppm/Makefile
   grass/trunk/raster/r.out.ppm/main.c
   grass/trunk/raster/r.out.ppm3/Makefile
   grass/trunk/raster/r.out.ppm3/main.c
   grass/trunk/raster/r.out.tiff/Makefile
   grass/trunk/raster/r.out.tiff/main.c
   grass/trunk/raster/r.out.vrml/Makefile
   grass/trunk/raster/r.out.vrml/main.c
   grass/trunk/raster/r.out.vrml/pv.h
   grass/trunk/raster/r.out.vtk/Makefile
   grass/trunk/raster/r.out.vtk/main.c
   grass/trunk/raster/r.out.vtk/parameters.c
   grass/trunk/raster/r.out.vtk/writeascii.c
   grass/trunk/raster/r.param.scale/Makefile
   grass/trunk/raster/r.param.scale/interface.c
   grass/trunk/raster/r.param.scale/nrutil.c
   grass/trunk/raster/r.param.scale/open_files.c
   grass/trunk/raster/r.param.scale/param.h
   grass/trunk/raster/r.param.scale/process.c
   grass/trunk/raster/r.param.scale/write_cats.c
   grass/trunk/raster/r.patch/Makefile
   grass/trunk/raster/r.patch/do_patch.c
   grass/trunk/raster/r.patch/main.c
   grass/trunk/raster/r.patch/support.c
   grass/trunk/raster/r.profile/Makefile
   grass/trunk/raster/r.profile/local_proto.h
   grass/trunk/raster/r.profile/main.c
   grass/trunk/raster/r.profile/read_rast.c
   grass/trunk/raster/r.proj/Makefile
   grass/trunk/raster/r.proj/bilinear.c
   grass/trunk/raster/r.proj/bilinear_f.c
   grass/trunk/raster/r.proj/bordwalk.c
   grass/trunk/raster/r.proj/cubic.c
   grass/trunk/raster/r.proj/cubic_f.c
   grass/trunk/raster/r.proj/main.c
   grass/trunk/raster/r.proj/nearest.c
   grass/trunk/raster/r.proj/readcell.c
   grass/trunk/raster/r.quant/Makefile
   grass/trunk/raster/r.quant/global.h
   grass/trunk/raster/r.quantile/Makefile
   grass/trunk/raster/r.quantile/main.c
   grass/trunk/raster/r.random.cells/Makefile
   grass/trunk/raster/r.random.cells/flag.c
   grass/trunk/raster/r.random.cells/indep.c
   grass/trunk/raster/r.random.cells/init.c
   grass/trunk/raster/r.random.cells/main.c
   grass/trunk/raster/r.random.cells/random.c
   grass/trunk/raster/r.random.cells/ransurf.h
   grass/trunk/raster/r.random.surface/Makefile
   grass/trunk/raster/r.random.surface/calcsurf.c
   grass/trunk/raster/r.random.surface/gennorm.c
   grass/trunk/raster/r.random.surface/init.c
   grass/trunk/raster/r.random.surface/main.c
   grass/trunk/raster/r.random.surface/random.c
   grass/trunk/raster/r.random.surface/ransurf.h
   grass/trunk/raster/r.random.surface/save.c
   grass/trunk/raster/r.random/Makefile
   grass/trunk/raster/r.random/count.c
   grass/trunk/raster/r.random/main.c
   grass/trunk/raster/r.random/random.c
   grass/trunk/raster/r.random/support.c
   grass/trunk/raster/r.reclass/Makefile
   grass/trunk/raster/r.reclass/input.c
   grass/trunk/raster/r.reclass/main.c
   grass/trunk/raster/r.reclass/parse.c
   grass/trunk/raster/r.reclass/range.c
   grass/trunk/raster/r.reclass/reclass.c
   grass/trunk/raster/r.reclass/rule.h
   grass/trunk/raster/r.reclass/stats.c
   grass/trunk/raster/r.recode/Makefile
   grass/trunk/raster/r.recode/global.h
   grass/trunk/raster/r.recode/main.c
   grass/trunk/raster/r.region/Makefile
   grass/trunk/raster/r.region/main.c
   grass/trunk/raster/r.report/Makefile
   grass/trunk/raster/r.report/global.h
   grass/trunk/raster/r.report/maskinfo.c
   grass/trunk/raster/r.resamp.interp/Makefile
   grass/trunk/raster/r.resamp.interp/main.c
   grass/trunk/raster/r.resamp.rst/main.c
   grass/trunk/raster/r.resamp.stats/main.c
   grass/trunk/raster/r.resample/Makefile
   grass/trunk/raster/r.resample/main.c
   grass/trunk/raster/r.rescale.eq/Makefile
   grass/trunk/raster/r.rescale.eq/get_range.c
   grass/trunk/raster/r.rescale.eq/get_stats.c
   grass/trunk/raster/r.rescale.eq/main.c
   grass/trunk/raster/r.rescale/Makefile
   grass/trunk/raster/r.rescale/get_range.c
   grass/trunk/raster/r.rescale/main.c
   grass/trunk/raster/r.ros/Makefile
   grass/trunk/raster/r.ros/main.c
   grass/trunk/raster/r.ros/spot_dist.c
   grass/trunk/raster/r.series/main.c
   grass/trunk/raster/r.slope.aspect/Makefile
   grass/trunk/raster/r.slope.aspect/main.c
   grass/trunk/raster/r.slope.aspect/opennew.c
   grass/trunk/raster/r.spread/Makefile
   grass/trunk/raster/r.spread/collect_ori.c
   grass/trunk/raster/r.spread/display.c
   grass/trunk/raster/r.spread/insert2Ha.c
   grass/trunk/raster/r.spread/main.c
   grass/trunk/raster/r.spread/ram2out.c
   grass/trunk/raster/r.spread/replaceHa.c
   grass/trunk/raster/r.spread/select_linksB.c
   grass/trunk/raster/r.spread/spot.c
   grass/trunk/raster/r.spread/spread.c
   grass/trunk/raster/r.spreadpath/Makefile
   grass/trunk/raster/r.spreadpath/insert.c
   grass/trunk/raster/r.spreadpath/main.c
   grass/trunk/raster/r.statistics/Makefile
   grass/trunk/raster/r.statistics/main.c
   grass/trunk/raster/r.statistics/o_adev.c
   grass/trunk/raster/r.statistics/o_average.c
   grass/trunk/raster/r.statistics/o_distrib.c
   grass/trunk/raster/r.statistics/o_divr.c
   grass/trunk/raster/r.statistics/o_kurt.c
   grass/trunk/raster/r.statistics/o_max.c
   grass/trunk/raster/r.statistics/o_median.c
   grass/trunk/raster/r.statistics/o_min.c
   grass/trunk/raster/r.statistics/o_mode.c
   grass/trunk/raster/r.statistics/o_sdev.c
   grass/trunk/raster/r.statistics/o_skew.c
   grass/trunk/raster/r.statistics/o_sum.c
   grass/trunk/raster/r.statistics/o_var.c
   grass/trunk/raster/r.statistics/read_stats.c
   grass/trunk/raster/r.statistics2/Makefile
   grass/trunk/raster/r.statistics2/main.c
   grass/trunk/raster/r.statistics3/Makefile
   grass/trunk/raster/r.statistics3/main.c
   grass/trunk/raster/r.stats/Makefile
   grass/trunk/raster/r.stats/global.h
   grass/trunk/raster/r.stats/raw_stats.c
   grass/trunk/raster/r.sun2/Makefile
   grass/trunk/raster/r.sun2/main.c
   grass/trunk/raster/r.sun2/rsunlib.c
   grass/trunk/raster/r.sunmask/Makefile
   grass/trunk/raster/r.sunmask/g_solposition.c
   grass/trunk/raster/r.sunmask/main.c
   grass/trunk/raster/r.sunmask/solpos00.c
   grass/trunk/raster/r.support.stats/Makefile
   grass/trunk/raster/r.support.stats/check.c
   grass/trunk/raster/r.support.stats/histo.c
   grass/trunk/raster/r.support.stats/main.c
   grass/trunk/raster/r.support/Makefile
   grass/trunk/raster/r.support/check.c
   grass/trunk/raster/r.support/histo.c
   grass/trunk/raster/r.support/main.c
   grass/trunk/raster/r.surf.area/Makefile
   grass/trunk/raster/r.surf.area/main.c
   grass/trunk/raster/r.surf.contour/Makefile
   grass/trunk/raster/r.surf.contour/contour.h
   grass/trunk/raster/r.surf.contour/flag_create.c
   grass/trunk/raster/r.surf.contour/flag_destroy.c
   grass/trunk/raster/r.surf.contour/main.c
   grass/trunk/raster/r.surf.fractal/Makefile
   grass/trunk/raster/r.surf.fractal/frac.h
   grass/trunk/raster/r.surf.fractal/spec_syn.c
   grass/trunk/raster/r.surf.gauss/Makefile
   grass/trunk/raster/r.surf.gauss/gaussurf.c
   grass/trunk/raster/r.surf.gauss/main.c
   grass/trunk/raster/r.surf.idw/Makefile
   grass/trunk/raster/r.surf.idw/dist.c
   grass/trunk/raster/r.surf.idw/ll.c
   grass/trunk/raster/r.surf.idw/main.c
   grass/trunk/raster/r.surf.idw/pi.h
   grass/trunk/raster/r.surf.idw2/Makefile
   grass/trunk/raster/r.surf.idw2/main.c
   grass/trunk/raster/r.surf.idw2/read_cell.c
   grass/trunk/raster/r.surf.random/Makefile
   grass/trunk/raster/r.surf.random/main.c
   grass/trunk/raster/r.surf.random/randsurf.c
   grass/trunk/raster/r.terraflow/Makefile
   grass/trunk/raster/r.terraflow/common.h
   grass/trunk/raster/r.terraflow/main.cc
   grass/trunk/raster/r.texture/Makefile
   grass/trunk/raster/r.texture/h_measure.c
   grass/trunk/raster/r.texture/main.c
   grass/trunk/raster/r.thin/Makefile
   grass/trunk/raster/r.thin/io.c
   grass/trunk/raster/r.thin/main.c
   grass/trunk/raster/r.thin/thin_lines.c
   grass/trunk/raster/r.to.rast3/main.c
   grass/trunk/raster/r.to.rast3elev/main.c
   grass/trunk/raster/r.to.vect/Makefile
   grass/trunk/raster/r.to.vect/areas.c
   grass/trunk/raster/r.to.vect/areas_io.c
   grass/trunk/raster/r.to.vect/lines.c
   grass/trunk/raster/r.to.vect/lines_io.c
   grass/trunk/raster/r.to.vect/main.c
   grass/trunk/raster/r.to.vect/points.c
   grass/trunk/raster/r.to.vect/util.c
   grass/trunk/raster/r.topidx/Makefile
   grass/trunk/raster/r.topidx/file_io.c
   grass/trunk/raster/r.topidx/global.h
   grass/trunk/raster/r.topidx/main.c
   grass/trunk/raster/r.topidx/topidx.c
   grass/trunk/raster/r.topmodel/Makefile
   grass/trunk/raster/r.topmodel/file_io.c
   grass/trunk/raster/r.topmodel/global.h
   grass/trunk/raster/r.topmodel/topmodel.c
   grass/trunk/raster/r.univar/globals.h
   grass/trunk/raster/r.uslek/Makefile
   grass/trunk/raster/r.uslek/main.c
   grass/trunk/raster/r.usler/Makefile
   grass/trunk/raster/r.usler/main.c
   grass/trunk/raster/r.volume/Makefile
   grass/trunk/raster/r.volume/centroids.c
   grass/trunk/raster/r.volume/main.c
   grass/trunk/raster/r.walk/Makefile
   grass/trunk/raster/r.walk/btree.c
   grass/trunk/raster/r.walk/main.c
   grass/trunk/raster/r.walk/memory.c
   grass/trunk/raster/r.water.outlet/Makefile
   grass/trunk/raster/r.water.outlet/basin.h
   grass/trunk/raster/r.water.outlet/flag_create.c
   grass/trunk/raster/r.water.outlet/flag_destroy.c
   grass/trunk/raster/r.water.outlet/main.c
   grass/trunk/raster/r.watershed/front/Makefile
   grass/trunk/raster/r.watershed/front/main.c
   grass/trunk/raster/r.watershed/ram/Gwater.h
   grass/trunk/raster/r.watershed/ram/Makefile
   grass/trunk/raster/r.watershed/ram/close_maps.c
   grass/trunk/raster/r.watershed/ram/do_astar.c
   grass/trunk/raster/r.watershed/ram/do_cum.c
   grass/trunk/raster/r.watershed/ram/flag_create.c
   grass/trunk/raster/r.watershed/ram/flag_destroy.c
   grass/trunk/raster/r.watershed/ram/init_vars.c
   grass/trunk/raster/r.watershed/ram/main.c
   grass/trunk/raster/r.watershed/ram/sg_factor.c
   grass/trunk/raster/r.watershed/ram/usage.c
   grass/trunk/raster/r.watershed/seg/Gwater.h
   grass/trunk/raster/r.watershed/seg/Makefile
   grass/trunk/raster/r.watershed/seg/bseg_close.c
   grass/trunk/raster/r.watershed/seg/bseg_get.c
   grass/trunk/raster/r.watershed/seg/bseg_open.c
   grass/trunk/raster/r.watershed/seg/bseg_put.c
   grass/trunk/raster/r.watershed/seg/bseg_read.c
   grass/trunk/raster/r.watershed/seg/bseg_write.c
   grass/trunk/raster/r.watershed/seg/cseg_close.c
   grass/trunk/raster/r.watershed/seg/cseg_get.c
   grass/trunk/raster/r.watershed/seg/cseg_open.c
   grass/trunk/raster/r.watershed/seg/cseg_put.c
   grass/trunk/raster/r.watershed/seg/cseg_read.c
   grass/trunk/raster/r.watershed/seg/cseg_write.c
   grass/trunk/raster/r.watershed/seg/do_astar.c
   grass/trunk/raster/r.watershed/seg/do_cum.c
   grass/trunk/raster/r.watershed/seg/dseg_close.c
   grass/trunk/raster/r.watershed/seg/dseg_get.c
   grass/trunk/raster/r.watershed/seg/dseg_open.c
   grass/trunk/raster/r.watershed/seg/dseg_put.c
   grass/trunk/raster/r.watershed/seg/dseg_read.c
   grass/trunk/raster/r.watershed/seg/dseg_write.c
   grass/trunk/raster/r.watershed/seg/init_vars.c
   grass/trunk/raster/r.watershed/seg/main.c
   grass/trunk/raster/r.watershed/seg/sg_factor.c
   grass/trunk/raster/r.watershed/seg/sseg_close.c
   grass/trunk/raster/r.watershed/seg/sseg_get.c
   grass/trunk/raster/r.watershed/seg/sseg_open.c
   grass/trunk/raster/r.watershed/seg/sseg_put.c
   grass/trunk/raster/r.watershed/seg/usage.c
   grass/trunk/raster/r.watershed/shed/watershed.h
   grass/trunk/raster/r.what.color/Makefile
   grass/trunk/raster/r.what.color/main.c
   grass/trunk/raster/r.what/Makefile
   grass/trunk/raster/r.what/main.c
   grass/trunk/raster3d/r3.cross.rast/main.c
   grass/trunk/raster3d/r3.gwflow/main.c
   grass/trunk/raster3d/r3.mkdspf/calc_linefax.c
   grass/trunk/raster3d/r3.mkdspf/iso_surface.c
   grass/trunk/raster3d/r3.mkdspf/main.c
   grass/trunk/raster3d/r3.mkdspf/r3_find.c
   grass/trunk/raster3d/r3.out.vtk/errorHandling.c
   grass/trunk/raster3d/r3.out.vtk/main.c
   grass/trunk/raster3d/r3.out.vtk/parameters.c
   grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
   grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c
   grass/trunk/raster3d/r3.to.rast/main.c
   grass/trunk/swig/python/Makefile
   grass/trunk/vector/lidar/lidarlib/TcholBand.c
   grass/trunk/vector/lidar/lidarlib/raster.c
   grass/trunk/vector/lidar/lidarlib/zones.c
   grass/trunk/vector/lidar/v.lidar.correction/Makefile
   grass/trunk/vector/lidar/v.lidar.correction/correction.c
   grass/trunk/vector/lidar/v.lidar.correction/main.c
   grass/trunk/vector/lidar/v.lidar.edgedetection/Makefile
   grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c
   grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
   grass/trunk/vector/lidar/v.lidar.growing/ConvexHull.c
   grass/trunk/vector/lidar/v.lidar.growing/Makefile
   grass/trunk/vector/lidar/v.lidar.growing/main.c
   grass/trunk/vector/lidar/v.outlier/Makefile
   grass/trunk/vector/lidar/v.outlier/main.c
   grass/trunk/vector/lidar/v.outlier/outlier.c
   grass/trunk/vector/lidar/v.surf.bspline/Makefile
   grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c
   grass/trunk/vector/lidar/v.surf.bspline/main.c
   grass/trunk/vector/v.convert/Makefile
   grass/trunk/vector/v.convert/att.c
   grass/trunk/vector/v.convert/dist.c
   grass/trunk/vector/v.convert/main.c
   grass/trunk/vector/v.convert/old2new.c
   grass/trunk/vector/v.convert/read.c
   grass/trunk/vector/v.drape/Makefile
   grass/trunk/vector/v.drape/main.c
   grass/trunk/vector/v.extrude/Makefile
   grass/trunk/vector/v.extrude/main.c
   grass/trunk/vector/v.kernel/Makefile
   grass/trunk/vector/v.kernel/function.c
   grass/trunk/vector/v.kernel/main.c
   grass/trunk/vector/v.neighbors/Makefile
   grass/trunk/vector/v.neighbors/main.c
   grass/trunk/vector/v.sample/Makefile
   grass/trunk/vector/v.sample/main.c
   grass/trunk/vector/v.surf.idw/Makefile
   grass/trunk/vector/v.surf.idw/main.c
   grass/trunk/vector/v.surf.idw/read_sites.c
   grass/trunk/vector/v.to.rast/Makefile
   grass/trunk/vector/v.to.rast/do_areas.c
   grass/trunk/vector/v.to.rast/do_lines.c
   grass/trunk/vector/v.to.rast/main.c
   grass/trunk/vector/v.to.rast/raster.c
   grass/trunk/vector/v.to.rast/support.c
   grass/trunk/vector/v.to.rast/vect2rast.c
   grass/trunk/vector/v.vol.rst/dataoct.c
   grass/trunk/vector/v.vol.rst/main.c
   grass/trunk/vector/v.vol.rst/oct.c
   grass/trunk/vector/v.vol.rst/user1.c
   grass/trunk/vector/v.vol.rst/user2.c
   grass/trunk/vector/v.vol.rst/user3.c
   grass/trunk/vector/v.vol.rst/user4.c
   grass/trunk/vector/v.vol.rst/vector.c
   grass/trunk/vector/v.what.rast/Makefile
   grass/trunk/vector/v.what.rast/main.c
   grass/trunk/visualization/xganim/Makefile
   grass/trunk/visualization/xganim/main.cc
Log:
Rename Rast.h->raster.h
Rename libgrass_rast -> libgrass_raster
Rename RASTR{LIB,DEP,_LIBNAME} -> RASTER_*
Fix definition of RASTERLIB
Fix EOLs for imagery/i.evapo.time_integration/main.c
Add SWIG wrapper for raster library


Modified: grass/trunk/display/d.colortable/main.c
===================================================================

--- grass/trunk/display/d.colortable/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.colortable/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <grass/display.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/display/d.graph/do_graph.c
===================================================================
--- grass/trunk/display/d.graph/do_graph.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.graph/do_graph.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/symbol.h>

Modified: grass/trunk/display/d.graph/graphics.c
===================================================================
--- grass/trunk/display/d.graph/graphics.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.graph/graphics.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "local_proto.h"

Modified: grass/trunk/display/d.graph/main.c
===================================================================
--- grass/trunk/display/d.graph/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.graph/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/glocale.h>

Modified: grass/trunk/display/d.grid/fiducial.c
===================================================================
--- grass/trunk/display/d.grid/fiducial.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.grid/fiducial.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/symbol.h>
 #include <grass/colors.h>

Modified: grass/trunk/display/d.grid/main.c
===================================================================
--- grass/trunk/display/d.grid/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.grid/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/gprojects.h>

Modified: grass/trunk/display/d.grid/plot.c
===================================================================
--- grass/trunk/display/d.grid/plot.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.grid/plot.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/gprojects.h>

Modified: grass/trunk/display/d.grid/plotborder.c
===================================================================
--- grass/trunk/display/d.grid/plotborder.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.grid/plotborder.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 
 int plot_border(double grid_size, double east, double north)

Modified: grass/trunk/display/d.his/his.c
===================================================================
--- grass/trunk/display/d.his/his.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.his/his.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "his.h"
 
 /****************************************************************************

Modified: grass/trunk/display/d.his/main.c
===================================================================
--- grass/trunk/display/d.his/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.his/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/glocale.h>

Modified: grass/trunk/display/d.histogram/bar.c
===================================================================
--- grass/trunk/display/d.histogram/bar.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.histogram/bar.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -28,7 +28,7 @@
 
 #include <string.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 

Modified: grass/trunk/display/d.histogram/draw_slice.c
===================================================================
--- grass/trunk/display/d.histogram/draw_slice.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.histogram/draw_slice.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 char percent[] = "%";
 

Modified: grass/trunk/display/d.histogram/get_stats.c
===================================================================
--- grass/trunk/display/d.histogram/get_stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.histogram/get_stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "options.h"
 #include "dhist.h"
 

Modified: grass/trunk/display/d.histogram/main.c
===================================================================
--- grass/trunk/display/d.histogram/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.histogram/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/glocale.h>

Modified: grass/trunk/display/d.histogram/pie.c
===================================================================
--- grass/trunk/display/d.histogram/pie.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.histogram/pie.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -30,7 +30,7 @@
 
 #include <string.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 

Modified: grass/trunk/display/d.labels/color.c
===================================================================
--- grass/trunk/display/d.labels/color.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.labels/color.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 /**  ??? move these into libgis ??? (libraster for set_color_from_RGBA()) **/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/display/d.labels/do_labels.c
===================================================================
--- grass/trunk/display/d.labels/do_labels.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.labels/do_labels.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/glocale.h>

Modified: grass/trunk/display/d.labels/main.c
===================================================================
--- grass/trunk/display/d.labels/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.labels/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include "local_proto.h"

Modified: grass/trunk/display/d.legend/main.c
===================================================================
--- grass/trunk/display/d.legend/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.legend/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>

Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.nviz/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include "local.h"

Modified: grass/trunk/display/d.path/main.c
===================================================================
--- grass/trunk/display/d.path/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.path/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>

Modified: grass/trunk/display/d.path/select.c
===================================================================
--- grass/trunk/display/d.path/select.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.path/select.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>

Modified: grass/trunk/display/d.profile/main.c
===================================================================
--- grass/trunk/display/d.profile/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.profile/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>

Modified: grass/trunk/display/d.rast/display.c
===================================================================
--- grass/trunk/display/d.rast/display.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.rast/display.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/glocale.h>

Modified: grass/trunk/display/d.rast/main.c
===================================================================
--- grass/trunk/display/d.rast/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.rast/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 
 #include "mask.h"

Modified: grass/trunk/display/d.rast/mask.c
===================================================================
--- grass/trunk/display/d.rast/mask.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.rast/mask.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "mask.h"
 #include "local_proto.h"
 

Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.rast.arrow/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>

Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.rast.num/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/colors.h>

Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.rgb/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/glocale.h>

Modified: grass/trunk/display/d.thematic.area/area.c
===================================================================
--- grass/trunk/display/d.thematic.area/area.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.thematic.area/area.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.thematic.area/main.c
===================================================================
--- grass/trunk/display/d.thematic.area/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.thematic.area/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <dirent.h>
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>

Modified: grass/trunk/display/d.thematic.area/plot1.c
===================================================================
--- grass/trunk/display/d.thematic.area/plot1.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.thematic.area/plot1.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.title/fancy.c
===================================================================
--- grass/trunk/display/d.title/fancy.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.title/fancy.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "options.h"
 
 void fancy(struct Cell_head *window, struct Categories *cats, FILE * fp)

Modified: grass/trunk/display/d.title/main.c
===================================================================
--- grass/trunk/display/d.title/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.title/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "options.h"

Modified: grass/trunk/display/d.title/normal.c
===================================================================
--- grass/trunk/display/d.title/normal.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.title/normal.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "options.h"
 #include "local_proto.h"
 

Modified: grass/trunk/display/d.vect/area.c
===================================================================
--- grass/trunk/display/d.vect/area.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/area.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
  */
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.vect/attr.c
===================================================================
--- grass/trunk/display/d.vect/attr.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/attr.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.vect/dir.c
===================================================================
--- grass/trunk/display/d.vect/dir.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/dir.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.vect/label.c
===================================================================
--- grass/trunk/display/d.vect/label.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/label.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>

Modified: grass/trunk/display/d.vect/plot1.c
===================================================================
--- grass/trunk/display/d.vect/plot1.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/plot1.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.vect/topo.c
===================================================================
--- grass/trunk/display/d.vect/topo.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/topo.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.vect/utils.c
===================================================================
--- grass/trunk/display/d.vect/utils.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/utils.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.vect/zcoor.c
===================================================================
--- grass/trunk/display/d.vect/zcoor.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect/zcoor.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 /* Print z coordinate value for each node */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>

Modified: grass/trunk/display/d.vect.chart/bar.c
===================================================================
--- grass/trunk/display/d.vect.chart/bar.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect.chart/bar.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>

Modified: grass/trunk/display/d.vect.chart/main.c
===================================================================
--- grass/trunk/display/d.vect.chart/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect.chart/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 #include <grass/Vect.h>

Modified: grass/trunk/display/d.vect.chart/pie.c
===================================================================
--- grass/trunk/display/d.vect.chart/pie.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect.chart/pie.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>

Modified: grass/trunk/display/d.vect.chart/plot.c
===================================================================
--- grass/trunk/display/d.vect.chart/plot.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/display/d.vect.chart/plot.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/display.h>

Modified: grass/trunk/general/g.mremove/check_reclass.c
===================================================================
--- grass/trunk/general/g.mremove/check_reclass.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/g.mremove/check_reclass.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "global.h"
 

Modified: grass/trunk/general/g.mremove/wc2regex.c
===================================================================
--- grass/trunk/general/g.mremove/wc2regex.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/g.mremove/wc2regex.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 char *wc2regex(const char *wc)
 {

Modified: grass/trunk/general/g.region/adjust.c
===================================================================
--- grass/trunk/general/g.region/adjust.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/g.region/adjust.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/g.region/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/general/g.region/printwindow.c
===================================================================
--- grass/trunk/general/g.region/printwindow.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/g.region/printwindow.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <projects.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 #include "local_proto.h"

Modified: grass/trunk/general/g.region/zoom.c
===================================================================
--- grass/trunk/general/g.region/zoom.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/g.region/zoom.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/general/g.remove/main.c
===================================================================
--- grass/trunk/general/g.remove/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/g.remove/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/list.h>
 

Modified: grass/trunk/general/g.rename/main.c
===================================================================
--- grass/trunk/general/g.rename/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/g.rename/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/list.h>
 

Modified: grass/trunk/general/manage/lister/Makefile
===================================================================
--- grass/trunk/general/manage/lister/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/manage/lister/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../../..
 
-LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(RASTRDEP)
+LIBES = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/general/manage/lister/cell.c
===================================================================
--- grass/trunk/general/manage/lister/cell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/manage/lister/cell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int main(int argc, char *argv[])
 {

Modified: grass/trunk/general/manage/lister/vector.c
===================================================================
--- grass/trunk/general/manage/lister/vector.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/general/manage/lister/vector.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 
 int main(int argc, char *argv[])

Modified: grass/trunk/imagery/i.albedo/Makefile
===================================================================
--- grass/trunk/imagery/i.albedo/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.albedo/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.albedo
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.albedo/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define MAXFILES 8

Modified: grass/trunk/imagery/i.atcorr/Makefile
===================================================================
--- grass/trunk/imagery/i.atcorr/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.atcorr/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,8 +4,8 @@
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-LIBES = $(GISLIB) $(RASTRLIB) 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB) 
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 LINK = $(CXX)
 

Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.atcorr/main.cpp	2009-06-22 01:49:13 UTC (rev 38014)
@@ -37,7 +37,7 @@
 
 extern "C" {
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 }
 

Modified: grass/trunk/imagery/i.cca/Makefile
===================================================================
--- grass/trunk/imagery/i.cca/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cca/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.cca
 
-LIBES     = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.cca/main.c
===================================================================
--- grass/trunk/imagery/i.cca/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cca/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <math.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/gmath.h>
 #include <grass/glocale.h>

Modified: grass/trunk/imagery/i.cca/matrix.c
===================================================================
--- grass/trunk/imagery/i.cca/matrix.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cca/matrix.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 #include "local_proto.h"
 

Modified: grass/trunk/imagery/i.cca/stats.c
===================================================================
--- grass/trunk/imagery/i.cca/stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cca/stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 
 

Modified: grass/trunk/imagery/i.cca/transform.c
===================================================================
--- grass/trunk/imagery/i.cca/transform.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cca/transform.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/imagery/i.cluster/Makefile
===================================================================
--- grass/trunk/imagery/i.cluster/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.cluster
 
-LIBES     = $(CLUSTERLIB) $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES= $(CLUSTERDEP) $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES     = $(CLUSTERLIB) $(IMAGERYLIB) $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES= $(CLUSTERDEP) $(IMAGERYDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.cluster/checkpt.c
===================================================================
--- grass/trunk/imagery/i.cluster/checkpt.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/checkpt.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 #include "local_proto.h"

Modified: grass/trunk/imagery/i.cluster/main.c
===================================================================
--- grass/trunk/imagery/i.cluster/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #define GLOBAL
 #include "global.h"

Modified: grass/trunk/imagery/i.cluster/open_files.c
===================================================================
--- grass/trunk/imagery/i.cluster/open_files.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/open_files.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 

Modified: grass/trunk/imagery/i.cluster/print1.c
===================================================================
--- grass/trunk/imagery/i.cluster/print1.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/print1.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include <grass/cluster.h>

Modified: grass/trunk/imagery/i.cluster/print2.c
===================================================================
--- grass/trunk/imagery/i.cluster/print2.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/print2.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include <grass/cluster.h>

Modified: grass/trunk/imagery/i.cluster/print3.c
===================================================================
--- grass/trunk/imagery/i.cluster/print3.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/print3.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include <grass/cluster.h>

Modified: grass/trunk/imagery/i.cluster/print4.c
===================================================================
--- grass/trunk/imagery/i.cluster/print4.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/print4.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include <grass/cluster.h>

Modified: grass/trunk/imagery/i.cluster/print5.c
===================================================================
--- grass/trunk/imagery/i.cluster/print5.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/print5.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include <grass/cluster.h>

Modified: grass/trunk/imagery/i.cluster/print6.c
===================================================================
--- grass/trunk/imagery/i.cluster/print6.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/print6.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include <grass/cluster.h>

Modified: grass/trunk/imagery/i.cluster/timer.c
===================================================================
--- grass/trunk/imagery/i.cluster/timer.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.cluster/timer.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "global.h"
 
 

Modified: grass/trunk/imagery/i.eb.eta/Makefile
===================================================================
--- grass/trunk/imagery/i.eb.eta/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.eb.eta/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.eb.eta
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.eb.eta/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 double et_a(double r_net_day, double evap_fr, double tempk);
 

Modified: grass/trunk/imagery/i.eb.evapfr/Makefile
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.eb.evapfr/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.eb.evapfr
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.eb.evapfr/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 double evap_fr(double r_net, double g0, double h0);

Modified: grass/trunk/imagery/i.eb.h_SEBAL01/Makefile
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.eb.h_SEBAL01
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.eb.h_SEBAL01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 double **G_alloc_matrix(int rows, int cols)

Modified: grass/trunk/imagery/i.eb.soilheatflux/Makefile
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.eb.soilheatflux/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.eb.soilheatflux
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.eb.soilheatflux/main.c
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 double g_0(double bbalb, double ndvi, double tempk, double rnet,

Modified: grass/trunk/imagery/i.emissivity/Makefile
===================================================================
--- grass/trunk/imagery/i.emissivity/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.emissivity/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.emissivity
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.emissivity/main.c
===================================================================
--- grass/trunk/imagery/i.emissivity/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.emissivity/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 double emissivity_generic(double ndvi);

Modified: grass/trunk/imagery/i.evapo.time_integration/Makefile
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.evapo.time_integration/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.evapo.time_integration
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.evapo.time_integration/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.evapo.time_integration/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,436 +1,436 @@
-
-/****************************************************************************
- *
- * MODULE:       i.evapo.time_integration
- * AUTHOR(S):    Yann Chemin - yann.chemin at gmail.com
- * 		 Ines Cherif - icherif at yahoo.com
- * PURPOSE:      Integrate in time the evapotranspiration from satellite,
- *		 following a daily pattern from meteorological ETo.
- *
- * COPYRIGHT:    (C) 2008-2009 by the GRASS Development Team
- *
- *               This program is free software under the GNU Lesser General Public
- *   	    	 License. Read the file COPYING that comes with GRASS for details.
- *
- *****************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+
+/****************************************************************************
+ *
+ * MODULE:       i.evapo.time_integration
+ * AUTHOR(S):    Yann Chemin - yann.chemin at gmail.com
+ * 		 Ines Cherif - icherif at yahoo.com
+ * PURPOSE:      Integrate in time the evapotranspiration from satellite,
+ *		 following a daily pattern from meteorological ETo.
+ *
+ * COPYRIGHT:    (C) 2008-2009 by the GRASS Development Team
+ *
+ *               This program is free software under the GNU Lesser General Public
+ *   	    	 License. Read the file COPYING that comes with GRASS for details.
+ *
+ *****************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
-#include <grass/glocale.h>
-
-#define MAXFILES 400
-
-int main(int argc, char *argv[])
-{
-    struct Cell_head cellhd;	/*region+header info */
-    char *mapset;		/*mapset name */
-    int nrows, ncols;
-    int row, col;
-    struct GModule *module;
-    struct Option *input, *input1, *input2, *input3, *input4, *input5, *output;
-    struct History history;	/*metadata */
-    struct Colors colors;	/*Color rules */
-
-    /************************************/
-    char *name, *name1, *name2;	/*input raster name */
-    char *result;		/*output raster name */
-
-    /*File Descriptors */
-    int nfiles, nfiles1, nfiles2;
-    int infd[MAXFILES], infd1[MAXFILES], infd2[MAXFILES];
-    int outfd;
-
-    /****************************************/
-    /* Pointers for file names              */
-    char **names;
-    char **ptr;
-    char **names1;
-    char **ptr1;
-    char **names2;
-    char **ptr2;
-
-    /****************************************/
-    int DOYbeforeETa[MAXFILES], DOYafterETa[MAXFILES];
-    int bfr, aft;
-
-    /****************************************/
-    int ok;
-    int i = 0, j = 0;
-    double etodoy;		/*minimum ETo DOY */
-    double startperiod, endperiod;  /*first and last days (DOYs) of the period studied */
-    void *inrast[MAXFILES], *inrast1[MAXFILES], *inrast2[MAXFILES];
-    DCELL *outrast;
-    
-    RASTER_MAP_TYPE in_data_type[MAXFILES];	/* ETa */
-    RASTER_MAP_TYPE in_data_type1[MAXFILES];	/* DOY of ETa */
-    RASTER_MAP_TYPE in_data_type2[MAXFILES];	/* ETo */
-    RASTER_MAP_TYPE out_data_type = DCELL_TYPE;
-
-    /************************************/
-    G_gisinit(argv[0]);
-
-    module = G_define_module();
-    module->description =_("Computes temporal integration of satellite "
-			   "ET actual (ETa) following the daily ET reference "
-			   "(ETo) from meteorological station(s)");
-    module->keywords = _("imagery, evapotranspiration, temporal, integration");
-
-    /* Define the different options */
-    input = G_define_standard_option(G_OPT_R_INPUTS);
-    input->key = "eta";
-    input->description = _("Names of satellite ETa raster maps [mm/d or cm/d]");
-
-    input1 = G_define_standard_option(G_OPT_R_INPUTS);
-    input1->key = "eta_doy";
-    input1->description =
-	_("Names of satellite ETa Day of Year (DOY) raster maps [0-400] [-]");
-
-    input2 = G_define_standard_option(G_OPT_R_INPUTS);
-    input2->key = "eto";
-    input2->description =
-	_("Names of meteorological station ETo raster maps [0-400] [mm/d or cm/d]");
-
-    input3 = G_define_option();
-    input3->key = "eto_doy_min";
-    input3->type = TYPE_DOUBLE;
-    input3->required = YES;
-    input3->description = _("Value of DOY for ETo first day");
-    
-    input4 = G_define_option();
-    input4->key = "start_period";
-    input4->type = TYPE_DOUBLE;
-    input4->required = YES;
-    input4->description = _("Value of DOY for the first day of the period studied");
-
-    input5 = G_define_option();
-    input5->key = "end_period";
-    input5->type = TYPE_DOUBLE;
-    input5->required = YES;
-    input5->description = _("Value of DOY for the last day of the period studied");
-
-    output = G_define_standard_option(G_OPT_R_OUTPUT);
-    
-    /* init nfiles */
-    nfiles = 1;
-    nfiles1 = 1;
-    nfiles2 = 1;
-
-    /********************/
-
-    if (G_parser(argc, argv))
-	exit(EXIT_FAILURE);
-
-    ok = 1;
-    names = input->answers;
-    ptr = input->answers;
-    names1 = input1->answers;
-    ptr1 = input1->answers;
-    names2 = input2->answers;
-    ptr2 = input2->answers;
-    etodoy = atof(input3->answer);
-    startperiod = atof(input4->answer);
-    endperiod = atof(input5->answer);
-    result = output->answer;
-
-    /****************************************/
-    if (endperiod<startperiod) {
-	G_fatal_error(_("The DOY for end_period can not be smaller than start_period"));
-	ok = 0;
-    }
-    if (etodoy>startperiod) {
-	G_fatal_error(_("The DOY for start_period can not be smaller than eto_doy_min"));
-	ok = 0;
-    }
-    if (G_legal_filename(result) < 0) {
-	G_fatal_error(_("<%s> is an illegal name"), result);
-	ok = 0;
-    }
-    for (; *ptr != NULL; ptr++) {
-	if (nfiles > MAXFILES)
-	    G_fatal_error(_("Too many ETa files. Only %d allowed."),
-			  MAXFILES);
-	name = *ptr;
-	/* find map in mapset */
-	mapset = (char *) G_find_cell2(name, "");
-	if (mapset == NULL) {
-	    G_fatal_error(_("Raster map <%s> not found"), name);
-	    ok = 0;
-	}
-	if (!ok)
-	    continue;
-	infd[nfiles] = Rast_open_cell_old(name, mapset);
-	if (infd[nfiles] < 0) {
-	    ok = 0;
-	    continue;
-	}
-	/* Allocate input buffer */
-	in_data_type[nfiles] = Rast_raster_map_type(name, mapset);
-	if ((infd[nfiles] = Rast_open_cell_old(name, mapset)) < 0)
-	    G_fatal_error(_("Unable to open raster map <%s>"), name);
-	if ((Rast_get_cellhd(name, mapset, &cellhd)) < 0)
-	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name);
-	inrast[nfiles] = Rast_allocate_raster_buf(in_data_type[nfiles]);
-	nfiles++;
-    }
-    nfiles--;
-    if (nfiles <= 1)
-	G_fatal_error(_("The min specified input map is two"));
-	
-	/****************************************/
-    ok = 1;
-    for (; *ptr1 != NULL; ptr1++) {
-	if (nfiles1 > MAXFILES)
-	    G_fatal_error(_("Too many ETa files. Only %d allowed."),
-			  MAXFILES);
-	name1 = *ptr1;
-	/* find map in mapset */
-	mapset = (char *) G_find_cell2(name1, "");
-	if (mapset == NULL) {
-	    G_fatal_error(_("Raster map <%s> not found"), name1);
-	    ok = 0;
-	}
-	if (!ok)
-	    continue;
-	infd1[nfiles1] = Rast_open_cell_old(name1, mapset);
-	if (infd1[nfiles1] < 0) {
-	    ok = 0;
-	    continue;
-	}
-	/* Allocate input buffer */
-	in_data_type1[nfiles1] = Rast_raster_map_type(name1, mapset);
-	if ((infd1[nfiles1] = Rast_open_cell_old(name1, mapset)) < 0)
-	    G_fatal_error(_("Unable to open raster map <%s>"), name1);
-	if ((Rast_get_cellhd(name1, mapset, &cellhd)) < 0)
-	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name1);
-	inrast1[nfiles1] = Rast_allocate_raster_buf(in_data_type1[nfiles1]);
-	nfiles1++;
-    }
-    nfiles1--;
-    if (nfiles1 <= 1)
-	G_fatal_error(_("The min specified input map is two"));
-
-
-	/****************************************/
-    if (nfiles != nfiles1)
-	G_fatal_error(_("ETa and ETa_DOY file numbers are not equal!"));
-
-	/****************************************/
-
-    ok = 1;
-    for (; *ptr2 != NULL; ptr2++) {
-	if (nfiles > MAXFILES)
-	    G_fatal_error(_("Too many ETa files. Only %d allowed."),
-			  MAXFILES);
-	name2 = *ptr2;
-	/* find map in mapset */
-	mapset = (char *) G_find_cell2(name2, "");
-	if (mapset == NULL) {
-	    G_fatal_error(_("Raster map <%s> not found"), name2);
-	    ok = 0;
-	}
-	if (!ok)
-	    continue;
-	infd2[nfiles2] = Rast_open_cell_old(name2, mapset);
-	if (infd2[nfiles2] < 0) {
-	    ok = 0;
-	    continue;
-	}
-	/* Allocate input buffer */
-	in_data_type2[nfiles2] = Rast_raster_map_type(name2, mapset);
-	if ((infd2[nfiles2] = Rast_open_cell_old(name2, mapset)) < 0) {
-	    G_fatal_error(_("Unable to open raster map <%s>"), name2);
-	}
-	if ((Rast_get_cellhd(name2, mapset, &cellhd)) < 0) {
-	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name2);
-	}
-	inrast2[nfiles2] = Rast_allocate_d_raster_buf();
-	nfiles2++;
-    }
-    nfiles2--;
-    if (nfiles2 <= 1)
-	G_fatal_error(_("The min specified input map is two"));
-
-    /* Allocate output buffer, use input map data_type */
-    nrows = G_window_rows();
-    ncols = G_window_cols();
-    outrast = Rast_allocate_raster_buf(out_data_type);
-
-   
-    /* Create New raster files */
-    if ((outfd = Rast_open_raster_new(result, 1)) < 0)
-	G_fatal_error(_("Unable to create raster map <%s>"), result);
-
-    /*******************/
-    /* Process pixels */
-    double doy[MAXFILES];
-    double sum[MAXFILES];
-
-    for (row = 0; row < nrows; row++) 
-    {
-	DCELL d_out;
-	DCELL d_ETrF[MAXFILES];
-	DCELL d[MAXFILES];
-	DCELL d1[MAXFILES];
-	DCELL d2[MAXFILES];
-	G_percent(row, nrows, 2);
-
-	/* read input map */
-	for (i = 1; i <= nfiles; i++) 
-	    if ((Rast_get_d_raster_row(infd[i], inrast[i], row)) <	0) 
-		G_fatal_error(_("Unable to read raster map <%s> row %d"), name, row);
-	
-	for (i = 1; i <= nfiles1; i++) 
-	    if ((Rast_get_d_raster_row(infd1[i], inrast1[i], row)) < 0) 
-		G_fatal_error(_("Unable to read raster map <%s> row %d"), name1, row);
-
-	for (i = 1; i <= nfiles2; i++) 
-	    if ((Rast_get_d_raster_row (infd2[i], inrast2[i], row)) < 0) 
-		G_fatal_error(_("Unable to read raster map <%s> row %d"), name2, row);
-
-	/*process the data */
-	for (col = 0; col < ncols; col++) 
-        {
-            int	d1_null=0;
-            int	d_null=0;
-	    for (i = 1; i <= nfiles; i++) 
-            {
-		    if (Rast_is_d_null_value(&((DCELL *) inrast[i])[col]))
-		    	d_null=1;
-		    else
-	                d[i] = (double)((DCELL *) inrast[i])[col];
-	    }
-	    for (i = 1; i <= nfiles1; i++) 
-            {
-		    if (Rast_is_d_null_value(&((DCELL *) inrast1[i])[col]))
-			d1_null=1;
-		    else
-	                d1[i] = ((DCELL *) inrast1[i])[col];
-	    }
-
-	    for (i = 1; i <= nfiles2; i++) 
-		    d2[i] = ((DCELL *) inrast2[i])[col];
-
-	    /* Find out the DOY of the eto image    */
-	    for (i = 1; i <= nfiles1; i++) 
-            {
-		if ( d_null==1 || d1_null==1 )
-			Rast_set_d_null_value(&outrast[col],1);	
-		else
-		{
-			doy[i] = d1[i] - etodoy+1;
-			if (Rast_is_d_null_value(&d2[(int)doy[i]]) || d2[(int)doy[i]]==0 )
-				Rast_set_d_null_value(&outrast[col],1);
-			else
-				d_ETrF[i] = d[i] / d2[(int)doy[i]];
-		} 
-	    }
-
-	    for (i = 1; i <= nfiles1; i++) 
-            {
-		/* do nothing	*/
-		if ( d_null==1 || d1_null==1)
-                {
-			/*G_message("  null value ");*/
-                }
-		else
-		{
-			DOYbeforeETa[i]=0; DOYafterETa[i]=0;
-			if (i == 1)   
-				DOYbeforeETa[i] = startperiod;
-			else
-			{
- 				int k=i-1;
-				while (d1[k]>=startperiod )
-				{
-					if (d1[k]<0)	 // case were d1[k] is null
-						k=k-1;					
-					else
-					{
-						DOYbeforeETa[i] = 1+((d1[i] + d1[k])/2.0);
-						break;
-					}			
-				}
-
-			}
-	
-			if (i == nfiles1)  
-				DOYafterETa[i] = endperiod;
-			else
-			{
-				int k=i+1;
-				while (d1[k]<=endperiod)
-				{
-					if (d1[k]<0)   // case were d1[k] is null
-						k=k+1;
-					else
-					{
-						DOYafterETa[i] = (d1[i] + d1[k]) / 2.0;
-						break;
-	   				}					
-				}
-			}
-		}	
-	    }
-
-	    sum[MAXFILES] = 0.0;
-	    for (i = 1; i <= nfiles1; i++) 
-            {
-		if(d_null==1 || d1_null==1)
-                {
-		    /* do nothing	 */
-		} 
-                else
-                {
-			if (DOYbeforeETa[i]==0 || DOYbeforeETa[i]==0 ) 	
-                            Rast_set_d_null_value(&outrast[col],1);
-			else 
-                        {
-				bfr = (int)DOYbeforeETa[i];
-				aft = (int)DOYafterETa[i];
-				sum[i]=0.0;
-				for (j = bfr; j < aft; j++) 
-					sum[i] += d2[(int)(j-etodoy+1)];
-			}
-		}
-	    }
-	
-	    d_out = 0.0;
-	    for (i = 1; i <= nfiles1; i++)
-            {
-		if(d_null==1 || d_null==1)
-			Rast_set_d_null_value(&outrast[col],1);
-		else
-                {	
-			d_out += d_ETrF[i] * sum[i];
-		     	outrast[col] = d_out;
-		}	
-	    }
-	}
-	if (Rast_put_raster_row(outfd, outrast, out_data_type) < 0)
-	    G_fatal_error(_("Unable to write to raster map<%s>"), result);
-    }
-
-    for (i = 1; i <= nfiles; i++) {
-	G_free(inrast[i]);
-	Rast_close_cell(infd[i]);
-	G_free(inrast1[i]);
-	Rast_close_cell(infd1[i]);
-	G_free(inrast2[i]);
-	Rast_close_cell(infd2[i]);
-    }
-    G_free(outrast);
-    Rast_close_cell(outfd);
-
-    /* Color table from 0.0 to 10.0 */
-    Rast_init_colors(&colors);
-    Rast_add_color_rule(0.0, 0, 0, 0, 10.0, 255, 255, 255, &colors);
-    /* Metadata */
-    Rast_short_history(result, "raster", &history);
-    Rast_command_history(&history);
-    Rast_write_history(result, &history);
-
-    exit(EXIT_SUCCESS);
-}
+#include <grass/raster.h>
+#include <grass/glocale.h>
+
+#define MAXFILES 400
+
+int main(int argc, char *argv[])
+{
+    struct Cell_head cellhd;	/*region+header info */
+    char *mapset;		/*mapset name */
+    int nrows, ncols;
+    int row, col;
+    struct GModule *module;
+    struct Option *input, *input1, *input2, *input3, *input4, *input5, *output;
+    struct History history;	/*metadata */
+    struct Colors colors;	/*Color rules */
+
+    /************************************/
+    char *name, *name1, *name2;	/*input raster name */
+    char *result;		/*output raster name */
+
+    /*File Descriptors */
+    int nfiles, nfiles1, nfiles2;
+    int infd[MAXFILES], infd1[MAXFILES], infd2[MAXFILES];
+    int outfd;
+
+    /****************************************/
+    /* Pointers for file names              */
+    char **names;
+    char **ptr;
+    char **names1;
+    char **ptr1;
+    char **names2;
+    char **ptr2;
+
+    /****************************************/
+    int DOYbeforeETa[MAXFILES], DOYafterETa[MAXFILES];
+    int bfr, aft;
+
+    /****************************************/
+    int ok;
+    int i = 0, j = 0;
+    double etodoy;		/*minimum ETo DOY */
+    double startperiod, endperiod;  /*first and last days (DOYs) of the period studied */
+    void *inrast[MAXFILES], *inrast1[MAXFILES], *inrast2[MAXFILES];
+    DCELL *outrast;
+    
+    RASTER_MAP_TYPE in_data_type[MAXFILES];	/* ETa */
+    RASTER_MAP_TYPE in_data_type1[MAXFILES];	/* DOY of ETa */
+    RASTER_MAP_TYPE in_data_type2[MAXFILES];	/* ETo */
+    RASTER_MAP_TYPE out_data_type = DCELL_TYPE;
+
+    /************************************/
+    G_gisinit(argv[0]);
+
+    module = G_define_module();
+    module->description =_("Computes temporal integration of satellite "
+			   "ET actual (ETa) following the daily ET reference "
+			   "(ETo) from meteorological station(s)");
+    module->keywords = _("imagery, evapotranspiration, temporal, integration");
+
+    /* Define the different options */
+    input = G_define_standard_option(G_OPT_R_INPUTS);
+    input->key = "eta";
+    input->description = _("Names of satellite ETa raster maps [mm/d or cm/d]");
+
+    input1 = G_define_standard_option(G_OPT_R_INPUTS);
+    input1->key = "eta_doy";
+    input1->description =
+	_("Names of satellite ETa Day of Year (DOY) raster maps [0-400] [-]");
+
+    input2 = G_define_standard_option(G_OPT_R_INPUTS);
+    input2->key = "eto";
+    input2->description =
+	_("Names of meteorological station ETo raster maps [0-400] [mm/d or cm/d]");
+
+    input3 = G_define_option();
+    input3->key = "eto_doy_min";
+    input3->type = TYPE_DOUBLE;
+    input3->required = YES;
+    input3->description = _("Value of DOY for ETo first day");
+    
+    input4 = G_define_option();
+    input4->key = "start_period";
+    input4->type = TYPE_DOUBLE;
+    input4->required = YES;
+    input4->description = _("Value of DOY for the first day of the period studied");
+
+    input5 = G_define_option();
+    input5->key = "end_period";
+    input5->type = TYPE_DOUBLE;
+    input5->required = YES;
+    input5->description = _("Value of DOY for the last day of the period studied");
+
+    output = G_define_standard_option(G_OPT_R_OUTPUT);
+    
+    /* init nfiles */
+    nfiles = 1;
+    nfiles1 = 1;
+    nfiles2 = 1;
+
+    /********************/
+
+    if (G_parser(argc, argv))
+	exit(EXIT_FAILURE);
+
+    ok = 1;
+    names = input->answers;
+    ptr = input->answers;
+    names1 = input1->answers;
+    ptr1 = input1->answers;
+    names2 = input2->answers;
+    ptr2 = input2->answers;
+    etodoy = atof(input3->answer);
+    startperiod = atof(input4->answer);
+    endperiod = atof(input5->answer);
+    result = output->answer;
+
+    /****************************************/
+    if (endperiod<startperiod) {
+	G_fatal_error(_("The DOY for end_period can not be smaller than start_period"));
+	ok = 0;
+    }
+    if (etodoy>startperiod) {
+	G_fatal_error(_("The DOY for start_period can not be smaller than eto_doy_min"));
+	ok = 0;
+    }
+    if (G_legal_filename(result) < 0) {
+	G_fatal_error(_("<%s> is an illegal name"), result);
+	ok = 0;
+    }
+    for (; *ptr != NULL; ptr++) {
+	if (nfiles > MAXFILES)
+	    G_fatal_error(_("Too many ETa files. Only %d allowed."),
+			  MAXFILES);
+	name = *ptr;
+	/* find map in mapset */
+	mapset = (char *) G_find_cell2(name, "");
+	if (mapset == NULL) {
+	    G_fatal_error(_("Raster map <%s> not found"), name);
+	    ok = 0;
+	}
+	if (!ok)
+	    continue;
+	infd[nfiles] = Rast_open_cell_old(name, mapset);
+	if (infd[nfiles] < 0) {
+	    ok = 0;
+	    continue;
+	}
+	/* Allocate input buffer */
+	in_data_type[nfiles] = Rast_raster_map_type(name, mapset);
+	if ((infd[nfiles] = Rast_open_cell_old(name, mapset)) < 0)
+	    G_fatal_error(_("Unable to open raster map <%s>"), name);
+	if ((Rast_get_cellhd(name, mapset, &cellhd)) < 0)
+	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name);
+	inrast[nfiles] = Rast_allocate_raster_buf(in_data_type[nfiles]);
+	nfiles++;
+    }
+    nfiles--;
+    if (nfiles <= 1)
+	G_fatal_error(_("The min specified input map is two"));
+	
+	/****************************************/
+    ok = 1;
+    for (; *ptr1 != NULL; ptr1++) {
+	if (nfiles1 > MAXFILES)
+	    G_fatal_error(_("Too many ETa files. Only %d allowed."),
+			  MAXFILES);
+	name1 = *ptr1;
+	/* find map in mapset */
+	mapset = (char *) G_find_cell2(name1, "");
+	if (mapset == NULL) {
+	    G_fatal_error(_("Raster map <%s> not found"), name1);
+	    ok = 0;
+	}
+	if (!ok)
+	    continue;
+	infd1[nfiles1] = Rast_open_cell_old(name1, mapset);
+	if (infd1[nfiles1] < 0) {
+	    ok = 0;
+	    continue;
+	}
+	/* Allocate input buffer */
+	in_data_type1[nfiles1] = Rast_raster_map_type(name1, mapset);
+	if ((infd1[nfiles1] = Rast_open_cell_old(name1, mapset)) < 0)
+	    G_fatal_error(_("Unable to open raster map <%s>"), name1);
+	if ((Rast_get_cellhd(name1, mapset, &cellhd)) < 0)
+	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name1);
+	inrast1[nfiles1] = Rast_allocate_raster_buf(in_data_type1[nfiles1]);
+	nfiles1++;
+    }
+    nfiles1--;
+    if (nfiles1 <= 1)
+	G_fatal_error(_("The min specified input map is two"));
+
+
+	/****************************************/
+    if (nfiles != nfiles1)
+	G_fatal_error(_("ETa and ETa_DOY file numbers are not equal!"));
+
+	/****************************************/
+
+    ok = 1;
+    for (; *ptr2 != NULL; ptr2++) {
+	if (nfiles > MAXFILES)
+	    G_fatal_error(_("Too many ETa files. Only %d allowed."),
+			  MAXFILES);
+	name2 = *ptr2;
+	/* find map in mapset */
+	mapset = (char *) G_find_cell2(name2, "");
+	if (mapset == NULL) {
+	    G_fatal_error(_("Raster map <%s> not found"), name2);
+	    ok = 0;
+	}
+	if (!ok)
+	    continue;
+	infd2[nfiles2] = Rast_open_cell_old(name2, mapset);
+	if (infd2[nfiles2] < 0) {
+	    ok = 0;
+	    continue;
+	}
+	/* Allocate input buffer */
+	in_data_type2[nfiles2] = Rast_raster_map_type(name2, mapset);
+	if ((infd2[nfiles2] = Rast_open_cell_old(name2, mapset)) < 0) {
+	    G_fatal_error(_("Unable to open raster map <%s>"), name2);
+	}
+	if ((Rast_get_cellhd(name2, mapset, &cellhd)) < 0) {
+	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name2);
+	}
+	inrast2[nfiles2] = Rast_allocate_d_raster_buf();
+	nfiles2++;
+    }
+    nfiles2--;
+    if (nfiles2 <= 1)
+	G_fatal_error(_("The min specified input map is two"));
+
+    /* Allocate output buffer, use input map data_type */
+    nrows = G_window_rows();
+    ncols = G_window_cols();
+    outrast = Rast_allocate_raster_buf(out_data_type);
+
+   
+    /* Create New raster files */
+    if ((outfd = Rast_open_raster_new(result, 1)) < 0)
+	G_fatal_error(_("Unable to create raster map <%s>"), result);
+
+    /*******************/
+    /* Process pixels */
+    double doy[MAXFILES];
+    double sum[MAXFILES];
+
+    for (row = 0; row < nrows; row++) 
+    {
+	DCELL d_out;
+	DCELL d_ETrF[MAXFILES];
+	DCELL d[MAXFILES];
+	DCELL d1[MAXFILES];
+	DCELL d2[MAXFILES];
+	G_percent(row, nrows, 2);
+
+	/* read input map */
+	for (i = 1; i <= nfiles; i++) 
+	    if ((Rast_get_d_raster_row(infd[i], inrast[i], row)) <	0) 
+		G_fatal_error(_("Unable to read raster map <%s> row %d"), name, row);
+	
+	for (i = 1; i <= nfiles1; i++) 
+	    if ((Rast_get_d_raster_row(infd1[i], inrast1[i], row)) < 0) 
+		G_fatal_error(_("Unable to read raster map <%s> row %d"), name1, row);
+
+	for (i = 1; i <= nfiles2; i++) 
+	    if ((Rast_get_d_raster_row (infd2[i], inrast2[i], row)) < 0) 
+		G_fatal_error(_("Unable to read raster map <%s> row %d"), name2, row);
+
+	/*process the data */
+	for (col = 0; col < ncols; col++) 
+        {
+            int	d1_null=0;
+            int	d_null=0;
+	    for (i = 1; i <= nfiles; i++) 
+            {
+		    if (Rast_is_d_null_value(&((DCELL *) inrast[i])[col]))
+		    	d_null=1;
+		    else
+	                d[i] = (double)((DCELL *) inrast[i])[col];
+	    }
+	    for (i = 1; i <= nfiles1; i++) 
+            {
+		    if (Rast_is_d_null_value(&((DCELL *) inrast1[i])[col]))
+			d1_null=1;
+		    else
+	                d1[i] = ((DCELL *) inrast1[i])[col];
+	    }
+
+	    for (i = 1; i <= nfiles2; i++) 
+		    d2[i] = ((DCELL *) inrast2[i])[col];
+
+	    /* Find out the DOY of the eto image    */
+	    for (i = 1; i <= nfiles1; i++) 
+            {
+		if ( d_null==1 || d1_null==1 )
+			Rast_set_d_null_value(&outrast[col],1);	
+		else
+		{
+			doy[i] = d1[i] - etodoy+1;
+			if (Rast_is_d_null_value(&d2[(int)doy[i]]) || d2[(int)doy[i]]==0 )
+				Rast_set_d_null_value(&outrast[col],1);
+			else
+				d_ETrF[i] = d[i] / d2[(int)doy[i]];
+		} 
+	    }
+
+	    for (i = 1; i <= nfiles1; i++) 
+            {
+		/* do nothing	*/
+		if ( d_null==1 || d1_null==1)
+                {
+			/*G_message("  null value ");*/
+                }
+		else
+		{
+			DOYbeforeETa[i]=0; DOYafterETa[i]=0;
+			if (i == 1)   
+				DOYbeforeETa[i] = startperiod;
+			else
+			{
+ 				int k=i-1;
+				while (d1[k]>=startperiod )
+				{
+					if (d1[k]<0)	 // case were d1[k] is null
+						k=k-1;					
+					else
+					{
+						DOYbeforeETa[i] = 1+((d1[i] + d1[k])/2.0);
+						break;
+					}			
+				}
+
+			}
+	
+			if (i == nfiles1)  
+				DOYafterETa[i] = endperiod;
+			else
+			{
+				int k=i+1;
+				while (d1[k]<=endperiod)
+				{
+					if (d1[k]<0)   // case were d1[k] is null
+						k=k+1;
+					else
+					{
+						DOYafterETa[i] = (d1[i] + d1[k]) / 2.0;
+						break;
+	   				}					
+				}
+			}
+		}	
+	    }
+
+	    sum[MAXFILES] = 0.0;
+	    for (i = 1; i <= nfiles1; i++) 
+            {
+		if(d_null==1 || d1_null==1)
+                {
+		    /* do nothing	 */
+		} 
+                else
+                {
+			if (DOYbeforeETa[i]==0 || DOYbeforeETa[i]==0 ) 	
+                            Rast_set_d_null_value(&outrast[col],1);
+			else 
+                        {
+				bfr = (int)DOYbeforeETa[i];
+				aft = (int)DOYafterETa[i];
+				sum[i]=0.0;
+				for (j = bfr; j < aft; j++) 
+					sum[i] += d2[(int)(j-etodoy+1)];
+			}
+		}
+	    }
+	
+	    d_out = 0.0;
+	    for (i = 1; i <= nfiles1; i++)
+            {
+		if(d_null==1 || d_null==1)
+			Rast_set_d_null_value(&outrast[col],1);
+		else
+                {	
+			d_out += d_ETrF[i] * sum[i];
+		     	outrast[col] = d_out;
+		}	
+	    }
+	}
+	if (Rast_put_raster_row(outfd, outrast, out_data_type) < 0)
+	    G_fatal_error(_("Unable to write to raster map<%s>"), result);
+    }
+
+    for (i = 1; i <= nfiles; i++) {
+	G_free(inrast[i]);
+	Rast_close_cell(infd[i]);
+	G_free(inrast1[i]);
+	Rast_close_cell(infd1[i]);
+	G_free(inrast2[i]);
+	Rast_close_cell(infd2[i]);
+    }
+    G_free(outrast);
+    Rast_close_cell(outfd);
+
+    /* Color table from 0.0 to 10.0 */
+    Rast_init_colors(&colors);
+    Rast_add_color_rule(0.0, 0, 0, 0, 10.0, 255, 255, 255, &colors);
+    /* Metadata */
+    Rast_short_history(result, "raster", &history);
+    Rast_command_history(&history);
+    Rast_write_history(result, &history);
+
+    exit(EXIT_SUCCESS);
+}


Property changes on: grass/trunk/imagery/i.evapo.time_integration/main.c
___________________________________________________________________
Name: svn:mime-type
   + text/x-csrc
Name: svn:eol-style
   + native

Modified: grass/trunk/imagery/i.fft/Makefile
===================================================================
--- grass/trunk/imagery/i.fft/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.fft/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.fft
 
-LIBES     = $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(FFTWLIB) $(MATHLIB)
-DEPENDENCIES= $(GMATHDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(FFTWLIB) $(MATHLIB)
+DEPENDENCIES= $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.fft/main.c
===================================================================
--- grass/trunk/imagery/i.fft/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.fft/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensig/Makefile
===================================================================
--- grass/trunk/imagery/i.gensig/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.gensig
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.gensig/alloc.c
===================================================================
--- grass/trunk/imagery/i.gensig/alloc.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/alloc.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 
 double *vector(int nl, int nh)

Modified: grass/trunk/imagery/i.gensig/can_invert.c
===================================================================
--- grass/trunk/imagery/i.gensig/can_invert.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/can_invert.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 
 int can_invert(double **a, int n)

Modified: grass/trunk/imagery/i.gensig/closefiles.c
===================================================================
--- grass/trunk/imagery/i.gensig/closefiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/closefiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,4 +1,4 @@
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include "files.h"
 

Modified: grass/trunk/imagery/i.gensig/covariance.c
===================================================================
--- grass/trunk/imagery/i.gensig/covariance.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/covariance.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensig/eigen.c
===================================================================
--- grass/trunk/imagery/i.gensig/eigen.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/eigen.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include <math.h>
 double **matrix(), *vector();

Modified: grass/trunk/imagery/i.gensig/get_train.c
===================================================================
--- grass/trunk/imagery/i.gensig/get_train.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/get_train.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensig/labels.c
===================================================================
--- grass/trunk/imagery/i.gensig/labels.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/labels.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,4 +1,4 @@
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include "parms.h"
 #include "files.h"

Modified: grass/trunk/imagery/i.gensig/lookup_class.c
===================================================================
--- grass/trunk/imagery/i.gensig/lookup_class.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/lookup_class.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 /* build index of cell values from list */
 /* -1 means not found in list */
 

Modified: grass/trunk/imagery/i.gensig/means.c
===================================================================
--- grass/trunk/imagery/i.gensig/means.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/means.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 #include "signature.h"

Modified: grass/trunk/imagery/i.gensig/openfiles.c
===================================================================
--- grass/trunk/imagery/i.gensig/openfiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/openfiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensig/parse.c
===================================================================
--- grass/trunk/imagery/i.gensig/parse.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/parse.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include "parms.h"

Modified: grass/trunk/imagery/i.gensig/read_train.c
===================================================================
--- grass/trunk/imagery/i.gensig/read_train.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensig/read_train.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensigset/Makefile
===================================================================
--- grass/trunk/imagery/i.gensigset/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.gensigset
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.gensigset/closefiles.c
===================================================================
--- grass/trunk/imagery/i.gensigset/closefiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/closefiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,4 +1,4 @@
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 
 #include "files.h"

Modified: grass/trunk/imagery/i.gensigset/get_train.c
===================================================================
--- grass/trunk/imagery/i.gensigset/get_train.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/get_train.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensigset/invert.c
===================================================================
--- grass/trunk/imagery/i.gensigset/invert.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/invert.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 
 int invert(

Modified: grass/trunk/imagery/i.gensigset/labels.c
===================================================================
--- grass/trunk/imagery/i.gensigset/labels.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/labels.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,4 +1,4 @@
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 
 #include "parms.h"

Modified: grass/trunk/imagery/i.gensigset/lookup_class.c
===================================================================
--- grass/trunk/imagery/i.gensigset/lookup_class.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/lookup_class.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 /* build index of cell values from list */
 /* -1 means not found in list */
 

Modified: grass/trunk/imagery/i.gensigset/main.c
===================================================================
--- grass/trunk/imagery/i.gensigset/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 #include "files.h"

Modified: grass/trunk/imagery/i.gensigset/openfiles.c
===================================================================
--- grass/trunk/imagery/i.gensigset/openfiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/openfiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensigset/parse.c
===================================================================
--- grass/trunk/imagery/i.gensigset/parse.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/parse.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 #include "parms.h"

Modified: grass/trunk/imagery/i.gensigset/read_data.c
===================================================================
--- grass/trunk/imagery/i.gensigset/read_data.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/read_data.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensigset/read_train.c
===================================================================
--- grass/trunk/imagery/i.gensigset/read_train.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/read_train.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.gensigset/subcluster.c
===================================================================
--- grass/trunk/imagery/i.gensigset/subcluster.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.gensigset/subcluster.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 #include <grass/gmath.h>

Modified: grass/trunk/imagery/i.his.rgb/Makefile
===================================================================
--- grass/trunk/imagery/i.his.rgb/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.his.rgb/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.his.rgb
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.his.rgb/closefiles.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/closefiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.his.rgb/closefiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 
 /* This routine closes up the cell maps, frees up the row buffers and

Modified: grass/trunk/imagery/i.his.rgb/his2rgb.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/his2rgb.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.his.rgb/his2rgb.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
    each band is processed and written out.   CWU GIS Lab: DBS 8/90 */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 
 void his2rgb(CELL * rowbuffer[3], int columns)

Modified: grass/trunk/imagery/i.his.rgb/main.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.his.rgb/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "globals.h"
 

Modified: grass/trunk/imagery/i.his.rgb/openfiles.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/openfiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.his.rgb/openfiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "globals.h"
 

Modified: grass/trunk/imagery/i.ifft/Makefile
===================================================================
--- grass/trunk/imagery/i.ifft/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.ifft/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.ifft
 
-LIBES     = $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(FFTWLIB) $(MATHLIB)
-DEPENDENCIES= $(GMATHDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(FFTWLIB) $(MATHLIB)
+DEPENDENCIES= $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.ifft/main.c
===================================================================
--- grass/trunk/imagery/i.ifft/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.ifft/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/gmath.h>
 

Modified: grass/trunk/imagery/i.latlong/Makefile
===================================================================
--- grass/trunk/imagery/i.latlong/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.latlong/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.latlong
 
-LIBES =  $(GPROJLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
+LIBES =  $(GPROJLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/imagery/i.latlong/main.c
===================================================================
--- grass/trunk/imagery/i.latlong/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.latlong/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.maxlik/Makefile
===================================================================
--- grass/trunk/imagery/i.maxlik/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.maxlik/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.maxlik
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.maxlik/classify.c
===================================================================
--- grass/trunk/imagery/i.maxlik/classify.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.maxlik/classify.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "global.h"
 
 

Modified: grass/trunk/imagery/i.maxlik/hist.c
===================================================================
--- grass/trunk/imagery/i.maxlik/hist.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.maxlik/hist.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 int make_history(char *name, char *group, char *subgroup, char *sigfile)
 {
     struct History hist;

Modified: grass/trunk/imagery/i.maxlik/invert.c
===================================================================
--- grass/trunk/imagery/i.maxlik/invert.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.maxlik/invert.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 #include "local_proto.h"

Modified: grass/trunk/imagery/i.maxlik/main.c
===================================================================
--- grass/trunk/imagery/i.maxlik/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.maxlik/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 #include "local_proto.h"

Modified: grass/trunk/imagery/i.maxlik/open.c
===================================================================
--- grass/trunk/imagery/i.maxlik/open.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.maxlik/open.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 #include "local_proto.h"

Modified: grass/trunk/imagery/i.modis.qc/Makefile
===================================================================
--- grass/trunk/imagery/i.modis.qc/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.modis.qc/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.modis.qc
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.modis.qc/main.c
===================================================================
--- grass/trunk/imagery/i.modis.qc/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.modis.qc/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
     /* MOD09Q1 Products (250m, 8-Days) */ 

Modified: grass/trunk/imagery/i.pca/Makefile
===================================================================
--- grass/trunk/imagery/i.pca/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.pca/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.pca
 
-LIBES     = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.pca/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 #include <grass/glocale.h>
 #include "local_proto.h"

Modified: grass/trunk/imagery/i.pca/support.c
===================================================================
--- grass/trunk/imagery/i.pca/support.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.pca/support.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/imagery/i.rectify/Makefile
===================================================================
--- grass/trunk/imagery/i.rectify/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rectify/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.rectify
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.rectify/crs.c
===================================================================
--- grass/trunk/imagery/i.rectify/crs.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rectify/crs.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -32,7 +32,7 @@
 #include <math.h>
 #include <limits.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*
    #define MSDOS 1

Modified: grass/trunk/imagery/i.rectify/exec.c
===================================================================
--- grass/trunk/imagery/i.rectify/exec.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rectify/exec.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "global.h"

Modified: grass/trunk/imagery/i.rectify/main.c
===================================================================
--- grass/trunk/imagery/i.rectify/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rectify/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "global.h"

Modified: grass/trunk/imagery/i.rectify/perform.c
===================================================================
--- grass/trunk/imagery/i.rectify/perform.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rectify/perform.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "global.h"
 

Modified: grass/trunk/imagery/i.rectify/rectify.c
===================================================================
--- grass/trunk/imagery/i.rectify/rectify.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rectify/rectify.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <unistd.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "global.h"

Modified: grass/trunk/imagery/i.rectify/write.c
===================================================================
--- grass/trunk/imagery/i.rectify/write.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rectify/write.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "global.h"

Modified: grass/trunk/imagery/i.rgb.his/Makefile
===================================================================
--- grass/trunk/imagery/i.rgb.his/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rgb.his/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.rgb.his
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.rgb.his/closefiles.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/closefiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rgb.his/closefiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 
 /* This routine closes up the cell maps, frees up the row buffers and

Modified: grass/trunk/imagery/i.rgb.his/main.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rgb.his/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "globals.h"
 

Modified: grass/trunk/imagery/i.rgb.his/openfiles.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/openfiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rgb.his/openfiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "globals.h"
 

Modified: grass/trunk/imagery/i.rgb.his/rgb2his.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/rgb2his.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.rgb.his/rgb2his.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
    each band is processed and written out.   CWU GIS Lab: DBS 8/90 */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 
 void rgb2his(CELL * rowbuffer[3], int columns)

Modified: grass/trunk/imagery/i.smap/Makefile
===================================================================
--- grass/trunk/imagery/i.smap/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.smap
 
-LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.smap/closefiles.c
===================================================================
--- grass/trunk/imagery/i.smap/closefiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/closefiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include "bouman.h"

Modified: grass/trunk/imagery/i.smap/decimate.c
===================================================================
--- grass/trunk/imagery/i.smap/decimate.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/decimate.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "bouman.h"
 #include "region.h"
 

Modified: grass/trunk/imagery/i.smap/history.c
===================================================================
--- grass/trunk/imagery/i.smap/history.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/history.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void make_history(const char *name, const char *group, const char *subgroup, const char *sigfile)
 {

Modified: grass/trunk/imagery/i.smap/interp.c
===================================================================
--- grass/trunk/imagery/i.smap/interp.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/interp.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "bouman.h"
 #include "region.h"

Modified: grass/trunk/imagery/i.smap/invert.c
===================================================================
--- grass/trunk/imagery/i.smap/invert.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/invert.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 
 int invert(

Modified: grass/trunk/imagery/i.smap/labels.c
===================================================================
--- grass/trunk/imagery/i.smap/labels.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/labels.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,4 +1,4 @@
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 
 #include "bouman.h"

Modified: grass/trunk/imagery/i.smap/model.c
===================================================================
--- grass/trunk/imagery/i.smap/model.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/model.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include <grass/gmath.h>

Modified: grass/trunk/imagery/i.smap/multialloc.c
===================================================================
--- grass/trunk/imagery/i.smap/multialloc.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/multialloc.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/imagery/i.smap/opencell.c
===================================================================
--- grass/trunk/imagery/i.smap/opencell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/opencell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/imagery/i.smap/openfiles.c
===================================================================
--- grass/trunk/imagery/i.smap/openfiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/openfiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.smap/parse.c
===================================================================
--- grass/trunk/imagery/i.smap/parse.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/parse.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/imagery.h>
 #include "bouman.h"

Modified: grass/trunk/imagery/i.smap/read_block.c
===================================================================
--- grass/trunk/imagery/i.smap/read_block.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/read_block.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.smap/write_img.c
===================================================================
--- grass/trunk/imagery/i.smap/write_img.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.smap/write_img.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,4 +1,4 @@
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/imagery/i.sunhours/Makefile
===================================================================
--- grass/trunk/imagery/i.sunhours/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.sunhours/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.sunhours
 
-LIBES =  $(GPROJLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
+LIBES =  $(GPROJLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/imagery/i.sunhours/main.c
===================================================================
--- grass/trunk/imagery/i.sunhours/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.sunhours/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
     
 #define PI 3.1415927

Modified: grass/trunk/imagery/i.vi/Makefile
===================================================================
--- grass/trunk/imagery/i.vi/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.vi/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.vi
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.vi/main.c
===================================================================
--- grass/trunk/imagery/i.vi/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.vi/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 double s_r(double redchan, double nirchan);

Modified: grass/trunk/imagery/i.zc/Makefile
===================================================================
--- grass/trunk/imagery/i.zc/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.zc/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = i.zc
 
-LIBES     = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(FFTWLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTRDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(FFTWLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/imagery/i.zc/main.c
===================================================================
--- grass/trunk/imagery/i.zc/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/imagery/i.zc/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/include/Make/Grass.make	2009-06-22 01:49:13 UTC (rev 38014)
@@ -135,6 +135,7 @@
 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
@@ -142,9 +143,6 @@
 XGI_LIBNAME	      = grass_Xgi
 XPM_LIBNAME	      = grass_Xpm
 
-# Raster
-RASTR_LIBNAME         = grass_rast
-
 # Vector
 DIG_LIBNAME           = grass_dig
 DIG2_LIBNAME          = grass_dig2
@@ -234,6 +232,7 @@
 LINKMLIB      = -l$(LINKM_LIBNAME)
 LOCKLIB       = -l$(LOCK_LIBNAME)
 MANAGELIB     = -l$(MANAGE_LIBNAME)
+RASTERLIB     = -l$(RASTER_LIBNAME) $(GISLIB)
 ROWIOLIB      = -l$(ROWIO_LIBNAME)
 SEGMENTLIB    = -l$(SEGMENT_LIBNAME) $(GISLIB) 
 STATSLIB      = -l$(STATS_LIBNAME) $(GISLIB) 
@@ -241,9 +240,6 @@
 XGILIB        = -l$(XGI_LIBNAME)
 XPMLIB        = -l$(XPM_LIBNAME)
 
-# Raster
-RASTRLIB      = -l$(RASTR_LIBNAME) $(DATETIMELIB) $(XDRLIB) $(SOCKLIB) $(INTLLIB)
-
 # DBMI
 DBMIBASELIB   = -l$(DBMIBASE_LIBNAME) $(GISLIB) 
 DBMICLIENTLIB = -l$(DBMICLIENT_LIBNAME) $(DBMIBASELIB) $(GISLIB) 
@@ -332,6 +328,7 @@
 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)
@@ -339,9 +336,6 @@
 XGIDEP	    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(XGI_LIBNAME)$(LIB_SUFFIX)
 XPMDEP	    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(XPM_LIBNAME)$(LIB_SUFFIX)
 
-# Raster
-RASTRDEP    = $(BASE_LIBDIR)/$(LIB_PREFIX)$(RASTR_LIBNAME)$(LIB_SUFFIX)
-
 # DBMI
 DBMIBASEDEP     = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DBMIBASE_LIBNAME)$(LIB_SUFFIX)
 DBMICLIENTDEP   = $(BASE_LIBDIR)/$(LIB_PREFIX)$(DBMICLIENT_LIBNAME)$(LIB_SUFFIX)

Deleted: grass/trunk/include/Rast.h
===================================================================
--- grass/trunk/include/Rast.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/include/Rast.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,537 +0,0 @@
-#ifndef GRASS_RAST_H
-#define GRASS_RAST_H
-#include <grass/gis.h>
-
-/* --- ANSI prototypes for the lib/raster functions --- */
-
-/* alloc_cell.c */
-size_t Rast_raster_size(RASTER_MAP_TYPE);
-CELL *Rast_allocate_cell_buf(void);
-void *Rast_allocate_raster_buf(RASTER_MAP_TYPE);
-CELL *Rast_allocate_c_raster_buf(void);
-FCELL *Rast_allocate_f_raster_buf(void);
-DCELL *Rast_allocate_d_raster_buf(void);
-char *Rast_allocate_null_buf(void);
-unsigned char *Rast__allocate_null_bits(int);
-int Rast__null_bitstream_size(int);
-
-/* auto_mask.c */
-int Rast__check_for_auto_masking(void);
-void Rast_suppress_masking(void);
-void Rast_unsuppress_masking(void);
-
-/* cats.c */
-int Rast_read_cats(const char *, const char *, struct Categories *);
-int Rast_read_raster_cats(const char *, const char *, struct Categories *);
-int Rast_read_vector_cats(const char *, const char *, struct Categories *);
-CELL Rast_number_of_cats(const char *, const char *);
-char *Rast_get_cats_title(const struct Categories *);
-char *Rast_get_raster_cats_title(const struct Categories *);
-char *Rast_get_cat(CELL, struct Categories *);
-char *Rast_get_c_raster_cat(CELL *, struct Categories *);
-char *Rast_get_f_raster_cat(FCELL *, struct Categories *);
-char *Rast_get_d_raster_cat(DCELL *, struct Categories *);
-char *Rast_get_raster_cat(void *, struct Categories *, RASTER_MAP_TYPE);
-void Rast_unmark_raster_cats(struct Categories *);
-void Rast_mark_c_raster_cats(const CELL *, int, struct Categories *);
-void Rast_mark_f_raster_cats(const FCELL *, int, struct Categories *);
-void Rast_mark_d_raster_cats(const DCELL *, int, struct Categories *);
-int Rast_mark_raster_cats(const void *, int, struct Categories *, RASTER_MAP_TYPE);
-void Rast_rewind_raster_cats(struct Categories *);
-char *Rast_get_next_marked_d_raster_cat(struct Categories *, DCELL *, DCELL *,
-				     long *);
-char *Rast_get_next_marked_c_raster_cat(struct Categories *, CELL *, CELL *,
-				     long *);
-char *Rast_get_next_marked_f_raster_cat(struct Categories *, FCELL *, FCELL *,
-				     long *);
-char *Rast_get_next_marked_raster_cat(struct Categories *, void *, void *,
-				   long *, RASTER_MAP_TYPE);
-int Rast_set_cat(CELL, const char *, struct Categories *);
-int Rast_set_c_raster_cat(const CELL *, const CELL *, const char *, struct Categories *);
-int Rast_set_f_raster_cat(const FCELL *, const FCELL *, const char *, struct Categories *);
-int Rast_set_d_raster_cat(const DCELL *, const DCELL *, const char *, struct Categories *);
-int Rast_set_raster_cat(const void *, const void *, const char *, struct Categories *,
-		     RASTER_MAP_TYPE);
-int Rast_write_cats(const char *, struct Categories *);
-int Rast_write_raster_cats(const char *, struct Categories *);
-int Rast_write_vector_cats(const char *, struct Categories *);
-char *Rast_get_ith_d_raster_cat(const struct Categories *, int, DCELL *,
-			     DCELL *);
-char *Rast_get_ith_f_raster_cat(const struct Categories *, int, void *, void *);
-char *Rast_get_ith_c_raster_cat(const struct Categories *, int, void *, void *);
-char *Rast_get_ith_raster_cat(const struct Categories *, int, void *, void *,
-			   RASTER_MAP_TYPE);
-void Rast_init_cats(CELL, const char *, struct Categories *);
-void Rast_init_raster_cats(const char *, struct Categories *);
-void Rast_set_cats_title(const char *, struct Categories *);
-void Rast_set_raster_cats_title(const char *, struct Categories *);
-void Rast_set_cats_fmt(const char *, double, double, double, double,
-		   struct Categories *);
-void Rast_set_raster_cats_fmt(const char *, double, double, double, double,
-			   struct Categories *);
-void Rast_free_cats(struct Categories *);
-void Rast_free_raster_cats(struct Categories *);
-void Rast_copy_raster_cats(struct Categories *, const struct Categories *);
-int Rast_number_of_raster_cats(struct Categories *);
-int Rast_sort_cats(struct Categories *);
-
-/* cell_stats.c */
-void Rast_init_cell_stats(struct Cell_stats *);
-int Rast_update_cell_stats(const CELL *, int, struct Cell_stats *);
-int Rast_find_cell_stat(CELL, long *, const struct Cell_stats *);
-int Rast_rewind_cell_stats(struct Cell_stats *);
-int Rast_next_cell_stat(CELL *, long *, struct Cell_stats *);
-void Rast_get_stats_for_null_value(long *, const struct Cell_stats *);
-void Rast_free_cell_stats(struct Cell_stats *);
-
-/* cell_title.c */
-char *Rast_get_cell_title(const char *, const char *);
-
-/* cellstats_eq.c */
-int Rast_cell_stats_histo_eq(struct Cell_stats *, CELL, CELL, CELL, CELL, int,
-			  void (*)(CELL, CELL, CELL));
-
-/* closecell.c */
-int Rast_close_cell(int);
-int Rast_unopen_cell(int);
-
-/* color_compat.c */
-void Rast_make_ryg_colors(struct Colors *, CELL, CELL);
-void Rast_make_ryg_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_aspect_colors(struct Colors *, CELL, CELL);
-void Rast_make_aspect_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_byr_colors(struct Colors *, CELL, CELL);
-void Rast_make_byr_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_bgyr_colors(struct Colors *, CELL, CELL);
-void Rast_make_bgyr_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_byg_colors(struct Colors *, CELL, CELL);
-void Rast_make_byg_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_grey_scale_colors(struct Colors *, CELL, CELL);
-void Rast_make_grey_scale_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_gyr_colors(struct Colors *, CELL, CELL);
-void Rast_make_gyr_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_rainbow_colors(struct Colors *, CELL, CELL);
-void Rast_make_rainbow_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_ramp_colors(struct Colors *, CELL, CELL);
-void Rast_make_ramp_fp_colors(struct Colors *, DCELL, DCELL);
-void Rast_make_wave_colors(struct Colors *, CELL, CELL);
-void Rast_make_wave_fp_colors(struct Colors *, DCELL, DCELL);
-
-/* color_free.c */
-void Rast_free_colors(struct Colors *);
-void Rast__color_free_rules(struct _Color_Info_ *);
-void Rast__color_free_lookup(struct _Color_Info_ *);
-void Rast__color_free_fp_lookup(struct _Color_Info_ *);
-void Rast__color_reset(struct Colors *);
-
-/* color_get.c */
-int Rast_get_color(CELL, int *, int *, int *, struct Colors *);
-int Rast_get_raster_color(const void *, int *, int *, int *, struct Colors *,
-		       RASTER_MAP_TYPE);
-int Rast_get_c_raster_color(const CELL *, int *, int *, int *, struct Colors *);
-int Rast_get_f_raster_color(const FCELL *, int *, int *, int *, struct Colors *);
-int Rast_get_d_raster_color(const DCELL *, int *, int *, int *, struct Colors *);
-void Rast_get_null_value_color(int *, int *, int *, const struct Colors *);
-void Rast_get_default_color(int *, int *, int *, const struct Colors *);
-
-/* color_hist.c */
-void Rast_make_histogram_eq_colors(struct Colors *, struct Cell_stats *);
-void Rast_make_histogram_log_colors(struct Colors *, struct Cell_stats *, int, int);
-
-/* color_init.c */
-void Rast_init_colors(struct Colors *);
-
-/* color_insrt.c */
-int Rast__insert_color_into_lookup(CELL, int, int, int, struct _Color_Info_ *);
-
-/* color_invrt.c */
-int Rast_invert_colors(struct Colors *);
-
-/* color_look.c */
-void Rast_lookup_colors(const CELL *, unsigned char *, unsigned char *,
-		     unsigned char *, unsigned char *, int, struct Colors *);
-void Rast_lookup_c_raster_colors(const CELL *, unsigned char *, unsigned char *,
-			      unsigned char *, unsigned char *, int,
-			      struct Colors *);
-void Rast_lookup_raster_colors(const void *, unsigned char *, unsigned char *,
-			    unsigned char *, unsigned char *, int,
-			    struct Colors *, RASTER_MAP_TYPE);
-void Rast_lookup_f_raster_colors(const FCELL *, unsigned char *, unsigned char *,
-			     unsigned char *, unsigned char *, int,
-			     struct Colors *);
-void Rast_lookup_d_raster_colors(const DCELL *, unsigned char *, unsigned char *,
-			     unsigned char *, unsigned char *, int,
-			     struct Colors *);
-void Rast__lookup_colors(const void *, unsigned char *, unsigned char *,
-		      unsigned char *, unsigned char *, int, struct Colors *,
-		      int, int, RASTER_MAP_TYPE);
-void Rast__interpolate_color_rule(DCELL, unsigned char *, unsigned char *,
-			       unsigned char *, const struct _Color_Rule_ *);
-
-/* color_org.c */
-void Rast__organize_colors(struct Colors *);
-
-/* color_rand.c */
-void Rast_make_random_colors(struct Colors *, CELL, CELL);
-
-/* color_range.c */
-void Rast_set_color_range(CELL, CELL, struct Colors *);
-void Rast_set_d_color_range(DCELL, DCELL, struct Colors *);
-void Rast_get_color_range(CELL *, CELL *, const struct Colors *);
-void Rast_get_d_color_range(DCELL *, DCELL *, const struct Colors *);
-
-/* color_read.c */
-int Rast_read_colors(const char *, const char *, struct Colors *);
-void Rast_mark_colors_as_fp(struct Colors *);
-
-/* color_remove.c */
-int Rast_remove_colors(const char *, const char *);
-
-/* color_rule.c */
-void Rast_add_d_raster_color_rule(const DCELL *, int, int, int,
-			       const DCELL *, int, int, int,
-			       struct Colors *);
-void Rast_add_f_raster_color_rule(const FCELL *, int, int, int,
-			       const FCELL *, int, int, int,
-			       struct Colors *);
-void Rast_add_c_raster_color_rule(const CELL *, int, int, int,
-			       const CELL *, int, int, int,
-			       struct Colors *);
-void Rast_add_raster_color_rule(const void *, int, int, int,
-			     const void *, int, int, int,
-			     struct Colors *, RASTER_MAP_TYPE);
-void Rast_add_color_rule(const CELL, int, int, int,
-		      const CELL, int, int, int,
-		      struct Colors *);
-int Rast_add_modular_d_raster_color_rule(const DCELL *, int, int, int,
-				      const DCELL *, int, int, int,
-				      struct Colors *);
-int Rast_add_modular_f_raster_color_rule(const FCELL *, int, int, int,
-				      const FCELL *, int, int, int,
-				      struct Colors *);
-int Rast_add_modular_c_raster_color_rule(const CELL *, int, int, int,
-				      const CELL *, int, int, int,
-				      struct Colors *);
-int Rast_add_modular_raster_color_rule(const void *, int, int, int,
-				    const void *, int, int, int,
-				    struct Colors *, RASTER_MAP_TYPE);
-int Rast_add_modular_color_rule(CELL, int, int, int,
-			     CELL, int, int, int,
-			     struct Colors *);
-
-/* color_rule_get.c */
-int Rast_colors_count(const struct Colors *);
-int Rast_get_f_color_rule(DCELL *, unsigned char *, unsigned char *,
-		       unsigned char *, DCELL *, unsigned char *,
-		       unsigned char *, unsigned char *,
-		       const struct Colors *, int);
-
-/* color_rules.c */
-typedef int read_rule_fn(void *, DCELL, DCELL,
-			 DCELL *, int *, int *, int *, int *, int *, int *);
-int Rast_parse_color_rule(DCELL, DCELL, const char *, DCELL *, int *, int *,
-		       int *, int *, int *, int *);
-const char *Rast_parse_color_rule_error(int);
-int Rast_read_color_rule(void *, DCELL, DCELL, DCELL *, int *, int *, int *,
-		      int *, int *, int *);
-int Rast_read_color_rules(struct Colors *, DCELL, DCELL, read_rule_fn *, void *);
-int Rast_load_colors(struct Colors *, const char *, CELL, CELL);
-int Rast_load_fp_colors(struct Colors *, const char *, DCELL, DCELL);
-void Rast_make_colors(struct Colors *, const char *, CELL, CELL);
-void Rast_make_fp_colors(struct Colors *, const char *, DCELL, DCELL);
-
-/* color_set.c */
-void Rast_set_color(CELL, int, int, int, struct Colors *);
-void Rast_set_d_color(DCELL, int, int, int, struct Colors *);
-void Rast_set_null_value_color(int, int, int, struct Colors *);
-void Rast_set_default_color(int, int, int, struct Colors *);
-
-/* color_shift.c */
-void Rast_shift_colors(int, struct Colors *);
-void Rast_shift_d_colors(DCELL, struct Colors *);
-
-/* color_str.c */
-int Rast_str_to_color(const char *, int *, int *, int *);
-
-/* color_write.c */
-int Rast_write_colors(const char *, const char *, struct Colors *);
-void Rast__write_colors(FILE *, struct Colors *);
-
-/* color_xform.c */
-void Rast_histogram_eq_colors(struct Colors *, struct Colors *,
-			   struct Cell_stats *);
-void Rast_histogram_eq_colors_fp(struct Colors *,
-			      struct Colors *, struct FP_stats *);
-void Rast_log_colors(struct Colors *, struct Colors *, int);
-void Rast_abs_log_colors(struct Colors *, struct Colors *, int);
-
-/* format.c */
-int Rast__check_format(int);
-int Rast__read_row_ptrs(int);
-int Rast__write_row_ptrs(int);
-
-/* fpreclass.c */
-void Rast_fpreclass_clear(struct FPReclass *);
-void Rast_fpreclass_reset(struct FPReclass *);
-void Rast_fpreclass_init(struct FPReclass *);
-void Rast_fpreclass_set_domain(struct FPReclass *, DCELL, DCELL);
-void Rast_fpreclass_set_range(struct FPReclass *, DCELL, DCELL);
-int Rast_fpreclass_get_limits(const struct FPReclass *, DCELL *, DCELL *,
-			   DCELL *, DCELL *);
-int Rast_fpreclass_nof_rules(const struct FPReclass *);
-void Rast_fpreclass_get_ith_rule(const struct FPReclass *, int, DCELL *, DCELL *,
-			      DCELL *, DCELL *);
-void Rast_fpreclass_set_neg_infinite_rule(struct FPReclass *, DCELL, DCELL);
-int Rast_fpreclass_get_neg_infinite_rule(const struct FPReclass *, DCELL *,
-				      DCELL *);
-void Rast_fpreclass_set_pos_infinite_rule(struct FPReclass *, DCELL, DCELL);
-int Rast_fpreclass_get_pos_infinite_rule(const struct FPReclass *, DCELL *,
-				      DCELL *);
-void Rast_fpreclass_add_rule(struct FPReclass *, DCELL, DCELL, DCELL, DCELL);
-void Rast_fpreclass_reverse_rule_order(struct FPReclass *);
-DCELL Rast_fpreclass_get_cell_value(const struct FPReclass *, DCELL);
-void Rast_fpreclass_perform_di(const struct FPReclass *, const DCELL *, CELL *,
-			    int);
-void Rast_fpreclass_perform_df(const struct FPReclass *, const DCELL *, FCELL *,
-			    int);
-void Rast_fpreclass_perform_dd(const struct FPReclass *, const DCELL *, DCELL *,
-			    int);
-void Rast_fpreclass_perform_fi(const struct FPReclass *, const FCELL *, CELL *,
-			    int);
-void Rast_fpreclass_perform_ff(const struct FPReclass *, const FCELL *, FCELL *,
-			    int);
-void Rast_fpreclass_perform_fd(const struct FPReclass *, const FCELL *, DCELL *,
-			    int);
-void Rast_fpreclass_perform_ii(const struct FPReclass *, const CELL *, CELL *,
-			    int);
-void Rast_fpreclass_perform_if(const struct FPReclass *, const CELL *, FCELL *,
-			    int);
-void Rast_fpreclass_perform_id(const struct FPReclass *, const CELL *, DCELL *,
-			    int);
-/* gdal.c */
-void Rast_init_gdal(void);
-struct GDAL_link *Rast_get_gdal_link(const char *, const char *);
-struct GDAL_link *Rast_create_gdal_link(const char *, RASTER_MAP_TYPE);
-void Rast_close_gdal_link(struct GDAL_link *);
-int Rast_close_gdal_write_link(struct GDAL_link *);
-
-/* get_cellhd.c */
-int Rast_get_cellhd(const char *, const char *, struct Cell_head *);
-
-/* get_row.c */
-int Rast_get_map_row_nomask(int, CELL *, int);
-int Rast_get_raster_row_nomask(int, void *, int, RASTER_MAP_TYPE);
-int Rast_get_c_raster_row_nomask(int, CELL *, int);
-int Rast_get_f_raster_row_nomask(int, FCELL *, int);
-int Rast_get_d_raster_row_nomask(int, DCELL *, int);
-int Rast_get_map_row(int, CELL *, int);
-int Rast_get_raster_row(int, void *, int, RASTER_MAP_TYPE);
-int Rast_get_c_raster_row(int, CELL *, int);
-int Rast_get_f_raster_row(int, FCELL *, int);
-int Rast_get_d_raster_row(int, DCELL *, int);
-int Rast_get_null_value_row(int, char *, int);
-
-/* get_row_colr.c */
-int Rast_get_raster_row_colors(int, int, struct Colors *,
-			    unsigned char *, unsigned char *, unsigned char *,
-			    unsigned char *);
-/* histo_eq.c */
-void Rast_histogram_eq(const struct Histogram *, unsigned char **,
-		    CELL *, CELL *);
-
-/* histogram.c */
-void Rast_init_histogram(struct Histogram *);
-int Rast_read_histogram(const char *, const char *, struct Histogram *);
-int Rast_write_histogram(const char *, const struct Histogram *);
-int Rast_write_histogram_cs(const char *, struct Cell_stats *);
-void Rast_make_histogram_cs(struct Cell_stats *, struct Histogram *);
-int Rast_get_histogram_num(const struct Histogram *);
-CELL Rast_get_histogram_cat(int, const struct Histogram *);
-long Rast_get_histogram_count(int, const struct Histogram *);
-void Rast_free_histogram(struct Histogram *);
-int Rast_sort_histogram(struct Histogram *);
-int Rast_sort_histogram_by_count(struct Histogram *);
-void Rast_remove_histogram(const char *);
-int Rast_add_histogram(CELL, long, struct Histogram *);
-int Rast_set_histogram(CELL, long, struct Histogram *);
-void Rast_extend_histogram(CELL, long, struct Histogram *);
-void Rast_zero_histogram(struct Histogram *);
-
-/* history.c */
-int Rast_read_history(const char *, const char *, struct History *);
-int Rast_write_history(const char *, struct History *);
-void Rast_short_history(const char *, const char *, struct History *);
-int Rast_command_history(struct History *);
-
-/* init.c */
-void Rast__init(void);
-void Rast__check_init(void);
-void Rast_init_all(void);
-
-/* interp.c */
-DCELL Rast_interp_linear(double, DCELL, DCELL);
-DCELL Rast_interp_bilinear(double, double, DCELL, DCELL, DCELL, DCELL);
-DCELL Rast_interp_cubic(double, DCELL, DCELL, DCELL, DCELL);
-DCELL Rast_interp_bicubic(double, double,
-		       DCELL, DCELL, DCELL, DCELL, DCELL, DCELL, DCELL, DCELL,
-		       DCELL, DCELL, DCELL, DCELL, DCELL, DCELL, DCELL,
-		       DCELL);
-
-/* mask_info.c */
-char *Rast_mask_info(void);
-int Rast__mask_info(char *, char *);
-
-/* maskfd.c */
-int Rast_maskfd(void);
-
-/* null_val.c */
-void Rast__set_null_value(void *, int, int, RASTER_MAP_TYPE);
-void Rast_set_null_value(void *, int, RASTER_MAP_TYPE);
-void Rast_set_c_null_value(CELL *, int);
-void Rast_set_f_null_value(FCELL *, int);
-void Rast_set_d_null_value(DCELL *, int);
-int Rast_is_null_value(const void *, RASTER_MAP_TYPE);
-int Rast_is_c_null_value(const CELL *);
-int Rast_is_f_null_value(const FCELL *);
-int Rast_is_d_null_value(const DCELL *);
-void Rast_insert_null_values(void *, char *, int, RASTER_MAP_TYPE);
-void Rast_insert_c_null_values(CELL *, char *, int);
-void Rast_insert_f_null_values(FCELL *, char *, int);
-void Rast_insert_d_null_values(DCELL *, char *, int);
-int Rast__check_null_bit(const unsigned char *, int, int);
-void Rast__convert_01_flags(const char *, unsigned char *, int);
-void Rast__convert_flags_01(char *, const unsigned char *, int);
-void Rast__init_null_bits(unsigned char *, int);
-
-/* opencell.c */
-int Rast_open_cell_old(const char *, const char *);
-int Rast__open_cell_old(const char *, const char *);
-int Rast_open_cell_new(const char *);
-int Rast_open_cell_new_uncompressed(const char *);
-void Rast_want_histogram(int);
-void Rast_set_cell_format(int);
-int Rast_cellvalue_format(CELL);
-int Rast_open_fp_cell_new(const char *);
-int Rast_open_fp_cell_new_uncompressed(const char *);
-int Rast_set_fp_type(RASTER_MAP_TYPE);
-int Rast_raster_map_is_fp(const char *, const char *);
-RASTER_MAP_TYPE Rast_raster_map_type(const char *, const char *);
-RASTER_MAP_TYPE Rast__check_fp_type(const char *, const char *);
-RASTER_MAP_TYPE Rast_get_raster_map_type(int);
-int Rast_open_raster_new(const char *, RASTER_MAP_TYPE);
-int Rast_open_raster_new_uncompressed(const char *, RASTER_MAP_TYPE);
-int Rast_set_quant_rules(int, struct Quant *);
-
-/* put_cellhd.c */
-int Rast_put_cellhd(const char *, struct Cell_head *);
-
-/* put_row.c */
-int Rast_put_map_row(int, const CELL *);
-int Rast_put_raster_row(int, const void *, RASTER_MAP_TYPE);
-int Rast_put_c_raster_row(int, const CELL *);
-int Rast_put_f_raster_row(int, const FCELL *);
-int Rast_put_d_raster_row(int, const DCELL *);
-int Rast__open_null_write(int);
-int Rast__write_null_bits(int, const unsigned char *, int, int, int);
-
-/* put_title.c */
-int Rast_put_cell_title(const char *, const char *);
-
-/* quant.c */
-void Rast_quant_clear(struct Quant *);
-void Rast_quant_free(struct Quant *);
-int Rast__quant_organize_fp_lookup(struct Quant *);
-void Rast_quant_init(struct Quant *);
-int Rast_quant_is_truncate(const struct Quant *);
-int Rast_quant_is_round(const struct Quant *);
-void Rast_quant_truncate(struct Quant *);
-void Rast_quant_round(struct Quant *);
-int Rast_quant_get_limits(const struct Quant *, DCELL *, DCELL *, CELL *,
-		       CELL *);
-int Rast_quant_nof_rules(const struct Quant *);
-void Rast_quant_get_ith_rule(const struct Quant *, int, DCELL *, DCELL *, CELL *,
-			  CELL *);
-void Rast_quant_set_neg_infinite_rule(struct Quant *, DCELL, CELL);
-int Rast_quant_get_neg_infinite_rule(const struct Quant *, DCELL *, CELL *);
-void Rast_quant_set_pos_infinite_rule(struct Quant *, DCELL, CELL);
-int Rast_quant_get_pos_infinite_rule(const struct Quant *, DCELL *, CELL *);
-void Rast_quant_add_rule(struct Quant *, DCELL, DCELL, CELL, CELL);
-void Rast_quant_reverse_rule_order(struct Quant *);
-CELL Rast_quant_get_cell_value(struct Quant *, DCELL);
-void Rast_quant_perform_d(struct Quant *, const DCELL *, CELL *, int);
-void Rast_quant_perform_f(struct Quant *, const FCELL *, CELL *, int);
-struct Quant_table *Rast__quant_get_rule_for_d_raster_val(const struct Quant *,
-						       DCELL);
-
-/* quant_io.c */
-int Rast__quant_import(const char *, const char *, struct Quant *);
-int Rast__quant_export(const char *, const char *, const struct Quant *);
-
-/* quant_rw.c */
-int Rast_truncate_fp_map(const char *, const char *);
-int Rast_round_fp_map(const char *, const char *);
-int Rast_quantize_fp_map(const char *, const char *, CELL, CELL);
-int Rast_quantize_fp_map_range(const char *, const char *, DCELL, DCELL, CELL,
-			    CELL);
-int Rast_write_quant(const char *, const char *, const struct Quant *);
-int Rast_read_quant(const char *, const char *, struct Quant *);
-
-/* range.c */
-void Rast__remove_fp_range(const char *);
-void Rast_construct_default_range(struct Range *);
-int Rast_read_fp_range(const char *, const char *, struct FPRange *);
-int Rast_read_range(const char *, const char *, struct Range *);
-int Rast_write_range(const char *, const struct Range *);
-int Rast_write_fp_range(const char *, const struct FPRange *);
-void Rast_update_range(CELL, struct Range *);
-void Rast_update_fp_range(DCELL, struct FPRange *);
-void Rast_row_update_range(const CELL *, int, struct Range *);
-void Rast__row_update_range(const CELL *, int, struct Range *, int);
-void Rast_row_update_fp_range(const void *, int, struct FPRange *,
-			  RASTER_MAP_TYPE);
-void Rast_init_range(struct Range *);
-void Rast_get_range_min_max(const struct Range *, CELL *, CELL *);
-void Rast_init_fp_range(struct FPRange *);
-void Rast_get_fp_range_min_max(const struct FPRange *, DCELL *, DCELL *);
-
-/* raster.c */
-void *Rast_incr_void_ptr(const void *, const size_t);
-int Rast_raster_cmp(const void *, const void *, RASTER_MAP_TYPE);
-void Rast_raster_cpy(void *, const void *, int, RASTER_MAP_TYPE);
-void Rast_set_raster_value_c(void *, CELL, RASTER_MAP_TYPE);
-void Rast_set_raster_value_f(void *, FCELL, RASTER_MAP_TYPE);
-void Rast_set_raster_value_d(void *, DCELL, RASTER_MAP_TYPE);
-CELL Rast_get_raster_value_c(const void *, RASTER_MAP_TYPE);
-FCELL Rast_get_raster_value_f(const void *, RASTER_MAP_TYPE);
-DCELL Rast_get_raster_value_d(const void *, RASTER_MAP_TYPE);
-
-/* raster_metadata.c */
-int Rast_read_raster_units(const char *, const char *, char *);
-int Rast_read_raster_vdatum(const char *, const char *, char *);
-int Rast_write_raster_units(const char *, const char *);
-int Rast_write_raster_vdatum(const char *, const char *);
-int Rast__raster_misc_read_line(const char *, const char *, const char *,
-			     char *);
-int Rast__raster_misc_write_line(const char *, const char *, const char *);
-
-/* reclass.c */
-int Rast_is_reclass(const char *, const char *, char *, char *);
-int Rast_is_reclassed_to(const char *, const char *, int *, char ***);
-int Rast_get_reclass(const char *, const char *, struct Reclass *);
-void Rast_free_reclass(struct Reclass *);
-int Rast_put_reclass(const char *, const struct Reclass *);
-
-/* sample.c */
-DCELL Rast_get_raster_sample_nearest(int, const struct Cell_head *, struct Categories *, double, double, int);
-DCELL Rast_get_raster_sample_bilinear(int, const struct Cell_head *, struct Categories *, double, double, int);
-DCELL Rast_get_raster_sample_cubic(int, const struct Cell_head *, struct Categories *, double, double, int);
-DCELL Rast_get_raster_sample(int, const struct Cell_head *, struct Categories *, double, double, int, INTERP_TYPE);
-
-/* set_window.c */
-int Rast_set_window(struct Cell_head *);
-
-/* zero_cell.c */
-void Rast_zero_cell_buf(CELL *);
-void Rast_zero_raster_buf(void *, RASTER_MAP_TYPE);
-
-#endif

Copied: grass/trunk/include/raster.h (from rev 38013, grass/trunk/include/Rast.h)
===================================================================
--- grass/trunk/include/raster.h	                        (rev 0)
+++ grass/trunk/include/raster.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -0,0 +1,537 @@
+#ifndef GRASS_RAST_H
+#define GRASS_RAST_H
+#include <grass/gis.h>
+
+/* --- ANSI prototypes for the lib/raster functions --- */
+
+/* alloc_cell.c */
+size_t Rast_raster_size(RASTER_MAP_TYPE);
+CELL *Rast_allocate_cell_buf(void);
+void *Rast_allocate_raster_buf(RASTER_MAP_TYPE);
+CELL *Rast_allocate_c_raster_buf(void);
+FCELL *Rast_allocate_f_raster_buf(void);
+DCELL *Rast_allocate_d_raster_buf(void);
+char *Rast_allocate_null_buf(void);
+unsigned char *Rast__allocate_null_bits(int);
+int Rast__null_bitstream_size(int);
+
+/* auto_mask.c */
+int Rast__check_for_auto_masking(void);
+void Rast_suppress_masking(void);
+void Rast_unsuppress_masking(void);
+
+/* cats.c */
+int Rast_read_cats(const char *, const char *, struct Categories *);
+int Rast_read_raster_cats(const char *, const char *, struct Categories *);
+int Rast_read_vector_cats(const char *, const char *, struct Categories *);
+CELL Rast_number_of_cats(const char *, const char *);
+char *Rast_get_cats_title(const struct Categories *);
+char *Rast_get_raster_cats_title(const struct Categories *);
+char *Rast_get_cat(CELL, struct Categories *);
+char *Rast_get_c_raster_cat(CELL *, struct Categories *);
+char *Rast_get_f_raster_cat(FCELL *, struct Categories *);
+char *Rast_get_d_raster_cat(DCELL *, struct Categories *);
+char *Rast_get_raster_cat(void *, struct Categories *, RASTER_MAP_TYPE);
+void Rast_unmark_raster_cats(struct Categories *);
+void Rast_mark_c_raster_cats(const CELL *, int, struct Categories *);
+void Rast_mark_f_raster_cats(const FCELL *, int, struct Categories *);
+void Rast_mark_d_raster_cats(const DCELL *, int, struct Categories *);
+int Rast_mark_raster_cats(const void *, int, struct Categories *, RASTER_MAP_TYPE);
+void Rast_rewind_raster_cats(struct Categories *);
+char *Rast_get_next_marked_d_raster_cat(struct Categories *, DCELL *, DCELL *,
+				     long *);
+char *Rast_get_next_marked_c_raster_cat(struct Categories *, CELL *, CELL *,
+				     long *);
+char *Rast_get_next_marked_f_raster_cat(struct Categories *, FCELL *, FCELL *,
+				     long *);
+char *Rast_get_next_marked_raster_cat(struct Categories *, void *, void *,
+				   long *, RASTER_MAP_TYPE);
+int Rast_set_cat(CELL, const char *, struct Categories *);
+int Rast_set_c_raster_cat(const CELL *, const CELL *, const char *, struct Categories *);
+int Rast_set_f_raster_cat(const FCELL *, const FCELL *, const char *, struct Categories *);
+int Rast_set_d_raster_cat(const DCELL *, const DCELL *, const char *, struct Categories *);
+int Rast_set_raster_cat(const void *, const void *, const char *, struct Categories *,
+		     RASTER_MAP_TYPE);
+int Rast_write_cats(const char *, struct Categories *);
+int Rast_write_raster_cats(const char *, struct Categories *);
+int Rast_write_vector_cats(const char *, struct Categories *);
+char *Rast_get_ith_d_raster_cat(const struct Categories *, int, DCELL *,
+			     DCELL *);
+char *Rast_get_ith_f_raster_cat(const struct Categories *, int, void *, void *);
+char *Rast_get_ith_c_raster_cat(const struct Categories *, int, void *, void *);
+char *Rast_get_ith_raster_cat(const struct Categories *, int, void *, void *,
+			   RASTER_MAP_TYPE);
+void Rast_init_cats(CELL, const char *, struct Categories *);
+void Rast_init_raster_cats(const char *, struct Categories *);
+void Rast_set_cats_title(const char *, struct Categories *);
+void Rast_set_raster_cats_title(const char *, struct Categories *);
+void Rast_set_cats_fmt(const char *, double, double, double, double,
+		   struct Categories *);
+void Rast_set_raster_cats_fmt(const char *, double, double, double, double,
+			   struct Categories *);
+void Rast_free_cats(struct Categories *);
+void Rast_free_raster_cats(struct Categories *);
+void Rast_copy_raster_cats(struct Categories *, const struct Categories *);
+int Rast_number_of_raster_cats(struct Categories *);
+int Rast_sort_cats(struct Categories *);
+
+/* cell_stats.c */
+void Rast_init_cell_stats(struct Cell_stats *);
+int Rast_update_cell_stats(const CELL *, int, struct Cell_stats *);
+int Rast_find_cell_stat(CELL, long *, const struct Cell_stats *);
+int Rast_rewind_cell_stats(struct Cell_stats *);
+int Rast_next_cell_stat(CELL *, long *, struct Cell_stats *);
+void Rast_get_stats_for_null_value(long *, const struct Cell_stats *);
+void Rast_free_cell_stats(struct Cell_stats *);
+
+/* cell_title.c */
+char *Rast_get_cell_title(const char *, const char *);
+
+/* cellstats_eq.c */
+int Rast_cell_stats_histo_eq(struct Cell_stats *, CELL, CELL, CELL, CELL, int,
+			  void (*)(CELL, CELL, CELL));
+
+/* closecell.c */
+int Rast_close_cell(int);
+int Rast_unopen_cell(int);
+
+/* color_compat.c */
+void Rast_make_ryg_colors(struct Colors *, CELL, CELL);
+void Rast_make_ryg_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_aspect_colors(struct Colors *, CELL, CELL);
+void Rast_make_aspect_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_byr_colors(struct Colors *, CELL, CELL);
+void Rast_make_byr_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_bgyr_colors(struct Colors *, CELL, CELL);
+void Rast_make_bgyr_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_byg_colors(struct Colors *, CELL, CELL);
+void Rast_make_byg_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_grey_scale_colors(struct Colors *, CELL, CELL);
+void Rast_make_grey_scale_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_gyr_colors(struct Colors *, CELL, CELL);
+void Rast_make_gyr_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_rainbow_colors(struct Colors *, CELL, CELL);
+void Rast_make_rainbow_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_ramp_colors(struct Colors *, CELL, CELL);
+void Rast_make_ramp_fp_colors(struct Colors *, DCELL, DCELL);
+void Rast_make_wave_colors(struct Colors *, CELL, CELL);
+void Rast_make_wave_fp_colors(struct Colors *, DCELL, DCELL);
+
+/* color_free.c */
+void Rast_free_colors(struct Colors *);
+void Rast__color_free_rules(struct _Color_Info_ *);
+void Rast__color_free_lookup(struct _Color_Info_ *);
+void Rast__color_free_fp_lookup(struct _Color_Info_ *);
+void Rast__color_reset(struct Colors *);
+
+/* color_get.c */
+int Rast_get_color(CELL, int *, int *, int *, struct Colors *);
+int Rast_get_raster_color(const void *, int *, int *, int *, struct Colors *,
+		       RASTER_MAP_TYPE);
+int Rast_get_c_raster_color(const CELL *, int *, int *, int *, struct Colors *);
+int Rast_get_f_raster_color(const FCELL *, int *, int *, int *, struct Colors *);
+int Rast_get_d_raster_color(const DCELL *, int *, int *, int *, struct Colors *);
+void Rast_get_null_value_color(int *, int *, int *, const struct Colors *);
+void Rast_get_default_color(int *, int *, int *, const struct Colors *);
+
+/* color_hist.c */
+void Rast_make_histogram_eq_colors(struct Colors *, struct Cell_stats *);
+void Rast_make_histogram_log_colors(struct Colors *, struct Cell_stats *, int, int);
+
+/* color_init.c */
+void Rast_init_colors(struct Colors *);
+
+/* color_insrt.c */
+int Rast__insert_color_into_lookup(CELL, int, int, int, struct _Color_Info_ *);
+
+/* color_invrt.c */
+int Rast_invert_colors(struct Colors *);
+
+/* color_look.c */
+void Rast_lookup_colors(const CELL *, unsigned char *, unsigned char *,
+		     unsigned char *, unsigned char *, int, struct Colors *);
+void Rast_lookup_c_raster_colors(const CELL *, unsigned char *, unsigned char *,
+			      unsigned char *, unsigned char *, int,
+			      struct Colors *);
+void Rast_lookup_raster_colors(const void *, unsigned char *, unsigned char *,
+			    unsigned char *, unsigned char *, int,
+			    struct Colors *, RASTER_MAP_TYPE);
+void Rast_lookup_f_raster_colors(const FCELL *, unsigned char *, unsigned char *,
+			     unsigned char *, unsigned char *, int,
+			     struct Colors *);
+void Rast_lookup_d_raster_colors(const DCELL *, unsigned char *, unsigned char *,
+			     unsigned char *, unsigned char *, int,
+			     struct Colors *);
+void Rast__lookup_colors(const void *, unsigned char *, unsigned char *,
+		      unsigned char *, unsigned char *, int, struct Colors *,
+		      int, int, RASTER_MAP_TYPE);
+void Rast__interpolate_color_rule(DCELL, unsigned char *, unsigned char *,
+			       unsigned char *, const struct _Color_Rule_ *);
+
+/* color_org.c */
+void Rast__organize_colors(struct Colors *);
+
+/* color_rand.c */
+void Rast_make_random_colors(struct Colors *, CELL, CELL);
+
+/* color_range.c */
+void Rast_set_color_range(CELL, CELL, struct Colors *);
+void Rast_set_d_color_range(DCELL, DCELL, struct Colors *);
+void Rast_get_color_range(CELL *, CELL *, const struct Colors *);
+void Rast_get_d_color_range(DCELL *, DCELL *, const struct Colors *);
+
+/* color_read.c */
+int Rast_read_colors(const char *, const char *, struct Colors *);
+void Rast_mark_colors_as_fp(struct Colors *);
+
+/* color_remove.c */
+int Rast_remove_colors(const char *, const char *);
+
+/* color_rule.c */
+void Rast_add_d_raster_color_rule(const DCELL *, int, int, int,
+			       const DCELL *, int, int, int,
+			       struct Colors *);
+void Rast_add_f_raster_color_rule(const FCELL *, int, int, int,
+			       const FCELL *, int, int, int,
+			       struct Colors *);
+void Rast_add_c_raster_color_rule(const CELL *, int, int, int,
+			       const CELL *, int, int, int,
+			       struct Colors *);
+void Rast_add_raster_color_rule(const void *, int, int, int,
+			     const void *, int, int, int,
+			     struct Colors *, RASTER_MAP_TYPE);
+void Rast_add_color_rule(const CELL, int, int, int,
+		      const CELL, int, int, int,
+		      struct Colors *);
+int Rast_add_modular_d_raster_color_rule(const DCELL *, int, int, int,
+				      const DCELL *, int, int, int,
+				      struct Colors *);
+int Rast_add_modular_f_raster_color_rule(const FCELL *, int, int, int,
+				      const FCELL *, int, int, int,
+				      struct Colors *);
+int Rast_add_modular_c_raster_color_rule(const CELL *, int, int, int,
+				      const CELL *, int, int, int,
+				      struct Colors *);
+int Rast_add_modular_raster_color_rule(const void *, int, int, int,
+				    const void *, int, int, int,
+				    struct Colors *, RASTER_MAP_TYPE);
+int Rast_add_modular_color_rule(CELL, int, int, int,
+			     CELL, int, int, int,
+			     struct Colors *);
+
+/* color_rule_get.c */
+int Rast_colors_count(const struct Colors *);
+int Rast_get_f_color_rule(DCELL *, unsigned char *, unsigned char *,
+		       unsigned char *, DCELL *, unsigned char *,
+		       unsigned char *, unsigned char *,
+		       const struct Colors *, int);
+
+/* color_rules.c */
+typedef int read_rule_fn(void *, DCELL, DCELL,
+			 DCELL *, int *, int *, int *, int *, int *, int *);
+int Rast_parse_color_rule(DCELL, DCELL, const char *, DCELL *, int *, int *,
+		       int *, int *, int *, int *);
+const char *Rast_parse_color_rule_error(int);
+int Rast_read_color_rule(void *, DCELL, DCELL, DCELL *, int *, int *, int *,
+		      int *, int *, int *);
+int Rast_read_color_rules(struct Colors *, DCELL, DCELL, read_rule_fn *, void *);
+int Rast_load_colors(struct Colors *, const char *, CELL, CELL);
+int Rast_load_fp_colors(struct Colors *, const char *, DCELL, DCELL);
+void Rast_make_colors(struct Colors *, const char *, CELL, CELL);
+void Rast_make_fp_colors(struct Colors *, const char *, DCELL, DCELL);
+
+/* color_set.c */
+void Rast_set_color(CELL, int, int, int, struct Colors *);
+void Rast_set_d_color(DCELL, int, int, int, struct Colors *);
+void Rast_set_null_value_color(int, int, int, struct Colors *);
+void Rast_set_default_color(int, int, int, struct Colors *);
+
+/* color_shift.c */
+void Rast_shift_colors(int, struct Colors *);
+void Rast_shift_d_colors(DCELL, struct Colors *);
+
+/* color_str.c */
+int Rast_str_to_color(const char *, int *, int *, int *);
+
+/* color_write.c */
+int Rast_write_colors(const char *, const char *, struct Colors *);
+void Rast__write_colors(FILE *, struct Colors *);
+
+/* color_xform.c */
+void Rast_histogram_eq_colors(struct Colors *, struct Colors *,
+			   struct Cell_stats *);
+void Rast_histogram_eq_colors_fp(struct Colors *,
+			      struct Colors *, struct FP_stats *);
+void Rast_log_colors(struct Colors *, struct Colors *, int);
+void Rast_abs_log_colors(struct Colors *, struct Colors *, int);
+
+/* format.c */
+int Rast__check_format(int);
+int Rast__read_row_ptrs(int);
+int Rast__write_row_ptrs(int);
+
+/* fpreclass.c */
+void Rast_fpreclass_clear(struct FPReclass *);
+void Rast_fpreclass_reset(struct FPReclass *);
+void Rast_fpreclass_init(struct FPReclass *);
+void Rast_fpreclass_set_domain(struct FPReclass *, DCELL, DCELL);
+void Rast_fpreclass_set_range(struct FPReclass *, DCELL, DCELL);
+int Rast_fpreclass_get_limits(const struct FPReclass *, DCELL *, DCELL *,
+			   DCELL *, DCELL *);
+int Rast_fpreclass_nof_rules(const struct FPReclass *);
+void Rast_fpreclass_get_ith_rule(const struct FPReclass *, int, DCELL *, DCELL *,
+			      DCELL *, DCELL *);
+void Rast_fpreclass_set_neg_infinite_rule(struct FPReclass *, DCELL, DCELL);
+int Rast_fpreclass_get_neg_infinite_rule(const struct FPReclass *, DCELL *,
+				      DCELL *);
+void Rast_fpreclass_set_pos_infinite_rule(struct FPReclass *, DCELL, DCELL);
+int Rast_fpreclass_get_pos_infinite_rule(const struct FPReclass *, DCELL *,
+				      DCELL *);
+void Rast_fpreclass_add_rule(struct FPReclass *, DCELL, DCELL, DCELL, DCELL);
+void Rast_fpreclass_reverse_rule_order(struct FPReclass *);
+DCELL Rast_fpreclass_get_cell_value(const struct FPReclass *, DCELL);
+void Rast_fpreclass_perform_di(const struct FPReclass *, const DCELL *, CELL *,
+			    int);
+void Rast_fpreclass_perform_df(const struct FPReclass *, const DCELL *, FCELL *,
+			    int);
+void Rast_fpreclass_perform_dd(const struct FPReclass *, const DCELL *, DCELL *,
+			    int);
+void Rast_fpreclass_perform_fi(const struct FPReclass *, const FCELL *, CELL *,
+			    int);
+void Rast_fpreclass_perform_ff(const struct FPReclass *, const FCELL *, FCELL *,
+			    int);
+void Rast_fpreclass_perform_fd(const struct FPReclass *, const FCELL *, DCELL *,
+			    int);
+void Rast_fpreclass_perform_ii(const struct FPReclass *, const CELL *, CELL *,
+			    int);
+void Rast_fpreclass_perform_if(const struct FPReclass *, const CELL *, FCELL *,
+			    int);
+void Rast_fpreclass_perform_id(const struct FPReclass *, const CELL *, DCELL *,
+			    int);
+/* gdal.c */
+void Rast_init_gdal(void);
+struct GDAL_link *Rast_get_gdal_link(const char *, const char *);
+struct GDAL_link *Rast_create_gdal_link(const char *, RASTER_MAP_TYPE);
+void Rast_close_gdal_link(struct GDAL_link *);
+int Rast_close_gdal_write_link(struct GDAL_link *);
+
+/* get_cellhd.c */
+int Rast_get_cellhd(const char *, const char *, struct Cell_head *);
+
+/* get_row.c */
+int Rast_get_map_row_nomask(int, CELL *, int);
+int Rast_get_raster_row_nomask(int, void *, int, RASTER_MAP_TYPE);
+int Rast_get_c_raster_row_nomask(int, CELL *, int);
+int Rast_get_f_raster_row_nomask(int, FCELL *, int);
+int Rast_get_d_raster_row_nomask(int, DCELL *, int);
+int Rast_get_map_row(int, CELL *, int);
+int Rast_get_raster_row(int, void *, int, RASTER_MAP_TYPE);
+int Rast_get_c_raster_row(int, CELL *, int);
+int Rast_get_f_raster_row(int, FCELL *, int);
+int Rast_get_d_raster_row(int, DCELL *, int);
+int Rast_get_null_value_row(int, char *, int);
+
+/* get_row_colr.c */
+int Rast_get_raster_row_colors(int, int, struct Colors *,
+			    unsigned char *, unsigned char *, unsigned char *,
+			    unsigned char *);
+/* histo_eq.c */
+void Rast_histogram_eq(const struct Histogram *, unsigned char **,
+		    CELL *, CELL *);
+
+/* histogram.c */
+void Rast_init_histogram(struct Histogram *);
+int Rast_read_histogram(const char *, const char *, struct Histogram *);
+int Rast_write_histogram(const char *, const struct Histogram *);
+int Rast_write_histogram_cs(const char *, struct Cell_stats *);
+void Rast_make_histogram_cs(struct Cell_stats *, struct Histogram *);
+int Rast_get_histogram_num(const struct Histogram *);
+CELL Rast_get_histogram_cat(int, const struct Histogram *);
+long Rast_get_histogram_count(int, const struct Histogram *);
+void Rast_free_histogram(struct Histogram *);
+int Rast_sort_histogram(struct Histogram *);
+int Rast_sort_histogram_by_count(struct Histogram *);
+void Rast_remove_histogram(const char *);
+int Rast_add_histogram(CELL, long, struct Histogram *);
+int Rast_set_histogram(CELL, long, struct Histogram *);
+void Rast_extend_histogram(CELL, long, struct Histogram *);
+void Rast_zero_histogram(struct Histogram *);
+
+/* history.c */
+int Rast_read_history(const char *, const char *, struct History *);
+int Rast_write_history(const char *, struct History *);
+void Rast_short_history(const char *, const char *, struct History *);
+int Rast_command_history(struct History *);
+
+/* init.c */
+void Rast__init(void);
+void Rast__check_init(void);
+void Rast_init_all(void);
+
+/* interp.c */
+DCELL Rast_interp_linear(double, DCELL, DCELL);
+DCELL Rast_interp_bilinear(double, double, DCELL, DCELL, DCELL, DCELL);
+DCELL Rast_interp_cubic(double, DCELL, DCELL, DCELL, DCELL);
+DCELL Rast_interp_bicubic(double, double,
+		       DCELL, DCELL, DCELL, DCELL, DCELL, DCELL, DCELL, DCELL,
+		       DCELL, DCELL, DCELL, DCELL, DCELL, DCELL, DCELL,
+		       DCELL);
+
+/* mask_info.c */
+char *Rast_mask_info(void);
+int Rast__mask_info(char *, char *);
+
+/* maskfd.c */
+int Rast_maskfd(void);
+
+/* null_val.c */
+void Rast__set_null_value(void *, int, int, RASTER_MAP_TYPE);
+void Rast_set_null_value(void *, int, RASTER_MAP_TYPE);
+void Rast_set_c_null_value(CELL *, int);
+void Rast_set_f_null_value(FCELL *, int);
+void Rast_set_d_null_value(DCELL *, int);
+int Rast_is_null_value(const void *, RASTER_MAP_TYPE);
+int Rast_is_c_null_value(const CELL *);
+int Rast_is_f_null_value(const FCELL *);
+int Rast_is_d_null_value(const DCELL *);
+void Rast_insert_null_values(void *, char *, int, RASTER_MAP_TYPE);
+void Rast_insert_c_null_values(CELL *, char *, int);
+void Rast_insert_f_null_values(FCELL *, char *, int);
+void Rast_insert_d_null_values(DCELL *, char *, int);
+int Rast__check_null_bit(const unsigned char *, int, int);
+void Rast__convert_01_flags(const char *, unsigned char *, int);
+void Rast__convert_flags_01(char *, const unsigned char *, int);
+void Rast__init_null_bits(unsigned char *, int);
+
+/* opencell.c */
+int Rast_open_cell_old(const char *, const char *);
+int Rast__open_cell_old(const char *, const char *);
+int Rast_open_cell_new(const char *);
+int Rast_open_cell_new_uncompressed(const char *);
+void Rast_want_histogram(int);
+void Rast_set_cell_format(int);
+int Rast_cellvalue_format(CELL);
+int Rast_open_fp_cell_new(const char *);
+int Rast_open_fp_cell_new_uncompressed(const char *);
+int Rast_set_fp_type(RASTER_MAP_TYPE);
+int Rast_raster_map_is_fp(const char *, const char *);
+RASTER_MAP_TYPE Rast_raster_map_type(const char *, const char *);
+RASTER_MAP_TYPE Rast__check_fp_type(const char *, const char *);
+RASTER_MAP_TYPE Rast_get_raster_map_type(int);
+int Rast_open_raster_new(const char *, RASTER_MAP_TYPE);
+int Rast_open_raster_new_uncompressed(const char *, RASTER_MAP_TYPE);
+int Rast_set_quant_rules(int, struct Quant *);
+
+/* put_cellhd.c */
+int Rast_put_cellhd(const char *, struct Cell_head *);
+
+/* put_row.c */
+int Rast_put_map_row(int, const CELL *);
+int Rast_put_raster_row(int, const void *, RASTER_MAP_TYPE);
+int Rast_put_c_raster_row(int, const CELL *);
+int Rast_put_f_raster_row(int, const FCELL *);
+int Rast_put_d_raster_row(int, const DCELL *);
+int Rast__open_null_write(int);
+int Rast__write_null_bits(int, const unsigned char *, int, int, int);
+
+/* put_title.c */
+int Rast_put_cell_title(const char *, const char *);
+
+/* quant.c */
+void Rast_quant_clear(struct Quant *);
+void Rast_quant_free(struct Quant *);
+int Rast__quant_organize_fp_lookup(struct Quant *);
+void Rast_quant_init(struct Quant *);
+int Rast_quant_is_truncate(const struct Quant *);
+int Rast_quant_is_round(const struct Quant *);
+void Rast_quant_truncate(struct Quant *);
+void Rast_quant_round(struct Quant *);
+int Rast_quant_get_limits(const struct Quant *, DCELL *, DCELL *, CELL *,
+		       CELL *);
+int Rast_quant_nof_rules(const struct Quant *);
+void Rast_quant_get_ith_rule(const struct Quant *, int, DCELL *, DCELL *, CELL *,
+			  CELL *);
+void Rast_quant_set_neg_infinite_rule(struct Quant *, DCELL, CELL);
+int Rast_quant_get_neg_infinite_rule(const struct Quant *, DCELL *, CELL *);
+void Rast_quant_set_pos_infinite_rule(struct Quant *, DCELL, CELL);
+int Rast_quant_get_pos_infinite_rule(const struct Quant *, DCELL *, CELL *);
+void Rast_quant_add_rule(struct Quant *, DCELL, DCELL, CELL, CELL);
+void Rast_quant_reverse_rule_order(struct Quant *);
+CELL Rast_quant_get_cell_value(struct Quant *, DCELL);
+void Rast_quant_perform_d(struct Quant *, const DCELL *, CELL *, int);
+void Rast_quant_perform_f(struct Quant *, const FCELL *, CELL *, int);
+struct Quant_table *Rast__quant_get_rule_for_d_raster_val(const struct Quant *,
+						       DCELL);
+
+/* quant_io.c */
+int Rast__quant_import(const char *, const char *, struct Quant *);
+int Rast__quant_export(const char *, const char *, const struct Quant *);
+
+/* quant_rw.c */
+int Rast_truncate_fp_map(const char *, const char *);
+int Rast_round_fp_map(const char *, const char *);
+int Rast_quantize_fp_map(const char *, const char *, CELL, CELL);
+int Rast_quantize_fp_map_range(const char *, const char *, DCELL, DCELL, CELL,
+			    CELL);
+int Rast_write_quant(const char *, const char *, const struct Quant *);
+int Rast_read_quant(const char *, const char *, struct Quant *);
+
+/* range.c */
+void Rast__remove_fp_range(const char *);
+void Rast_construct_default_range(struct Range *);
+int Rast_read_fp_range(const char *, const char *, struct FPRange *);
+int Rast_read_range(const char *, const char *, struct Range *);
+int Rast_write_range(const char *, const struct Range *);
+int Rast_write_fp_range(const char *, const struct FPRange *);
+void Rast_update_range(CELL, struct Range *);
+void Rast_update_fp_range(DCELL, struct FPRange *);
+void Rast_row_update_range(const CELL *, int, struct Range *);
+void Rast__row_update_range(const CELL *, int, struct Range *, int);
+void Rast_row_update_fp_range(const void *, int, struct FPRange *,
+			  RASTER_MAP_TYPE);
+void Rast_init_range(struct Range *);
+void Rast_get_range_min_max(const struct Range *, CELL *, CELL *);
+void Rast_init_fp_range(struct FPRange *);
+void Rast_get_fp_range_min_max(const struct FPRange *, DCELL *, DCELL *);
+
+/* raster.c */
+void *Rast_incr_void_ptr(const void *, const size_t);
+int Rast_raster_cmp(const void *, const void *, RASTER_MAP_TYPE);
+void Rast_raster_cpy(void *, const void *, int, RASTER_MAP_TYPE);
+void Rast_set_raster_value_c(void *, CELL, RASTER_MAP_TYPE);
+void Rast_set_raster_value_f(void *, FCELL, RASTER_MAP_TYPE);
+void Rast_set_raster_value_d(void *, DCELL, RASTER_MAP_TYPE);
+CELL Rast_get_raster_value_c(const void *, RASTER_MAP_TYPE);
+FCELL Rast_get_raster_value_f(const void *, RASTER_MAP_TYPE);
+DCELL Rast_get_raster_value_d(const void *, RASTER_MAP_TYPE);
+
+/* raster_metadata.c */
+int Rast_read_raster_units(const char *, const char *, char *);
+int Rast_read_raster_vdatum(const char *, const char *, char *);
+int Rast_write_raster_units(const char *, const char *);
+int Rast_write_raster_vdatum(const char *, const char *);
+int Rast__raster_misc_read_line(const char *, const char *, const char *,
+			     char *);
+int Rast__raster_misc_write_line(const char *, const char *, const char *);
+
+/* reclass.c */
+int Rast_is_reclass(const char *, const char *, char *, char *);
+int Rast_is_reclassed_to(const char *, const char *, int *, char ***);
+int Rast_get_reclass(const char *, const char *, struct Reclass *);
+void Rast_free_reclass(struct Reclass *);
+int Rast_put_reclass(const char *, const struct Reclass *);
+
+/* sample.c */
+DCELL Rast_get_raster_sample_nearest(int, const struct Cell_head *, struct Categories *, double, double, int);
+DCELL Rast_get_raster_sample_bilinear(int, const struct Cell_head *, struct Categories *, double, double, int);
+DCELL Rast_get_raster_sample_cubic(int, const struct Cell_head *, struct Categories *, double, double, int);
+DCELL Rast_get_raster_sample(int, const struct Cell_head *, struct Categories *, double, double, int, INTERP_TYPE);
+
+/* set_window.c */
+int Rast_set_window(struct Cell_head *);
+
+/* zero_cell.c */
+void Rast_zero_cell_buf(CELL *);
+void Rast_zero_raster_buf(void *, RASTER_MAP_TYPE);
+
+#endif

Modified: grass/trunk/lib/cluster/c_point.c
===================================================================
--- grass/trunk/lib/cluster/c_point.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/cluster/c_point.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
  * note: if all values in x are zero, the point is rejected
  ***************************************************************/
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/cluster.h>
 
 static int extend(struct Cluster *, int);

Modified: grass/trunk/lib/display/Makefile
===================================================================
--- grass/trunk/lib/display/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/display/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../..
 
 EXTRA_LIBS=$(GISLIB) $(DRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) \
-	$(HTMLDRIVERLIB) $(RASTRLIB)
+	$(HTMLDRIVERLIB) $(RASTERLIB)
 EXTRA_INC = -I../driver
 
 ifneq ($(USE_CAIRO),)

Modified: grass/trunk/lib/display/raster.c
===================================================================
--- grass/trunk/lib/display/raster.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/display/raster.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/display.h>
 

Modified: grass/trunk/lib/display/raster2.c
===================================================================
--- grass/trunk/lib/display/raster2.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/display/raster2.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 

Modified: grass/trunk/lib/display/setup.c
===================================================================
--- grass/trunk/lib/display/setup.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/display/setup.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -11,7 +11,7 @@
  */
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 

Modified: grass/trunk/lib/display/tran_colr.c
===================================================================
--- grass/trunk/lib/display/tran_colr.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/display/tran_colr.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 
 #include <grass/display.h>
 #include <grass/colors.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display_raster.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/lib/g3d/Makefile
===================================================================
--- grass/trunk/lib/g3d/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 
 LIB_NAME = $(G3D_LIBNAME)
 
-EXTRA_LIBS = $(GISLIB) $(RASTRLIB)
+EXTRA_LIBS = $(GISLIB) $(RASTERLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

Modified: grass/trunk/lib/g3d/g3dcats.c
===================================================================
--- grass/trunk/lib/g3d/g3dcats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3dcats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 #include <rpc/xdr.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "G3d_intern.h"
 

Modified: grass/trunk/lib/g3d/g3dclose.c
===================================================================
--- grass/trunk/lib/g3d/g3dclose.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3dclose.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "G3d_intern.h"
 

Modified: grass/trunk/lib/g3d/g3dcolor.c
===================================================================
--- grass/trunk/lib/g3d/g3dcolor.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3dcolor.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 #include <rpc/xdr.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G3d_intern.h"

Modified: grass/trunk/lib/g3d/g3dfpxdr.c
===================================================================
--- grass/trunk/lib/g3d/g3dfpxdr.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3dfpxdr.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "G3d_intern.h"
 

Modified: grass/trunk/lib/g3d/g3dmisc.c
===================================================================
--- grass/trunk/lib/g3d/g3dmisc.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3dmisc.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "G3d_intern.h"
 

Modified: grass/trunk/lib/g3d/g3dnull.c
===================================================================
--- grass/trunk/lib/g3d/g3dnull.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3dnull.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "G3d_intern.h"
 

Modified: grass/trunk/lib/g3d/g3drange.c
===================================================================
--- grass/trunk/lib/g3d/g3drange.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3drange.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 #include <rpc/xdr.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G3d_intern.h"

Modified: grass/trunk/lib/g3d/g3dregion.c
===================================================================
--- grass/trunk/lib/g3d/g3dregion.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3dregion.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 
 #include "G3d_intern.h"

Modified: grass/trunk/lib/g3d/g3dvolume.c
===================================================================
--- grass/trunk/lib/g3d/g3dvolume.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/g3dvolume.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 
 /*---------------------------------------------------------------------------*/

Modified: grass/trunk/lib/g3d/getblock.c
===================================================================
--- grass/trunk/lib/g3d/getblock.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/getblock.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "G3d_intern.h"
 
 /*---------------------------------------------------------------------------*/

Modified: grass/trunk/lib/g3d/tileread.c
===================================================================
--- grass/trunk/lib/g3d/tileread.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/tileread.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "G3d_intern.h"
 
 static int

Modified: grass/trunk/lib/g3d/tilewrite.c
===================================================================
--- grass/trunk/lib/g3d/tilewrite.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/g3d/tilewrite.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "G3d_intern.h"
 
 

Modified: grass/trunk/lib/gpde/Makefile
===================================================================
--- grass/trunk/lib/gpde/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/gpde/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
 #EXTRA_CFLAGS=-fopenmp
 #EXTRA_LIBS=$(GISLIB) $(G3DLIB) -lgomp $(MATHLIB)
 
-EXTRA_LIBS=$(GISLIB) $(G3DLIB) $(RASTRLIB)
+EXTRA_LIBS=$(GISLIB) $(G3DLIB) $(RASTERLIB)
 LIB_NAME = $(GPDE_LIBNAME)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

Modified: grass/trunk/lib/gpde/N_arrays.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/gpde/N_arrays.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include <grass/N_pde.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/lib/gpde/N_arrays_calc.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_calc.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/gpde/N_arrays_calc.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <math.h>
 
 #include <grass/N_pde.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/gpde/N_arrays_io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <math.h>
 
 #include <grass/N_pde.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/lib/gpde/N_pde.h
===================================================================
--- grass/trunk/lib/gpde/N_pde.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/gpde/N_pde.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 *****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/lib/nviz/Makefile
===================================================================
--- grass/trunk/lib/nviz/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/nviz/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
 
 EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(OPENGLLIB) \
 	$(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
-	$(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB) $(RASTRLIB)
+	$(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB) $(RASTERLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

Modified: grass/trunk/lib/nviz/nviz.c
===================================================================
--- grass/trunk/lib/nviz/nviz.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/nviz/nviz.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
    \date 2008
  */
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/nviz.h>
 

Modified: grass/trunk/lib/ogsf/GS2.c
===================================================================
--- grass/trunk/lib/ogsf/GS2.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/ogsf/GS2.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -43,7 +43,7 @@
 #endif
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gstypes.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/lib/ogsf/Gp3.c
===================================================================
--- grass/trunk/lib/ogsf/Gp3.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/ogsf/Gp3.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/site.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/ogsf/Gs3.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/bitmap.h>
 

Modified: grass/trunk/lib/ogsf/Gvl3.c
===================================================================
--- grass/trunk/lib/ogsf/Gvl3.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/ogsf/Gvl3.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/gstypes.h>
 #include <grass/glocale.h>

Modified: grass/trunk/lib/ogsf/Makefile
===================================================================
--- grass/trunk/lib/ogsf/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/ogsf/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 
 EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) \
 	$(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) \
-	$(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(RASTRLIB)
+	$(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(RASTERLIB)
 
 LIB_NAME = $(OGSF_LIBNAME)
 

Modified: grass/trunk/lib/ogsf/gsd_legend.c
===================================================================
--- grass/trunk/lib/ogsf/gsd_legend.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/ogsf/gsd_legend.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -32,7 +32,7 @@
 #endif
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/gstypes.h>
 

Modified: grass/trunk/lib/raster/Makefile
===================================================================
--- grass/trunk/lib/raster/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 GDAL_LINK = $(USE_GDAL)
 GDAL_DYNAMIC = 1
 
-LIB_NAME = $(RASTR_LIBNAME)
+LIB_NAME = $(RASTER_LIBNAME)
 EXTRA_LIBS = $(XDRLIB) $(SOCKLIB) $(DATETIMELIB) $(PTHREADLIBPATH) \
 	$(PTHREADLIB) $(INTLLIB) $(MATHLIB) $(GISLIB)
 EXTRA_INC = $(ZLIBINCPATH) $(PTHREADINCPATH)

Modified: grass/trunk/lib/raster/alloc_cell.c
===================================================================
--- grass/trunk/lib/raster/alloc_cell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/alloc_cell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /* convert type "RASTER_MAP_TYPE" into index */
 #define F2I(map_type) \

Modified: grass/trunk/lib/raster/auto_mask.c
===================================================================
--- grass/trunk/lib/raster/auto_mask.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/auto_mask.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/cats.c
===================================================================
--- grass/trunk/lib/raster/cats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/cats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -72,7 +72,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static void get_cond(char **, char *, DCELL);

Modified: grass/trunk/lib/raster/cell_stats.c
===================================================================
--- grass/trunk/lib/raster/cell_stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/cell_stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define INCR 10
 #define SHIFT 6

Modified: grass/trunk/lib/raster/cellstats_eq.c
===================================================================
--- grass/trunk/lib/raster/cellstats_eq.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/cellstats_eq.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int Rast_cell_stats_histo_eq(struct Cell_stats *statf, CELL min1, CELL max1,	/* input range to be rescaled */
 			  CELL min2, CELL max2,	/* output range */

Modified: grass/trunk/lib/raster/closecell.c
===================================================================
--- grass/trunk/lib/raster/closecell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/closecell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <signal.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/color_compat.c
===================================================================
--- grass/trunk/lib/raster/color_compat.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_compat.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief Make color wave (integer)

Modified: grass/trunk/lib/raster/color_free.c
===================================================================
--- grass/trunk/lib/raster/color_free.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_free.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief Free color structure memory

Modified: grass/trunk/lib/raster/color_get.c
===================================================================
--- grass/trunk/lib/raster/color_get.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_get.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief Get a category color.

Modified: grass/trunk/lib/raster/color_hist.c
===================================================================
--- grass/trunk/lib/raster/color_hist.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_hist.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief Make histogram-stretched grey colors

Modified: grass/trunk/lib/raster/color_look.c
===================================================================
--- grass/trunk/lib/raster/color_look.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_look.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief Lookup an array of colors

Modified: grass/trunk/lib/raster/color_org.c
===================================================================
--- grass/trunk/lib/raster/color_org.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_org.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define LOOKUP_COLORS 2048
 

Modified: grass/trunk/lib/raster/color_rand.c
===================================================================
--- grass/trunk/lib/raster/color_rand.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_rand.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <stdlib.h>		/*  For rand() and srand() */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define MAX_COLORS 1024

Modified: grass/trunk/lib/raster/color_read.c
===================================================================
--- grass/trunk/lib/raster/color_read.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_read.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static int read_colors(const char *, const char *, const char *,

Modified: grass/trunk/lib/raster/color_rule.c
===================================================================
--- grass/trunk/lib/raster/color_rule.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_rule.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define LIMIT(x) if (x < 0) x = 0; else if (x > 255) x = 255;
 

Modified: grass/trunk/lib/raster/color_rules.c
===================================================================
--- grass/trunk/lib/raster/color_rules.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_rules.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct rule

Modified: grass/trunk/lib/raster/color_set.c
===================================================================
--- grass/trunk/lib/raster/color_set.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_set.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief Set a category color (CELL)

Modified: grass/trunk/lib/raster/color_write.c
===================================================================
--- grass/trunk/lib/raster/color_write.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_write.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdio.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define PRECISION 30
 #define THRESHOLD .0000000000000000000000000000005 /* .5 * 10 ^(-30) */

Modified: grass/trunk/lib/raster/color_xform.c
===================================================================
--- grass/trunk/lib/raster/color_xform.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/color_xform.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -43,7 +43,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief make histogram-stretched version of existing color table

Modified: grass/trunk/lib/raster/format.c
===================================================================
--- grass/trunk/lib/raster/format.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/format.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/fpreclass.c
===================================================================
--- grass/trunk/lib/raster/fpreclass.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/fpreclass.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -242,7 +242,7 @@
 /*--------------------------------------------------------------------------*/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*--------------------------------------------------------------------------*/
 

Modified: grass/trunk/lib/raster/gdal.c
===================================================================
--- grass/trunk/lib/raster/gdal.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/gdal.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/get_cellhd.c
===================================================================
--- grass/trunk/lib/raster/get_cellhd.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/get_cellhd.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 /*!

Modified: grass/trunk/lib/raster/get_row.c
===================================================================
--- grass/trunk/lib/raster/get_row.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/get_row.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <rpc/xdr.h>
 
 #include <grass/config.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/get_row_colr.c
===================================================================
--- grass/trunk/lib/raster/get_row_colr.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/get_row_colr.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "G.h"
 

Modified: grass/trunk/lib/raster/histo_eq.c
===================================================================
--- grass/trunk/lib/raster/histo_eq.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/histo_eq.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -10,7 +10,7 @@
 * inputs are histo, output is map,min,max
 ****************************************************************/
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void Rast_histogram_eq(const struct Histogram *histo,
 		    unsigned char **map, CELL *min, CELL *max)

Modified: grass/trunk/lib/raster/histogram.c
===================================================================
--- grass/trunk/lib/raster/histogram.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/histogram.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define LIST struct Histogram_list

Modified: grass/trunk/lib/raster/init.c
===================================================================
--- grass/trunk/lib/raster/init.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/init.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <locale.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "../raster/G.h"

Modified: grass/trunk/lib/raster/mask_info.c
===================================================================
--- grass/trunk/lib/raster/mask_info.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/mask_info.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 char *Rast_mask_info(void)

Modified: grass/trunk/lib/raster/maskfd.c
===================================================================
--- grass/trunk/lib/raster/maskfd.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/maskfd.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "G.h"
 

Modified: grass/trunk/lib/raster/null_val.c
===================================================================
--- grass/trunk/lib/raster/null_val.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/null_val.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 
 /* Grass and local include files */
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static void EmbedGivenNulls(void *, char *, RASTER_MAP_TYPE, int);

Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/opencell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/put_row.c
===================================================================
--- grass/trunk/lib/raster/put_row.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/put_row.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -81,7 +81,7 @@
 #include <fcntl.h>
 
 #include <grass/config.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/quant.c
===================================================================
--- grass/trunk/lib/raster/quant.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/quant.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 static int double_comp(const void *, const void *);
 

Modified: grass/trunk/lib/raster/quant_io.c
===================================================================
--- grass/trunk/lib/raster/quant_io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/quant_io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -61,7 +61,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 /*--------------------------------------------------------------------------*/

Modified: grass/trunk/lib/raster/quant_rw.c
===================================================================
--- grass/trunk/lib/raster/quant_rw.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/quant_rw.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 /*!

Modified: grass/trunk/lib/raster/range.c
===================================================================
--- grass/trunk/lib/raster/range.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/range.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 #include <rpc/types.h>		/* need this for sgi */
 #include <rpc/xdr.h>
 
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/raster.c
===================================================================
--- grass/trunk/lib/raster/raster.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/raster.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief Advance void pointer

Modified: grass/trunk/lib/raster/raster_metadata.c
===================================================================
--- grass/trunk/lib/raster/raster_metadata.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/raster_metadata.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/lib/raster/reclass.c
===================================================================
--- grass/trunk/lib/raster/reclass.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/reclass.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static const char NULL_STRING[] = "null";

Modified: grass/trunk/lib/raster/sample.c
===================================================================
--- grass/trunk/lib/raster/sample.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/sample.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 /* prototypes */

Modified: grass/trunk/lib/raster/set_window.c
===================================================================
--- grass/trunk/lib/raster/set_window.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/set_window.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "G.h"

Modified: grass/trunk/lib/raster/zero_cell.c
===================================================================
--- grass/trunk/lib/raster/zero_cell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/raster/zero_cell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*!
  * \brief Zero a raster CELL buffer.

Modified: grass/trunk/lib/rst/interp_float/Makefile
===================================================================
--- grass/trunk/lib/rst/interp_float/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/rst/interp_float/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,11 +1,11 @@
 MODULE_TOPDIR = ../../..
 
 EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) \
-	$(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB) $(RASTRLIB)
+	$(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB) $(RASTERLIB)
 
 LIB_NAME = $(INTERPFL_LIBNAME)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

Modified: grass/trunk/lib/rst/interp_float/input2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/input2d.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/rst/interp_float/input2d.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/site.h>
 #include <grass/bitmap.h>
 #include <grass/linkm.h>

Modified: grass/trunk/lib/rst/interp_float/interp2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/interp2d.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/rst/interp_float/interp2d.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -28,7 +28,7 @@
 #include <unistd.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/bitmap.h>
 
 #include <grass/interpf.h>

Modified: grass/trunk/lib/rst/interp_float/output2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/output2d.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/rst/interp_float/output2d.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/bitmap.h>
 #include <grass/linkm.h>
 

Modified: grass/trunk/lib/rst/interp_float/resout2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/resout2d.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/rst/interp_float/resout2d.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/bitmap.h>
 #include <grass/linkm.h>
 #include <grass/interpf.h>

Modified: grass/trunk/lib/rst/interp_float/ressegm2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/ressegm2d.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/rst/interp_float/ressegm2d.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/interpf.h>
 #include <grass/gmath.h>
 

Modified: grass/trunk/lib/stats/Makefile
===================================================================
--- grass/trunk/lib/stats/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(RASTRLIB)
+EXTRA_LIBS=$(GISLIB) $(RASTERLIB)
 
 LIB_NAME = $(STATS_LIBNAME)
 

Modified: grass/trunk/lib/stats/c_ave.c
===================================================================
--- grass/trunk/lib/stats/c_ave.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_ave.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_ave(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_count.c
===================================================================
--- grass/trunk/lib/stats/c_count.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_count.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_count(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_intr.c
===================================================================
--- grass/trunk/lib/stats/c_intr.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_intr.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/stats.h>
 
 void c_intr(DCELL * result, DCELL * values, int n, const void *closure)

Modified: grass/trunk/lib/stats/c_kurt.c
===================================================================
--- grass/trunk/lib/stats/c_kurt.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_kurt.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_kurt(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_max.c
===================================================================
--- grass/trunk/lib/stats/c_max.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_max.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_max(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_maxx.c
===================================================================
--- grass/trunk/lib/stats/c_maxx.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_maxx.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_maxx(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_median.c
===================================================================
--- grass/trunk/lib/stats/c_median.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_median.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/stats.h>
 
 void c_median(DCELL * result, DCELL * values, int n, const void *closure)

Modified: grass/trunk/lib/stats/c_min.c
===================================================================
--- grass/trunk/lib/stats/c_min.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_min.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_min(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_minx.c
===================================================================
--- grass/trunk/lib/stats/c_minx.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_minx.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_minx(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_mode.c
===================================================================
--- grass/trunk/lib/stats/c_mode.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_mode.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/stats.h>
 
 void c_mode(DCELL * result, DCELL * values, int n, const void *closure)

Modified: grass/trunk/lib/stats/c_percentile.c
===================================================================
--- grass/trunk/lib/stats/c_percentile.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_percentile.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/stats.h>
 
 void c_quant(DCELL * result, DCELL * values, int n, const void *closure)

Modified: grass/trunk/lib/stats/c_range.c
===================================================================
--- grass/trunk/lib/stats/c_range.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_range.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_range(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_reg.c
===================================================================
--- grass/trunk/lib/stats/c_reg.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_reg.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define REGRESSION_SLOPE	0
 #define REGRESSION_OFFSET	1

Modified: grass/trunk/lib/stats/c_skew.c
===================================================================
--- grass/trunk/lib/stats/c_skew.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_skew.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_skew(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_stddev.c
===================================================================
--- grass/trunk/lib/stats/c_stddev.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_stddev.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/stats.h>
 
 void c_stddev(DCELL * result, DCELL * values, int n, const void *closure)

Modified: grass/trunk/lib/stats/c_sum.c
===================================================================
--- grass/trunk/lib/stats/c_sum.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_sum.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_sum(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/c_var.c
===================================================================
--- grass/trunk/lib/stats/c_var.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/c_var.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void c_var(DCELL * result, DCELL * values, int n, const void *closure)
 {

Modified: grass/trunk/lib/stats/sort_cell.c
===================================================================
--- grass/trunk/lib/stats/sort_cell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/lib/stats/sort_cell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/stats.h>
 
 static int ascending(const void *aa, const void *bb)

Modified: grass/trunk/ps/ps.map/Makefile
===================================================================
--- grass/trunk/ps/ps.map/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,8 +3,8 @@
 PGM=ps.map
 PROLOG=$(ETC)/paint/prolog.ps
 
-LIBES     = $(VECTLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(RASTRLIB) $(DATETIMELIB) $(IMAGERYLIB) $(GMATHLIB)
-DEPENDENCIES = $(VECTDEP) $(SYMBDEP) $(GISDEP) $(RASTRDEP) $(DATETIMEDEP) $(IMAGERYDEP) $(GMATHDEP)
+LIBES     = $(VECTLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(RASTERLIB) $(DATETIMELIB) $(IMAGERYLIB) $(GMATHLIB)
+DEPENDENCIES = $(VECTDEP) $(SYMBDEP) $(GISDEP) $(RASTERDEP) $(DATETIMEDEP) $(IMAGERYDEP) $(GMATHDEP)
 
 EXTRA_INC = $(VECT_INC) $(PROJINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

Modified: grass/trunk/ps/ps.map/catval.c
===================================================================
--- grass/trunk/ps/ps.map/catval.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/catval.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
  *****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/ps/ps.map/distance.c
===================================================================
--- grass/trunk/ps/ps.map/distance.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/distance.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 double distance(double east, double west)
 {

Modified: grass/trunk/ps/ps.map/do_geogrid.c
===================================================================
--- grass/trunk/ps/ps.map/do_geogrid.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/do_geogrid.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/gprojects.h>
 

Modified: grass/trunk/ps/ps.map/do_masking.c
===================================================================
--- grass/trunk/ps/ps.map/do_masking.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/do_masking.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 

Modified: grass/trunk/ps/ps.map/do_plt.c
===================================================================
--- grass/trunk/ps/ps.map/do_plt.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/do_plt.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/symbol.h>
 #include "clr.h"

Modified: grass/trunk/ps/ps.map/do_psfiles.c
===================================================================
--- grass/trunk/ps/ps.map/do_psfiles.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/do_psfiles.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 

Modified: grass/trunk/ps/ps.map/do_vectors.c
===================================================================
--- grass/trunk/ps/ps.map/do_vectors.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/do_vectors.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/Vect.h>
 #include <grass/symbol.h>

Modified: grass/trunk/ps/ps.map/error.c
===================================================================
--- grass/trunk/ps/ps.map/error.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/error.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 extern FILE *tracefd;
 

Modified: grass/trunk/ps/ps.map/get_font.c
===================================================================
--- grass/trunk/ps/ps.map/get_font.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/get_font.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int get_font(char *data)
 {

Modified: grass/trunk/ps/ps.map/input.c
===================================================================
--- grass/trunk/ps/ps.map/input.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/input.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 
 extern FILE *tracefd;

Modified: grass/trunk/ps/ps.map/main.c
===================================================================
--- grass/trunk/ps/ps.map/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "map_info.h"

Modified: grass/trunk/ps/ps.map/makeprocs.c
===================================================================
--- grass/trunk/ps/ps.map/makeprocs.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/makeprocs.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 

Modified: grass/trunk/ps/ps.map/map_setup.c
===================================================================
--- grass/trunk/ps/ps.map/map_setup.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/map_setup.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 #include "group.h"

Modified: grass/trunk/ps/ps.map/outl_io.c
===================================================================
--- grass/trunk/ps/ps.map/outl_io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/outl_io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 #include "local_proto.h"

Modified: grass/trunk/ps/ps.map/parse_list.c
===================================================================
--- grass/trunk/ps/ps.map/parse_list.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/parse_list.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
  * count will be negative if list is not valid
  ********************************************************/
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int parse_val_list(char *buf, DCELL ** list)
 {

Modified: grass/trunk/ps/ps.map/ps_header.c
===================================================================
--- grass/trunk/ps/ps.map/ps_header.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/ps_header.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ps_info.h"
 
 static long bb_offset;

Modified: grass/trunk/ps/ps.map/ps_info.h
===================================================================
--- grass/trunk/ps/ps.map/ps_info.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/ps_info.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /* Font sizes */
 #define PS_FONT_MAX_SIZE      50

Modified: grass/trunk/ps/ps.map/ps_outline.c
===================================================================
--- grass/trunk/ps/ps.map/ps_outline.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/ps_outline.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 #include "local_proto.h"

Modified: grass/trunk/ps/ps.map/ps_raster.c
===================================================================
--- grass/trunk/ps/ps.map/ps_raster.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/ps_raster.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 #include "group.h"

Modified: grass/trunk/ps/ps.map/ps_vareas.c
===================================================================
--- grass/trunk/ps/ps.map/ps_vareas.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/ps_vareas.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>

Modified: grass/trunk/ps/ps.map/ps_vlines.c
===================================================================
--- grass/trunk/ps/ps.map/ps_vlines.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/ps_vlines.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>

Modified: grass/trunk/ps/ps.map/r_group.c
===================================================================
--- grass/trunk/ps/ps.map/r_group.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/r_group.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 #include "group.h"

Modified: grass/trunk/ps/ps.map/r_labels.c
===================================================================
--- grass/trunk/ps/ps.map/r_labels.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/r_labels.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "labels.h"
 #include "local_proto.h"
 

Modified: grass/trunk/ps/ps.map/r_vareas.c
===================================================================
--- grass/trunk/ps/ps.map/r_vareas.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/r_vareas.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 
 #include "vector.h"

Modified: grass/trunk/ps/ps.map/r_vpoints.c
===================================================================
--- grass/trunk/ps/ps.map/r_vpoints.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/r_vpoints.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>
 #include "vector.h"

Modified: grass/trunk/ps/ps.map/read_cfg.c
===================================================================
--- grass/trunk/ps/ps.map/read_cfg.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/read_cfg.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ps_info.h"
 #include "paper.h"

Modified: grass/trunk/ps/ps.map/scale.c
===================================================================
--- grass/trunk/ps/ps.map/scale.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/scale.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 #include "ps_info.h"

Modified: grass/trunk/ps/ps.map/scan_gis.c
===================================================================
--- grass/trunk/ps/ps.map/scan_gis.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/scan_gis.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 
 int scan_gis(char *element, char *desc, char *key, char *data,

Modified: grass/trunk/ps/ps.map/session.c
===================================================================
--- grass/trunk/ps/ps.map/session.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/session.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 
 static char cur[2000];

Modified: grass/trunk/ps/ps.map/vect.c
===================================================================
--- grass/trunk/ps/ps.map/vect.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/vect.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 #include <math.h>
 #include <grass/Vect.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "vector.h"
 
 #define LENGTH(DX, DY)  (  sqrt( (DX*DX)+(DY*DY) )  )

Modified: grass/trunk/ps/ps.map/vector.c
===================================================================
--- grass/trunk/ps/ps.map/vector.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/ps/ps.map/vector.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "vector.h"
 
 

Modified: grass/trunk/raster/r.basins.fill/Makefile
===================================================================
--- grass/trunk/raster/r.basins.fill/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.basins.fill/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.basins.fill
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.basins.fill/main.c
===================================================================
--- grass/trunk/raster/r.basins.fill/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.basins.fill/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "local_proto.h"

Modified: grass/trunk/raster/r.basins.fill/read_map.c
===================================================================
--- grass/trunk/raster/r.basins.fill/read_map.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.basins.fill/read_map.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.bitpattern/Makefile
===================================================================
--- grass/trunk/raster/r.bitpattern/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.bitpattern/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.bitpattern
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.bitpattern/main.c
===================================================================
--- grass/trunk/raster/r.bitpattern/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.bitpattern/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 extern CELL f_c(CELL);

Modified: grass/trunk/raster/r.buffer/Makefile
===================================================================
--- grass/trunk/raster/r.buffer/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.buffer/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.buffer2
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.buffer/distance.h
===================================================================
--- grass/trunk/raster/r.buffer/distance.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.buffer/distance.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,8 +23,8 @@
 #define __DISTANCE_H__
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
+#include <grass/raster.h>
 
 struct Distance
 {

Modified: grass/trunk/raster/r.buffer/find_dist.c
===================================================================
--- grass/trunk/raster/r.buffer/find_dist.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.buffer/find_dist.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 ****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "distance.h"
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.buffer/init.c
===================================================================
--- grass/trunk/raster/r.buffer/init.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.buffer/init.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 
 #include "distance.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int init_grass(void)
 {

Modified: grass/trunk/raster/r.carve/Makefile
===================================================================
--- grass/trunk/raster/r.carve/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.carve/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.carve
 
-LIBES     = $(SITESLIB) $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) $(RASTRLIB) 
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(SITESLIB) $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) $(RASTERLIB) 
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP) $(RASTERDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

Modified: grass/trunk/raster/r.carve/enforce.h
===================================================================
--- grass/trunk/raster/r.carve/enforce.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.carve/enforce.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/bitmap.h>
 #include <grass/Vect.h>
 

Modified: grass/trunk/raster/r.carve/enforce_ds.c
===================================================================
--- grass/trunk/raster/r.carve/enforce_ds.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.carve/enforce_ds.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "enforce.h"
 

Modified: grass/trunk/raster/r.carve/main.c
===================================================================
--- grass/trunk/raster/r.carve/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.carve/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "enforce.h"
 

Modified: grass/trunk/raster/r.carve/raster.c
===================================================================
--- grass/trunk/raster/r.carve/raster.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.carve/raster.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.carve/support.c
===================================================================
--- grass/trunk/raster/r.carve/support.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.carve/support.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "enforce.h"
 

Modified: grass/trunk/raster/r.carve/vect.c
===================================================================
--- grass/trunk/raster/r.carve/vect.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.carve/vect.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "enforce.h"
 
 

Modified: grass/trunk/raster/r.category/Makefile
===================================================================
--- grass/trunk/raster/r.category/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.category/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.category
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.category/cats.c
===================================================================
--- grass/trunk/raster/r.category/cats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.category/cats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.category/main.c
===================================================================
--- grass/trunk/raster/r.category/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.category/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.circle/Makefile
===================================================================
--- grass/trunk/raster/r.circle/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.circle/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.circle
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.circle/main.c
===================================================================
--- grass/trunk/raster/r.circle/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.circle/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <strings.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 typedef int FILEDESC;

Modified: grass/trunk/raster/r.clump/Makefile
===================================================================
--- grass/trunk/raster/r.clump/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.clump/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.clump
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.clump/clump.c
===================================================================
--- grass/trunk/raster/r.clump/clump.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.clump/clump.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 
 #include <time.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.clump/main.c
===================================================================
--- grass/trunk/raster/r.clump/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.clump/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.coin/Makefile
===================================================================
--- grass/trunk/raster/r.coin/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.coin/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.coin
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.coin/coin.h
===================================================================
--- grass/trunk/raster/r.coin/coin.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.coin/coin.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,8 +20,8 @@
 #define __COIN_H__
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
+#include <grass/raster.h>
 
 struct stats_table
 {

Modified: grass/trunk/raster/r.coin/main.c
===================================================================
--- grass/trunk/raster/r.coin/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.coin/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "coin.h"
 

Modified: grass/trunk/raster/r.coin/make_coin.c
===================================================================
--- grass/trunk/raster/r.coin/make_coin.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.coin/make_coin.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include "coin.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static int cmp(const void *, const void *);

Modified: grass/trunk/raster/r.colors/Makefile
===================================================================
--- grass/trunk/raster/r.colors/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.colors/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.colors
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.colors/local_proto.h
===================================================================
--- grass/trunk/raster/r.colors/local_proto.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.colors/local_proto.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #define __LOCAL_PROTO_H__
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /* stats.c */
 int get_stats(const char *, const char *, struct Cell_stats *);

Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.colors/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.colors/rules.c
===================================================================
--- grass/trunk/raster/r.colors/rules.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.colors/rules.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.colors/stats.c
===================================================================
--- grass/trunk/raster/r.colors/stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.colors/stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.colors.out/Makefile
===================================================================
--- grass/trunk/raster/r.colors.out/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.colors.out/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.colors.out
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.colors.out/main.c
===================================================================
--- grass/trunk/raster/r.colors.out/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.colors.out/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static FILE *fp;

Modified: grass/trunk/raster/r.composite/Makefile
===================================================================
--- grass/trunk/raster/r.composite/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.composite/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.composite
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.composite/main.c
===================================================================
--- grass/trunk/raster/r.composite/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.composite/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct band

Modified: grass/trunk/raster/r.compress/Makefile
===================================================================
--- grass/trunk/raster/r.compress/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.compress/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.compress
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.compress/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static off_t newsize, oldsize;

Modified: grass/trunk/raster/r.contour/Makefile
===================================================================
--- grass/trunk/raster/r.contour/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.contour/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,8 +3,8 @@
 
 PGM=r.contour
 
-LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
  

Modified: grass/trunk/raster/r.contour/cont.c
===================================================================
--- grass/trunk/raster/r.contour/cont.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.contour/cont.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>
 #include "local_proto.h"

Modified: grass/trunk/raster/r.contour/main.c
===================================================================
--- grass/trunk/raster/r.contour/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.contour/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -45,7 +45,7 @@
 #include <ctype.h>
 #include <float.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.cost/Makefile
===================================================================
--- grass/trunk/raster/r.cost/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.cost/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.cost
 
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTERLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTERDEP) $(SEGMENTDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/raster/r.cost/btree.c
===================================================================
--- grass/trunk/raster/r.cost/btree.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.cost/btree.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -38,7 +38,7 @@
 
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include "memory.h"
 #include <stdlib.h>

Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.cost/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -61,7 +61,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/site.h>
 #include <grass/segment.h>
 #include "cost.h"

Modified: grass/trunk/raster/r.cost/memory.c
===================================================================
--- grass/trunk/raster/r.cost/memory.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.cost/memory.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "memory.h"
 
 #define NUM_IN_BLOCK	1024*8

Modified: grass/trunk/raster/r.covar/Makefile
===================================================================
--- grass/trunk/raster/r.covar/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.covar/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.covar
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.covar/main.c
===================================================================
--- grass/trunk/raster/r.covar/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.covar/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.cross/Makefile
===================================================================
--- grass/trunk/raster/r.cross/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.cross/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.cross
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.cross/glob.h
===================================================================
--- grass/trunk/raster/r.cross/glob.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.cross/glob.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,8 +20,8 @@
 #define __R_CROSS_GLOB_H__
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
+#include <grass/raster.h>
 
 #define NFILES 30		/* maximum number of layers */
 #define SHIFT 6			/* 2^SHIFT cats per node */

Modified: grass/trunk/raster/r.describe/Makefile
===================================================================
--- grass/trunk/raster/r.describe/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.describe/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.describe
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.describe/describe.c
===================================================================
--- grass/trunk/raster/r.describe/describe.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.describe/describe.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
  ***************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.describe/dumplist.c
===================================================================
--- grass/trunk/raster/r.describe/dumplist.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.describe/dumplist.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 static int show(CELL, CELL, int *, DCELL, DCELL, RASTER_MAP_TYPE, int);
 

Modified: grass/trunk/raster/r.describe/main.c
===================================================================
--- grass/trunk/raster/r.describe/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.describe/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.describe/tree.c
===================================================================
--- grass/trunk/raster/r.describe/tree.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.describe/tree.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
  ***************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 
 #define INCR 10

Modified: grass/trunk/raster/r.distance/Makefile
===================================================================
--- grass/trunk/raster/r.distance/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.distance/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.distance
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.distance/defs.h
===================================================================
--- grass/trunk/raster/r.distance/defs.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.distance/defs.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #define __R_DIST_DEFS_H__
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct EdgeList			/* keep track of edge cells */

Modified: grass/trunk/raster/r.distance/main.c
===================================================================
--- grass/trunk/raster/r.distance/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.distance/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include "defs.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int main(int argc, char *argv[])

Modified: grass/trunk/raster/r.distance/parse.c
===================================================================
--- grass/trunk/raster/r.distance/parse.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.distance/parse.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include "defs.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 void parse(int argc, char *argv[], struct Parms *parms)

Modified: grass/trunk/raster/r.drain/Makefile
===================================================================
--- grass/trunk/raster/r.drain/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.drain/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.drain
 
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTERLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTERDEP) $(SEGMENTDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/raster/r.drain/filldir.c
===================================================================
--- grass/trunk/raster/r.drain/filldir.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.drain/filldir.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <limits.h>
 #include <float.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "tinf.h"
 #include "local.h"
 

Modified: grass/trunk/raster/r.drain/main.c
===================================================================
--- grass/trunk/raster/r.drain/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.drain/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -40,7 +40,7 @@
 #include <unistd.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/site.h>
 #include <grass/glocale.h>
 #include <grass/Vect.h>

Modified: grass/trunk/raster/r.drain/resolve.c
===================================================================
--- grass/trunk/raster/r.drain/resolve.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.drain/resolve.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "tinf.h"
 
 CELL select_dir(CELL i)

Modified: grass/trunk/raster/r.drain/tinf.c
===================================================================
--- grass/trunk/raster/r.drain/tinf.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.drain/tinf.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <float.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "tinf.h"
 
 int (*is_null) (void *);

Modified: grass/trunk/raster/r.external/Makefile
===================================================================
--- grass/trunk/raster/r.external/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.external/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM  = r.external
 
-LIBES= $(GPROJLIB) $(GISLIB) $(RASTRLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP) $(IMAGERYDEP) $(GMATHDEP)
+LIBES= $(GPROJLIB) $(GISLIB) $(RASTERLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP) $(IMAGERYDEP) $(GMATHDEP)
 EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.external/main.c
===================================================================
--- grass/trunk/raster/r.external/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.external/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <math.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.fill.dir/Makefile
===================================================================
--- grass/trunk/raster/r.fill.dir/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.fill.dir/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.fill.dir
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.fill.dir/dopolys.c
===================================================================
--- grass/trunk/raster/r.fill.dir/dopolys.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.fill.dir/dopolys.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 void recurse_list(int flag, int *cells, int sz, int start)

Modified: grass/trunk/raster/r.fill.dir/filldir.c
===================================================================
--- grass/trunk/raster/r.fill.dir/filldir.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.fill.dir/filldir.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 #include <limits.h>
 #include <float.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "tinf.h"
 
 /* get the slope between two cells and return a slope direction */

Modified: grass/trunk/raster/r.fill.dir/main.c
===================================================================
--- grass/trunk/raster/r.fill.dir/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.fill.dir/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -48,7 +48,7 @@
 #include <unistd.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define DEBUG

Modified: grass/trunk/raster/r.fill.dir/ppupdate.c
===================================================================
--- grass/trunk/raster/r.fill.dir/ppupdate.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.fill.dir/ppupdate.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "tinf.h"
 
 struct links

Modified: grass/trunk/raster/r.fill.dir/resolve.c
===================================================================
--- grass/trunk/raster/r.fill.dir/resolve.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.fill.dir/resolve.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "tinf.h"
 

Modified: grass/trunk/raster/r.fill.dir/tinf.c
===================================================================
--- grass/trunk/raster/r.fill.dir/tinf.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.fill.dir/tinf.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <float.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "tinf.h"
 
 /* To add a new multitype function, use the function below to initialize

Modified: grass/trunk/raster/r.fill.dir/wtrshed.c
===================================================================
--- grass/trunk/raster/r.fill.dir/wtrshed.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.fill.dir/wtrshed.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct whereandwhat

Modified: grass/trunk/raster/r.flow/Makefile
===================================================================
--- grass/trunk/raster/r.flow/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM=r.flow
 
-LIBES     = $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) $(RASTRLIB) 
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(VECTLIB) $(DBMILIB) $(BITMAPLIB) $(LINKMLIB) $(SEGMENTLIB) $(GISLIB) $(RASTERLIB) 
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(BITMAPDEP) $(LINKMDEP) $(SEGMENTDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
  

Modified: grass/trunk/raster/r.flow/aspect.c
===================================================================
--- grass/trunk/raster/r.flow/aspect.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/aspect.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -26,7 +26,7 @@
 
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "r.flow.h"
 
 

Modified: grass/trunk/raster/r.flow/aspect.h
===================================================================
--- grass/trunk/raster/r.flow/aspect.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/aspect.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*
  * aspect_fly: calculates aspect on the fly based on elevation map in z

Modified: grass/trunk/raster/r.flow/io.h
===================================================================
--- grass/trunk/raster/r.flow/io.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/io.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /********************************* I/O **********************************/
 

Modified: grass/trunk/raster/r.flow/main.c
===================================================================
--- grass/trunk/raster/r.flow/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -29,7 +29,7 @@
 #include <stdlib.h>		/* for the random number generation */
 #include <time.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "r.flow.h"
 #include "mem.h"

Modified: grass/trunk/raster/r.flow/mem.c
===================================================================
--- grass/trunk/raster/r.flow/mem.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/mem.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "r.flow.h"
 #include "io.h"

Modified: grass/trunk/raster/r.flow/mem.h
===================================================================
--- grass/trunk/raster/r.flow/mem.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/mem.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 /************************** MEMORY MANAGEMENT ***************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #define KB 1024
 #define MB (KB * KB)
 #define SEGSINMEM 9

Modified: grass/trunk/raster/r.flow/precomp.c
===================================================================
--- grass/trunk/raster/r.flow/precomp.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/precomp.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "r.flow.h"
 #include "io.h"

Modified: grass/trunk/raster/r.flow/r.flow.h
===================================================================
--- grass/trunk/raster/r.flow/r.flow.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.flow/r.flow.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -32,7 +32,7 @@
 
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include <grass/Vect.h>
 #include <grass/bitmap.h>

Modified: grass/trunk/raster/r.grow.distance/Makefile
===================================================================
--- grass/trunk/raster/r.grow.distance/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.grow.distance/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.grow.distance
 
-LIBES = $(GISLIB) $(RASTRLIB) $(MATHLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB) $(MATHLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.grow.distance/main.c
===================================================================
--- grass/trunk/raster/r.grow.distance/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.grow.distance/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static struct Cell_head window;

Modified: grass/trunk/raster/r.gwflow/main.c
===================================================================
--- grass/trunk/raster/r.gwflow/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.gwflow/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/N_pde.h>
 #include <grass/N_gwflow.h>

Modified: grass/trunk/raster/r.his/Makefile
===================================================================
--- grass/trunk/raster/r.his/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.his/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.his
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.his/his.c
===================================================================
--- grass/trunk/raster/r.his/his.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.his/his.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "his.h"
 
 /****************************************************************************

Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.his/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include "his.h"

Modified: grass/trunk/raster/r.horizon/Makefile
===================================================================
--- grass/trunk/raster/r.horizon/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.horizon/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.horizon
 
-LIBES =  $(GPROJLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
+LIBES =  $(GPROJLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.horizon/main.c
===================================================================
--- grass/trunk/raster/r.horizon/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.horizon/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.in.arc/Makefile
===================================================================
--- grass/trunk/raster/r.in.arc/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.arc/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.in.arc
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.in.arc/gethead.c
===================================================================
--- grass/trunk/raster/r.in.arc/gethead.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.arc/gethead.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.in.arc/main.c
===================================================================
--- grass/trunk/raster/r.in.arc/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.arc/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #endif
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.in.ascii/Makefile
===================================================================
--- grass/trunk/raster/r.in.ascii/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.ascii/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.in.ascii
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.in.ascii/gethead.c
===================================================================
--- grass/trunk/raster/r.in.ascii/gethead.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.ascii/gethead.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.in.ascii/main.c
===================================================================
--- grass/trunk/raster/r.in.ascii/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.ascii/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.in.bin/Makefile
===================================================================
--- grass/trunk/raster/r.in.bin/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.bin/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.in.bin
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.bin/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "gmt_grd.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.in.gdal/Makefile
===================================================================
--- grass/trunk/raster/r.in.gdal/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.gdal/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM  = r.in.gdal
 
-LIBES= $(GPROJLIB) $(GISLIB) $(RASTRLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP) $(IMAGERYDEP) $(GMATHDEP)
+LIBES= $(GPROJLIB) $(GISLIB) $(RASTERLIB) $(IMAGERYLIB) $(GDALLIBS) $(GMATHLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP) $(IMAGERYDEP) $(GMATHDEP)
 EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.gdal/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.in.gridatb/Makefile
===================================================================
--- grass/trunk/raster/r.in.gridatb/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.gridatb/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.in.gridatb
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.in.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.in.gridatb/file_io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.gridatb/file_io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.in.gridatb/local_proto.h
===================================================================
--- grass/trunk/raster/r.in.gridatb/local_proto.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.gridatb/local_proto.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int check_ready(void);
 int adjcellhd(struct Cell_head *cellhd);

Modified: grass/trunk/raster/r.in.gridatb/main.c
===================================================================
--- grass/trunk/raster/r.in.gridatb/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.gridatb/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include "local_proto.h"
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct Cell_head cellhd;

Modified: grass/trunk/raster/r.in.mat/Makefile
===================================================================
--- grass/trunk/raster/r.in.mat/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.mat/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.in.mat
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.mat/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 /* typedef unsigned short uint16;

Modified: grass/trunk/raster/r.in.poly/Makefile
===================================================================
--- grass/trunk/raster/r.in.poly/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.poly/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.in.poly
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.in.poly/get_item.c
===================================================================
--- grass/trunk/raster/r.in.poly/get_item.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.poly/get_item.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 int get_item(FILE * fd, int *type, long *cat, double **x, double **y,
 	     int *count, struct Categories *labels)
 {

Modified: grass/trunk/raster/r.in.poly/getformat.c
===================================================================
--- grass/trunk/raster/r.in.poly/getformat.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.poly/getformat.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "format.h"
 
 int getformat(FILE * fd)

Modified: grass/trunk/raster/r.in.poly/main.c
===================================================================
--- grass/trunk/raster/r.in.poly/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.poly/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.in.poly/poly2rast.c
===================================================================
--- grass/trunk/raster/r.in.poly/poly2rast.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.poly/poly2rast.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "format.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.in.poly/raster.c
===================================================================
--- grass/trunk/raster/r.in.poly/raster.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.poly/raster.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "format.h"
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.in.xyz/Makefile
===================================================================
--- grass/trunk/raster/r.in.xyz/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.xyz/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.in.xyz
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.in.xyz/local_proto.h
===================================================================
--- grass/trunk/raster/r.in.xyz/local_proto.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.xyz/local_proto.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 
 #define BUFFSIZE 256

Modified: grass/trunk/raster/r.in.xyz/main.c
===================================================================
--- grass/trunk/raster/r.in.xyz/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.xyz/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <sys/types.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.in.xyz/support.c
===================================================================
--- grass/trunk/raster/r.in.xyz/support.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.in.xyz/support.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -9,7 +9,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 
 static void *get_cell_ptr(void *array, int cols, int row, int col,

Modified: grass/trunk/raster/r.info/Makefile
===================================================================
--- grass/trunk/raster/r.info/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.info/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.info
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.info/main.c
===================================================================
--- grass/trunk/raster/r.info/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.info/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.info/reclas_txt.c
===================================================================
--- grass/trunk/raster/r.info/reclas_txt.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.info/reclas_txt.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 
 

Modified: grass/trunk/raster/r.kappa/Makefile
===================================================================
--- grass/trunk/raster/r.kappa/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.kappa/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.kappa
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.kappa/calc_kappa.c
===================================================================
--- grass/trunk/raster/r.kappa/calc_kappa.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.kappa/calc_kappa.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "kappa.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.kappa/kappa.h
===================================================================
--- grass/trunk/raster/r.kappa/kappa.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.kappa/kappa.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <math.h>
 
 struct _gstats_

Modified: grass/trunk/raster/r.kappa/main.c
===================================================================
--- grass/trunk/raster/r.kappa/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.kappa/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 #include "kappa.h"

Modified: grass/trunk/raster/r.kappa/prt_mat.c
===================================================================
--- grass/trunk/raster/r.kappa/prt_mat.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.kappa/prt_mat.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "kappa.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.kappa/stats.c
===================================================================
--- grass/trunk/raster/r.kappa/stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.kappa/stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "kappa.h"
 #include <grass/glocale.h>
 #include "local_proto.h"

Modified: grass/trunk/raster/r.lake/Makefile
===================================================================
--- grass/trunk/raster/r.lake/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.lake/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,8 +4,8 @@
 
 PGM = r.lake
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.lake/main.c
===================================================================
--- grass/trunk/raster/r.lake/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.lake/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 /* Saves map file from 2d array. NULL must be 0. Also meanwhile calculates area and volume. */

Modified: grass/trunk/raster/r.le/r.le.patch/patch.h
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/patch.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.le/r.le.patch/patch.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define  SML   0.5
 #define  MIN   2

Modified: grass/trunk/raster/r.le/r.le.pixel/pixel.h
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/pixel.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.le/r.le.pixel/pixel.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define  BIG   1000000000.0
 #define  MAX   800

Modified: grass/trunk/raster/r.le/r.le.setup/setup.h
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/setup.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.le/r.le.setup/setup.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -28,7 +28,7 @@
 #include "stdlib.h"
 #include "string.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "sys/types.h"
 
 

Modified: grass/trunk/raster/r.le/r.le.trace/r.le.trace.h
===================================================================
--- grass/trunk/raster/r.le/r.le.trace/r.le.trace.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.le/r.le.trace/r.le.trace.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -26,7 +26,7 @@
 #include "stdlib.h"
 #include "string.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define EQ(a, b)    (a-b < 0.01 && a-b > -0.01 )
 #define BIG   500000000.0

Modified: grass/trunk/raster/r.li/r.li.cwed/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.cwed/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.cwed/cwed.c
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/cwed.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.cwed/cwed.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <fcntl.h>		/* for O_RDONLY usage */

Modified: grass/trunk/raster/r.li/r.li.cwed/utility.c
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/utility.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.cwed/utility.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -10,7 +10,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <string.h>

Modified: grass/trunk/raster/r.li/r.li.daemon/GenericCell.h
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/GenericCell.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.daemon/GenericCell.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -9,7 +9,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #ifndef GENERICCELL_H

Modified: grass/trunk/raster/r.li/r.li.daemon/avl.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/avl.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.daemon/avl.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
  *       \BUGS: please send bugs reports to pallecch at cli.di.unipi.it
  */
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <string.h>

Modified: grass/trunk/raster/r.li/r.li.daemon/avlID.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/avlID.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.daemon/avlID.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -31,7 +31,7 @@
 #endif
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "daemon.h"
 

Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.h
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "list.h"
 
 

Modified: grass/trunk/raster/r.li/r.li.daemon/ipc.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/ipc.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.daemon/ipc.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ipc.h"
 

Modified: grass/trunk/raster/r.li/r.li.daemon/list.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/list.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.daemon/list.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "daemon.h"
 

Modified: grass/trunk/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/worker.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.daemon/worker.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -30,7 +30,7 @@
 #endif
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "daemon.h"
 #include "defs.h"

Modified: grass/trunk/raster/r.li/r.li.dominance/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.dominance/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.dominance/dominance.c
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/dominance.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.dominance/dominance.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.edgedensity/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.edgedensity/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -11,7 +11,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.mpa/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.mpa/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.mpa/mpa.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/mpa.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.mpa/mpa.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.mps/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.mps/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.mps/mps.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/mps.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.mps/mps.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.padcv/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.padcv/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.padcv/padcv.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/padcv.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.padcv/padcv.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.padrange/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.padrange/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.padrange/padrange.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/padrange.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.padrange/padrange.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.padsd/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.padsd/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.padsd/padsd.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/padsd.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.padsd/padsd.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.patchdensity/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.patchdensity/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.patchdensity/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.patchdensity/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "../r.li.daemon/daemon.h"
 

Modified: grass/trunk/raster/r.li/r.li.patchnum/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.patchnum/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.patchnum/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.patchnum/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "../r.li.daemon/daemon.h"
 

Modified: grass/trunk/raster/r.li/r.li.richness/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.richness/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.richness/richness.c
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/richness.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.richness/richness.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.shannon/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.shannon/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.shannon/shannon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/shannon.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.shannon/shannon.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.li/r.li.shape/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.shape/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.shape/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.shape/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "../r.li.daemon/daemon.h"
 

Modified: grass/trunk/raster/r.li/r.li.simpson/Makefile
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.simpson/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,9 +8,9 @@
 
 RLI_LIB = -l$(LIB_NAME)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(RLI_LIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(RLI_LIB)
 
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(LIB_NAME )
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(LIB_NAME )
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.li/r.li.simpson/simpson.c
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/simpson.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.li/r.li.simpson/simpson.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include <stdlib.h>

Modified: grass/trunk/raster/r.los/Makefile
===================================================================
--- grass/trunk/raster/r.los/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.los/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.los
 
-LIBES = $(SEGMENTLIB) $(GPROJLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(SEGMENTDEP) $(GPROJDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(SEGMENTLIB) $(GPROJLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(SEGMENTDEP) $(GPROJDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.los/delete.c
===================================================================
--- grass/trunk/raster/r.los/delete.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.los/delete.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -11,7 +11,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "point.h"
 

Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.los/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include <grass/segment.h>
 #include <grass/gprojects.h>

Modified: grass/trunk/raster/r.los/make_list.c
===================================================================
--- grass/trunk/raster/r.los/make_list.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.los/make_list.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 #include <math.h>
 #include <grass/segment.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "point.h"
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.los/make_point.c
===================================================================
--- grass/trunk/raster/r.los/make_point.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.los/make_point.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
 /****************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "point.h"
 
 /* #define NULL 0  should be (char *0), or just let the compiler fix it. */

Modified: grass/trunk/raster/r.los/mark_pts.c
===================================================================
--- grass/trunk/raster/r.los/mark_pts.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.los/mark_pts.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 #include <grass/segment.h>
 #include "point.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define		PT_TO_MARK_X		PT_TO_MARK->x
 #define		PT_TO_MARK_Y		PT_TO_MARK->y

Modified: grass/trunk/raster/r.los/pts_elim.c
===================================================================
--- grass/trunk/raster/r.los/pts_elim.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.los/pts_elim.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include <grass/glocale.h>
 #include "point.h"

Modified: grass/trunk/raster/r.los/radians.h
===================================================================
--- grass/trunk/raster/r.los/radians.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.los/radians.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -10,7 +10,7 @@
 /****************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define		PI		M_PI
 #define		PIBYFOUR 	M_PI_4

Modified: grass/trunk/raster/r.mapcalc/Makefile
===================================================================
--- grass/trunk/raster/r.mapcalc/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,8 +12,8 @@
 include $(MODULE_TOPDIR)/include/Make/Multi.make
 
 EXTRA_CFLAGS = $(READLINEINCPATH) $(PTHREADINCPATH)
-LIBES2 =           $(GISLIB) $(RASTRLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB) $(PTHREADLIBPATH) $(PTHREADLIB)
-LIBES3 = $(G3DLIB) $(GISLIB) $(RASTRLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB) $(PTHREADLIBPATH) $(PTHREADLIB)
+LIBES2 =           $(GISLIB) $(RASTERLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB) $(PTHREADLIBPATH) $(PTHREADLIB)
+LIBES3 = $(G3DLIB) $(GISLIB) $(RASTERLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB) $(PTHREADLIBPATH) $(PTHREADLIB)
 
 default: multi
 

Modified: grass/trunk/raster/r.mapcalc/column_shift.c
===================================================================
--- grass/trunk/raster/r.mapcalc/column_shift.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/column_shift.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "expression.h"
 #include "globals.h"
 

Modified: grass/trunk/raster/r.mapcalc/evaluate.c
===================================================================
--- grass/trunk/raster/r.mapcalc/evaluate.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/evaluate.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <unistd.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "mapcalc.h"

Modified: grass/trunk/raster/r.mapcalc/expression.c
===================================================================
--- grass/trunk/raster/r.mapcalc/expression.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/expression.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "mapcalc.h"

Modified: grass/trunk/raster/r.mapcalc/map.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/map.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -10,7 +10,7 @@
 #endif
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/btree.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.mapcalc/map3.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map3.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/map3.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/btree.h>
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.mapcalc/mapcalc.h
===================================================================
--- grass/trunk/raster/r.mapcalc/mapcalc.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/mapcalc.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "expression.h"
 

Modified: grass/trunk/raster/r.mapcalc/xabs.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xabs.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xabs.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xacos.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xacos.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xacos.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xadd.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xadd.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xadd.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xand.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xand.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xand.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xand2.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xand2.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xand2.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xasin.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xasin.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xasin.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xatan.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xatan.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xatan.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xbitand.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xbitand.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xbitand.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xbitnot.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xbitnot.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xbitnot.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xbitor.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xbitor.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xbitor.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xbitxor.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xbitxor.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xbitxor.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xcoor.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xcoor.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xcoor.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "globals2.h"
 #include "expression.h"

Modified: grass/trunk/raster/r.mapcalc/xcoor3.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xcoor3.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xcoor3.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include "globals.h"
 #include "globals3.h"

Modified: grass/trunk/raster/r.mapcalc/xcos.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xcos.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xcos.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xdiv.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xdiv.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xdiv.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xdouble.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xdouble.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xdouble.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xeq.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xeq.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xeq.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xeval.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xeval.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xeval.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xexp.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xexp.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xexp.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xfloat.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xfloat.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xfloat.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xge.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xge.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xge.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xgraph.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xgraph.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xgraph.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xgt.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xgt.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xgt.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xif.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xif.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xif.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xint.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xint.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xint.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xisnull.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xisnull.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xisnull.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xle.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xle.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xle.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xlog.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xlog.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xlog.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xlt.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xlt.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xlt.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xmax.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xmax.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xmax.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xmedian.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xmedian.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xmedian.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xmin.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xmin.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xmin.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xmod.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xmod.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xmod.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xmode.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xmode.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xmode.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xmul.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xmul.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xmul.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xne.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xne.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xne.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xneg.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xneg.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xneg.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xnot.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xnot.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xnot.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xnull.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xnull.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xnull.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xor.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xor.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xor.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xor2.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xor2.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xor2.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xpow.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xpow.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xpow.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xrand.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xrand.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xrand.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xres.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xres.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xres.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "globals2.h"
 #include "expression.h"

Modified: grass/trunk/raster/r.mapcalc/xres3.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xres3.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xres3.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include "globals.h"
 #include "globals3.h"

Modified: grass/trunk/raster/r.mapcalc/xround.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xround.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xround.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <limits.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xrowcol.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xrowcol.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xrowcol.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xshiftl.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xshiftl.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xshiftl.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xshiftr.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xshiftr.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xshiftr.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xshiftru.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xshiftru.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xshiftru.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xsin.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xsin.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xsin.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xsqrt.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xsqrt.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xsqrt.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xsub.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xsub.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xsub.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mapcalc/xtan.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xtan.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mapcalc/xtan.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "globals.h"
 #include "expression.h"
 #include "func_proto.h"

Modified: grass/trunk/raster/r.mfilter/Makefile
===================================================================
--- grass/trunk/raster/r.mfilter/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mfilter/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.mfilter
 
-LIBES = $(ROWIOLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(ROWIODEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(ROWIOLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(ROWIODEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.mfilter/filter.h
===================================================================
--- grass/trunk/raster/r.mfilter/filter.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mfilter/filter.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/rowio.h>
 typedef struct
 {

Modified: grass/trunk/raster/r.mfilter/getrow.c
===================================================================
--- grass/trunk/raster/r.mfilter/getrow.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mfilter/getrow.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "glob.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.mfilter/main.c
===================================================================
--- grass/trunk/raster/r.mfilter/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mfilter/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "filter.h"

Modified: grass/trunk/raster/r.mode/Makefile
===================================================================
--- grass/trunk/raster/r.mode/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mode/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.mode
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.mode/main.c
===================================================================
--- grass/trunk/raster/r.mode/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mode/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.mode/read_stats.c
===================================================================
--- grass/trunk/raster/r.mode/read_stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.mode/read_stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int read_stats(FILE * fd, long *cat1, long *cat2, double *value)

Modified: grass/trunk/raster/r.neighbors/bufs.c
===================================================================
--- grass/trunk/raster/r.neighbors/bufs.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.neighbors/bufs.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ncb.h"
 
 /*

Modified: grass/trunk/raster/r.neighbors/divr_cats.c
===================================================================
--- grass/trunk/raster/r.neighbors/divr_cats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.neighbors/divr_cats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ncb.h"
 int divr_cats(void)
 {

Modified: grass/trunk/raster/r.neighbors/gather.c
===================================================================
--- grass/trunk/raster/r.neighbors/gather.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.neighbors/gather.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ncb.h"
 
 /*

Modified: grass/trunk/raster/r.neighbors/intr_cats.c
===================================================================
--- grass/trunk/raster/r.neighbors/intr_cats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.neighbors/intr_cats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ncb.h"
 
 int intr_cats(void)

Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.neighbors/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/stats.h>
 #include "ncb.h"

Modified: grass/trunk/raster/r.neighbors/null_cats.c
===================================================================
--- grass/trunk/raster/r.neighbors/null_cats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.neighbors/null_cats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ncb.h"
 
 int null_cats(void)

Modified: grass/trunk/raster/r.neighbors/readcell.c
===================================================================
--- grass/trunk/raster/r.neighbors/readcell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.neighbors/readcell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ncb.h"
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.neighbors/readweights.c
===================================================================
--- grass/trunk/raster/r.neighbors/readweights.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.neighbors/readweights.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ncb.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.null/Makefile
===================================================================
--- grass/trunk/raster/r.null/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.null/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.null
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.null/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "mask.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.null/mask.c
===================================================================
--- grass/trunk/raster/r.null/mask.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.null/mask.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "mask.h"
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.out.arc/Makefile
===================================================================
--- grass/trunk/raster/r.out.arc/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.arc/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.arc
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.arc/main.c
===================================================================
--- grass/trunk/raster/r.out.arc/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.arc/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 /*

Modified: grass/trunk/raster/r.out.ascii/Makefile
===================================================================
--- grass/trunk/raster/r.out.ascii/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.ascii/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.ascii
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.ascii/formspecific.c
===================================================================
--- grass/trunk/raster/r.out.ascii/formspecific.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.ascii/formspecific.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /* write the GRASS ASCII heading */
 int writeGRASSheader(FILE * fp)

Modified: grass/trunk/raster/r.out.ascii/main.c
===================================================================
--- grass/trunk/raster/r.out.ascii/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.ascii/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <math.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "localproto.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.out.bin/Makefile
===================================================================
--- grass/trunk/raster/r.out.bin/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.bin/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.bin
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.bin/main.c
===================================================================
--- grass/trunk/raster/r.out.bin/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.bin/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "./gmt_grd.h"

Modified: grass/trunk/raster/r.out.gdal/Makefile
===================================================================
--- grass/trunk/raster/r.out.gdal/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.gdal/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM  = r.out.gdal
 
-LIBES= $(GPROJLIB) $(GISLIB) $(RASTRLIB) $(GDALLIBS) $(IMAGERYLIB) $(DBMIBASELIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP) $(IMAGERYDEP)
+LIBES= $(GPROJLIB) $(GISLIB) $(RASTERLIB) $(GDALLIBS) $(IMAGERYLIB) $(DBMIBASELIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP) $(IMAGERYDEP)
 EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.out.gdal/export_band.c
===================================================================
--- grass/trunk/raster/r.out.gdal/export_band.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.gdal/export_band.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 *****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "cpl_string.h"

Modified: grass/trunk/raster/r.out.gdal/main.c
===================================================================
--- grass/trunk/raster/r.out.gdal/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.gdal/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/imagery.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.out.gridatb/Makefile
===================================================================
--- grass/trunk/raster/r.out.gridatb/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.gridatb/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.gridatb
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.gridatb/local_proto.h
===================================================================
--- grass/trunk/raster/r.out.gridatb/local_proto.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.gridatb/local_proto.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 void check_ready(void);
 int adjcellhd(struct Cell_head *cellhd);

Modified: grass/trunk/raster/r.out.gridatb/main.c
===================================================================
--- grass/trunk/raster/r.out.gridatb/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.gridatb/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdio.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "local_proto.h"

Modified: grass/trunk/raster/r.out.mat/Makefile
===================================================================
--- grass/trunk/raster/r.out.mat/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.mat/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.mat
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.mat/main.c
===================================================================
--- grass/trunk/raster/r.out.mat/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.mat/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int main(int argc, char *argv[])

Modified: grass/trunk/raster/r.out.mpeg/Makefile
===================================================================
--- grass/trunk/raster/r.out.mpeg/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.mpeg/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.mpeg
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.mpeg/main.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.mpeg/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -40,7 +40,7 @@
 #include <unistd.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "rom_proto.h"

Modified: grass/trunk/raster/r.out.mpeg/write.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/write.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.mpeg/write.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <math.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "rom_proto.h"
 

Modified: grass/trunk/raster/r.out.png/Makefile
===================================================================
--- grass/trunk/raster/r.out.png/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.png/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,8 +3,8 @@
 PGM = r.out.png
 EXTRA_CFLAGS=$(PNGINC)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(PNGLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB) $(PNGLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.png/main.c
===================================================================
--- grass/trunk/raster/r.out.png/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.png/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -37,7 +37,7 @@
 #endif /* _MYINCLUDE_H */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define DEF_RED 255

Modified: grass/trunk/raster/r.out.pov/Makefile
===================================================================
--- grass/trunk/raster/r.out.pov/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.pov/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.pov
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.pov/main.c
===================================================================
--- grass/trunk/raster/r.out.pov/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.pov/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 void writeHeader(FILE * outf);

Modified: grass/trunk/raster/r.out.ppm/Makefile
===================================================================
--- grass/trunk/raster/r.out.ppm/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.ppm/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.ppm
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.ppm/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.ppm/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define DEF_RED 255

Modified: grass/trunk/raster/r.out.ppm3/Makefile
===================================================================
--- grass/trunk/raster/r.out.ppm3/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.ppm3/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.ppm3
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.ppm3/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm3/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.ppm3/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define DEF_RED 255

Modified: grass/trunk/raster/r.out.tiff/Makefile
===================================================================
--- grass/trunk/raster/r.out.tiff/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.tiff/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,8 +6,8 @@
 
 EXTRA_CFLAGS = $(TIFFINCPATH)
 
-LIBES = $(GISLIB) $(RASTRLIB) $(TIFFLIBPATH) $(TIFFLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB) $(TIFFLIBPATH) $(TIFFLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 ifneq ($(strip $(TIFFLIB)),)
 default: cmd

Modified: grass/trunk/raster/r.out.tiff/main.c
===================================================================
--- grass/trunk/raster/r.out.tiff/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.tiff/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -50,7 +50,7 @@
 #include <sys/types.h>
 #include <tiffio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "rasterfile.h"
 

Modified: grass/trunk/raster/r.out.vrml/Makefile
===================================================================
--- grass/trunk/raster/r.out.vrml/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.vrml/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.vrml
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.vrml/main.c
===================================================================
--- grass/trunk/raster/r.out.vrml/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.vrml/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "pv.h"
 

Modified: grass/trunk/raster/r.out.vrml/pv.h
===================================================================
--- grass/trunk/raster/r.out.vrml/pv.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.vrml/pv.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 /*  VRML VERSION - only 1.0 currently supported
    #define VRML2

Modified: grass/trunk/raster/r.out.vtk/Makefile
===================================================================
--- grass/trunk/raster/r.out.vtk/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.vtk/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.out.vtk
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.out.vtk/main.c
===================================================================
--- grass/trunk/raster/r.out.vtk/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.vtk/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/config.h>
 #include "writeascii.h"

Modified: grass/trunk/raster/r.out.vtk/parameters.c
===================================================================
--- grass/trunk/raster/r.out.vtk/parameters.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.vtk/parameters.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 *
 *****************************************************************************/
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/config.h>
 #include "parameters.h"

Modified: grass/trunk/raster/r.out.vtk/writeascii.c
===================================================================
--- grass/trunk/raster/r.out.vtk/writeascii.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.out.vtk/writeascii.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/config.h>
 #include "globaldefs.h"

Modified: grass/trunk/raster/r.param.scale/Makefile
===================================================================
--- grass/trunk/raster/r.param.scale/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.param.scale/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.param.scale
 
-LIBES = $(GISLIB) $(RASTRLIB) $(GMATHLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(GMATHDEP)
+LIBES = $(GISLIB) $(RASTERLIB) $(GMATHLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.param.scale/interface.c
===================================================================
--- grass/trunk/raster/r.param.scale/interface.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.param.scale/interface.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "param.h"
 

Modified: grass/trunk/raster/r.param.scale/nrutil.c
===================================================================
--- grass/trunk/raster/r.param.scale/nrutil.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.param.scale/nrutil.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "nrutil.h"
 

Modified: grass/trunk/raster/r.param.scale/open_files.c
===================================================================
--- grass/trunk/raster/r.param.scale/open_files.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.param.scale/open_files.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 /*****************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "param.h"
 

Modified: grass/trunk/raster/r.param.scale/param.h
===================================================================
--- grass/trunk/raster/r.param.scale/param.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.param.scale/param.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -9,7 +9,7 @@
 /************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 				/* programs. It sets up the necessary   */
 				/* prototypes for GRASS library calls.  */
 #include <math.h>

Modified: grass/trunk/raster/r.param.scale/process.c
===================================================================
--- grass/trunk/raster/r.param.scale/process.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.param.scale/process.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/gmath.h>
 #include "param.h"

Modified: grass/trunk/raster/r.param.scale/write_cats.c
===================================================================
--- grass/trunk/raster/r.param.scale/write_cats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.param.scale/write_cats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
 
 /*****************************************************************************/
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "param.h"
 

Modified: grass/trunk/raster/r.patch/Makefile
===================================================================
--- grass/trunk/raster/r.patch/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.patch/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.patch
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.patch/do_patch.c
===================================================================
--- grass/trunk/raster/r.patch/do_patch.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.patch/do_patch.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 /*
  * patch in non-zero data over zero data
  * keep track of the categories which are patched in

Modified: grass/trunk/raster/r.patch/main.c
===================================================================
--- grass/trunk/raster/r.patch/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.patch/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "nfiles.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.patch/support.c
===================================================================
--- grass/trunk/raster/r.patch/support.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.patch/support.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 /*
  * creates new category and color structures from the patching
  * files category and color files

Modified: grass/trunk/raster/r.profile/Makefile
===================================================================
--- grass/trunk/raster/r.profile/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.profile/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.profile
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.profile/local_proto.h
===================================================================
--- grass/trunk/raster/r.profile/local_proto.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.profile/local_proto.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 /* main.c */

Modified: grass/trunk/raster/r.profile/main.c
===================================================================
--- grass/trunk/raster/r.profile/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.profile/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -9,7 +9,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "local_proto.h"

Modified: grass/trunk/raster/r.profile/read_rast.c
===================================================================
--- grass/trunk/raster/r.profile/read_rast.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.profile/read_rast.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.proj/Makefile
===================================================================
--- grass/trunk/raster/r.proj/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.proj
 
-LIBES =  $(GPROJLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
+LIBES =  $(GPROJLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.proj/bilinear.c
===================================================================
--- grass/trunk/raster/r.proj/bilinear.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/bilinear.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "r.proj.h"
 
 void p_bilinear(struct cache *ibuffer,	/* input buffer                  */

Modified: grass/trunk/raster/r.proj/bilinear_f.c
===================================================================
--- grass/trunk/raster/r.proj/bilinear_f.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/bilinear_f.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -9,7 +9,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "r.proj.h"
 
 void p_bilinear_f(struct cache *ibuffer,	/* input buffer                  */

Modified: grass/trunk/raster/r.proj/bordwalk.c
===================================================================
--- grass/trunk/raster/r.proj/bordwalk.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/bordwalk.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -28,7 +28,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.proj/cubic.c
===================================================================
--- grass/trunk/raster/r.proj/cubic.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/cubic.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <math.h>
 #include "r.proj.h"
 

Modified: grass/trunk/raster/r.proj/cubic_f.c
===================================================================
--- grass/trunk/raster/r.proj/cubic_f.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/cubic_f.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -10,7 +10,7 @@
  */
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "r.proj.h"
 
 void p_cubic_f(struct cache *ibuffer,	/* input buffer                  */

Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -58,7 +58,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 #include "r.proj.h"

Modified: grass/trunk/raster/r.proj/nearest.c
===================================================================
--- grass/trunk/raster/r.proj/nearest.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/nearest.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "r.proj.h"
 
 void p_nearest(struct cache *ibuffer,	/* input buffer                  */

Modified: grass/trunk/raster/r.proj/readcell.c
===================================================================
--- grass/trunk/raster/r.proj/readcell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.proj/readcell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "r.proj.h"
 

Modified: grass/trunk/raster/r.quant/Makefile
===================================================================
--- grass/trunk/raster/r.quant/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.quant/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.quant
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.quant/global.h
===================================================================
--- grass/trunk/raster/r.quant/global.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.quant/global.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 extern struct Quant quant_struct;
 extern CELL old_min, old_max;

Modified: grass/trunk/raster/r.quantile/Makefile
===================================================================
--- grass/trunk/raster/r.quantile/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.quantile/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.quantile
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.quantile/main.c
===================================================================
--- grass/trunk/raster/r.quantile/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.quantile/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct bin

Modified: grass/trunk/raster/r.random/Makefile
===================================================================
--- grass/trunk/raster/r.random/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.random
 
-LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTERLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTERDEP) $(SEGMENTDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/raster/r.random/count.c
===================================================================
--- grass/trunk/raster/r.random/count.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random/count.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <math.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.random/main.c
===================================================================
--- grass/trunk/raster/r.random/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.random/random.c
===================================================================
--- grass/trunk/raster/r.random/random.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random/random.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.random/support.c
===================================================================
--- grass/trunk/raster/r.random/support.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random/support.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.random.cells/Makefile
===================================================================
--- grass/trunk/raster/r.random.cells/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.cells/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.random.cells
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.random.cells/flag.c
===================================================================
--- grass/trunk/raster/r.random.cells/flag.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.cells/flag.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "flag.h"
 

Modified: grass/trunk/raster/r.random.cells/indep.c
===================================================================
--- grass/trunk/raster/r.random.cells/indep.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.cells/indep.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 /* indep.c                                                              */
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "ransurf.h"

Modified: grass/trunk/raster/r.random.cells/init.c
===================================================================
--- grass/trunk/raster/r.random.cells/init.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.cells/init.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "ransurf.h"

Modified: grass/trunk/raster/r.random.cells/main.c
===================================================================
--- grass/trunk/raster/r.random.cells/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.cells/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "ransurf.h"

Modified: grass/trunk/raster/r.random.cells/random.c
===================================================================
--- grass/trunk/raster/r.random.cells/random.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.cells/random.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 /* random.c                                                             */
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "ransurf.h"

Modified: grass/trunk/raster/r.random.cells/ransurf.h
===================================================================
--- grass/trunk/raster/r.random.cells/ransurf.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.cells/ransurf.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "flag.h"
 
 #define ODD(a)	((a) & 1)

Modified: grass/trunk/raster/r.random.surface/Makefile
===================================================================
--- grass/trunk/raster/r.random.surface/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.surface/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.random.surface
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.random.surface/calcsurf.c
===================================================================
--- grass/trunk/raster/r.random.surface/calcsurf.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.surface/calcsurf.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 /* calcsurf.c                                                           */
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ransurf.h"
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.random.surface/gennorm.c
===================================================================
--- grass/trunk/raster/r.random.surface/gennorm.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.surface/gennorm.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 /* gennorm.c                                                    */
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ransurf.h"
 
 void GenNorm(void)

Modified: grass/trunk/raster/r.random.surface/init.c
===================================================================
--- grass/trunk/raster/r.random.surface/init.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.surface/init.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "ransurf.h"

Modified: grass/trunk/raster/r.random.surface/main.c
===================================================================
--- grass/trunk/raster/r.random.surface/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.surface/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "ransurf.h"

Modified: grass/trunk/raster/r.random.surface/random.c
===================================================================
--- grass/trunk/raster/r.random.surface/random.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.surface/random.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 /* random.c                                                             */
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ransurf.h"
 
 #define M1 259200

Modified: grass/trunk/raster/r.random.surface/ransurf.h
===================================================================
--- grass/trunk/raster/r.random.surface/ransurf.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.surface/ransurf.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define ODD(a)	((a) & 1)
 

Modified: grass/trunk/raster/r.random.surface/save.c
===================================================================
--- grass/trunk/raster/r.random.surface/save.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.random.surface/save.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 /* save.c                                                               */
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "ransurf.h"
 

Modified: grass/trunk/raster/r.reclass/Makefile
===================================================================
--- grass/trunk/raster/r.reclass/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.reclass/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.reclass
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.reclass/input.c
===================================================================
--- grass/trunk/raster/r.reclass/input.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.reclass/input.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int input(FILE * fp, int tty, char *buf)
 {

Modified: grass/trunk/raster/r.reclass/main.c
===================================================================
--- grass/trunk/raster/r.reclass/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.reclass/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "rule.h"
 

Modified: grass/trunk/raster/r.reclass/parse.c
===================================================================
--- grass/trunk/raster/r.reclass/parse.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.reclass/parse.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "rule.h"
 

Modified: grass/trunk/raster/r.reclass/range.c
===================================================================
--- grass/trunk/raster/r.reclass/range.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.reclass/range.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int new_range(char *name, struct Reclass *reclass)
 {

Modified: grass/trunk/raster/r.reclass/reclass.c
===================================================================
--- grass/trunk/raster/r.reclass/reclass.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.reclass/reclass.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "rule.h"
 

Modified: grass/trunk/raster/r.reclass/rule.h
===================================================================
--- grass/trunk/raster/r.reclass/rule.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.reclass/rule.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define RULE struct _rule_
 RULE {

Modified: grass/trunk/raster/r.reclass/stats.c
===================================================================
--- grass/trunk/raster/r.reclass/stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.reclass/stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "rule.h"
 
 #define LIST struct Histogram_list

Modified: grass/trunk/raster/r.recode/Makefile
===================================================================
--- grass/trunk/raster/r.recode/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.recode/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.recode
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.recode/global.h
===================================================================
--- grass/trunk/raster/r.recode/global.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.recode/global.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 extern RASTER_MAP_TYPE in_type;
 extern RASTER_MAP_TYPE out_type;

Modified: grass/trunk/raster/r.recode/main.c
===================================================================
--- grass/trunk/raster/r.recode/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.recode/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 

Modified: grass/trunk/raster/r.region/Makefile
===================================================================
--- grass/trunk/raster/r.region/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.region/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.region
 
-LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/raster/r.region/main.c
===================================================================
--- grass/trunk/raster/r.region/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.region/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.report/Makefile
===================================================================
--- grass/trunk/raster/r.report/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.report/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.report
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.report/global.h
===================================================================
--- grass/trunk/raster/r.report/global.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.report/global.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,7 +6,7 @@
 #endif
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 extern struct Cell_head window;

Modified: grass/trunk/raster/r.report/maskinfo.c
===================================================================
--- grass/trunk/raster/r.report/maskinfo.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.report/maskinfo.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 static char *append(char *, char *);
 static int do_text(char *, long, long);

Modified: grass/trunk/raster/r.resamp.interp/Makefile
===================================================================
--- grass/trunk/raster/r.resamp.interp/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.resamp.interp/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.resamp.interp
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.resamp.interp/main.c
===================================================================
--- grass/trunk/raster/r.resamp.interp/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.resamp.interp/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static int neighbors;

Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.resamp.rst/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -37,7 +37,7 @@
 
 #include <grass/dbmi.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/linkm.h>
 #include <grass/bitmap.h>
 #include "surf.h"

Modified: grass/trunk/raster/r.resamp.stats/main.c
===================================================================
--- grass/trunk/raster/r.resamp.stats/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.resamp.stats/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/stats.h>
 

Modified: grass/trunk/raster/r.resample/Makefile
===================================================================
--- grass/trunk/raster/r.resample/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.resample/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.resample
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.resample/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int main(int argc, char *argv[])

Modified: grass/trunk/raster/r.rescale/Makefile
===================================================================
--- grass/trunk/raster/r.rescale/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.rescale/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.rescale
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.rescale/get_range.c
===================================================================
--- grass/trunk/raster/r.rescale/get_range.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.rescale/get_range.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.rescale/main.c
===================================================================
--- grass/trunk/raster/r.rescale/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.rescale/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.rescale.eq/Makefile
===================================================================
--- grass/trunk/raster/r.rescale.eq/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.rescale.eq/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.rescale.eq
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.rescale.eq/get_range.c
===================================================================
--- grass/trunk/raster/r.rescale.eq/get_range.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.rescale.eq/get_range.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int get_range(struct Cell_stats *statf, CELL * min, CELL * max, int zero)
 {

Modified: grass/trunk/raster/r.rescale.eq/get_stats.c
===================================================================
--- grass/trunk/raster/r.rescale.eq/get_stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.rescale.eq/get_stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.rescale.eq/main.c
===================================================================
--- grass/trunk/raster/r.rescale.eq/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.rescale.eq/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.ros/Makefile
===================================================================
--- grass/trunk/raster/r.ros/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.ros/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.ros
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.ros/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -68,7 +68,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.ros/spot_dist.c
===================================================================
--- grass/trunk/raster/r.ros/spot_dist.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.ros/spot_dist.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -33,7 +33,7 @@
  ******************************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <math.h>
 
 

Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.series/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/stats.h>
 

Modified: grass/trunk/raster/r.slope.aspect/Makefile
===================================================================
--- grass/trunk/raster/r.slope.aspect/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.slope.aspect/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.slope.aspect
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.slope.aspect/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.slope.aspect/opennew.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/opennew.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.slope.aspect/opennew.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.spread/Makefile
===================================================================
--- grass/trunk/raster/r.spread/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -6,10 +6,10 @@
 
 MOD_OBJS := $(filter-out display.o,$(AUTO_OBJS))
 
-# LIBES = $(DISPLAYLIB) $(GISLIB) $(RASTRLIB)
-# DEPENDENCIES = $(DISPLAYDEP) $(GISDEP) $(RASTRDEP)
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+# LIBES = $(DISPLAYLIB) $(GISLIB) $(RASTERLIB)
+# DEPENDENCIES = $(DISPLAYDEP) $(GISDEP) $(RASTERDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.spread/collect_ori.c
===================================================================
--- grass/trunk/raster/r.spread/collect_ori.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/collect_ori.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "cmd_line.h"
 #include "costHa.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.spread/display.c
===================================================================
--- grass/trunk/raster/r.spread/display.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/display.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <time.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/display_raster.h>
 #include "cmd_line.h"

Modified: grass/trunk/raster/r.spread/insert2Ha.c
===================================================================
--- grass/trunk/raster/r.spread/insert2Ha.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/insert2Ha.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 /***************************************************************/
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "cell_ptrHa.h"
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.spread/main.c
===================================================================
--- grass/trunk/raster/r.spread/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "cmd_line.h"
 #include "costHa.h"

Modified: grass/trunk/raster/r.spread/ram2out.c
===================================================================
--- grass/trunk/raster/r.spread/ram2out.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/ram2out.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "cmd_line.h"
 #include "costHa.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.spread/replaceHa.c
===================================================================
--- grass/trunk/raster/r.spread/replaceHa.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/replaceHa.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "costHa.h"
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.spread/select_linksB.c
===================================================================
--- grass/trunk/raster/r.spread/select_linksB.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/select_linksB.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "costHa.h"
 #include "cell_ptrHa.h"
 #include "local_proto.h"

Modified: grass/trunk/raster/r.spread/spot.c
===================================================================
--- grass/trunk/raster/r.spread/spot.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/spot.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -44,7 +44,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "cmd_line.h"
 #include "costHa.h"
 #include "cell_ptrHa.h"

Modified: grass/trunk/raster/r.spread/spread.c
===================================================================
--- grass/trunk/raster/r.spread/spread.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spread/spread.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "cmd_line.h"
 #include "costHa.h"
 #include "cell_ptrHa.h"

Modified: grass/trunk/raster/r.spreadpath/Makefile
===================================================================
--- grass/trunk/raster/r.spreadpath/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spreadpath/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.spreadpath
 
-LIBES = $(SEGMENTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(SEGMENTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(SEGMENTDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.spreadpath/insert.c
===================================================================
--- grass/trunk/raster/r.spreadpath/insert.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spreadpath/insert.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "point.h"
 

Modified: grass/trunk/raster/r.spreadpath/main.c
===================================================================
--- grass/trunk/raster/r.spreadpath/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.spreadpath/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <grass/segment.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "stash.h"
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.statistics/Makefile
===================================================================
--- grass/trunk/raster/r.statistics/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.statistics
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.statistics/main.c
===================================================================
--- grass/trunk/raster/r.statistics/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "method.h"

Modified: grass/trunk/raster/r.statistics/o_adev.c
===================================================================
--- grass/trunk/raster/r.statistics/o_adev.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_adev.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "method.h"
 

Modified: grass/trunk/raster/r.statistics/o_average.c
===================================================================
--- grass/trunk/raster/r.statistics/o_average.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_average.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "method.h"
 

Modified: grass/trunk/raster/r.statistics/o_distrib.c
===================================================================
--- grass/trunk/raster/r.statistics/o_distrib.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_distrib.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "method.h"
 

Modified: grass/trunk/raster/r.statistics/o_divr.c
===================================================================
--- grass/trunk/raster/r.statistics/o_divr.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_divr.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "method.h"
 
 int

Modified: grass/trunk/raster/r.statistics/o_kurt.c
===================================================================
--- grass/trunk/raster/r.statistics/o_kurt.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_kurt.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "method.h"
 

Modified: grass/trunk/raster/r.statistics/o_max.c
===================================================================
--- grass/trunk/raster/r.statistics/o_max.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_max.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "method.h"
 
 int

Modified: grass/trunk/raster/r.statistics/o_median.c
===================================================================
--- grass/trunk/raster/r.statistics/o_median.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_median.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "method.h"
 
 /* function prototypes */

Modified: grass/trunk/raster/r.statistics/o_min.c
===================================================================
--- grass/trunk/raster/r.statistics/o_min.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_min.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "method.h"
 
 int

Modified: grass/trunk/raster/r.statistics/o_mode.c
===================================================================
--- grass/trunk/raster/r.statistics/o_mode.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_mode.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "method.h"
 
 int

Modified: grass/trunk/raster/r.statistics/o_sdev.c
===================================================================
--- grass/trunk/raster/r.statistics/o_sdev.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_sdev.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "method.h"
 

Modified: grass/trunk/raster/r.statistics/o_skew.c
===================================================================
--- grass/trunk/raster/r.statistics/o_skew.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_skew.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "method.h"
 

Modified: grass/trunk/raster/r.statistics/o_sum.c
===================================================================
--- grass/trunk/raster/r.statistics/o_sum.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_sum.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "method.h"
 

Modified: grass/trunk/raster/r.statistics/o_var.c
===================================================================
--- grass/trunk/raster/r.statistics/o_var.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/o_var.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "method.h"
 

Modified: grass/trunk/raster/r.statistics/read_stats.c
===================================================================
--- grass/trunk/raster/r.statistics/read_stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics/read_stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.statistics2/Makefile
===================================================================
--- grass/trunk/raster/r.statistics2/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics2/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.statistics2
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.statistics2/main.c
===================================================================
--- grass/trunk/raster/r.statistics2/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics2/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/spawn.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.statistics3/Makefile
===================================================================
--- grass/trunk/raster/r.statistics3/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics3/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.statistics3
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.statistics3/main.c
===================================================================
--- grass/trunk/raster/r.statistics3/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.statistics3/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/spawn.h>
 

Modified: grass/trunk/raster/r.stats/Makefile
===================================================================
--- grass/trunk/raster/r.stats/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.stats/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.stats
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.stats/global.h
===================================================================
--- grass/trunk/raster/r.stats/global.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.stats/global.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 extern char *no_data_str;
 extern int nfiles;

Modified: grass/trunk/raster/r.stats/raw_stats.c
===================================================================
--- grass/trunk/raster/r.stats/raw_stats.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.stats/raw_stats.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "global.h"
 
 int raw_stats(int fd[], int with_coordinates, int with_xy, int with_labels)

Modified: grass/trunk/raster/r.sun2/Makefile
===================================================================
--- grass/trunk/raster/r.sun2/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.sun2/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.sun
 
-LIBES =  $(GPROJLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
+LIBES =  $(GPROJLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.sun2/main.c
===================================================================
--- grass/trunk/raster/r.sun2/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.sun2/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 #include "sunradstruct.h"

Modified: grass/trunk/raster/r.sun2/rsunlib.c
===================================================================
--- grass/trunk/raster/r.sun2/rsunlib.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.sun2/rsunlib.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gprojects.h>
 #include <grass/glocale.h>
 #include "sunradstruct.h"

Modified: grass/trunk/raster/r.sunmask/Makefile
===================================================================
--- grass/trunk/raster/r.sunmask/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.sunmask/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.sunmask
 
-LIBES =  $(GPROJLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTRDEP)
+LIBES =  $(GPROJLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GPROJDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.sunmask/g_solposition.c
===================================================================
--- grass/trunk/raster/r.sunmask/g_solposition.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.sunmask/g_solposition.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gprojects.h>
 #include "solpos00.h"
 

Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.sunmask/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -45,7 +45,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "solpos00.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.sunmask/solpos00.c
===================================================================
--- grass/trunk/raster/r.sunmask/solpos00.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.sunmask/solpos00.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -96,7 +96,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "solpos00.h"
 

Modified: grass/trunk/raster/r.support/Makefile
===================================================================
--- grass/trunk/raster/r.support/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.support/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.support
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.support/check.c
===================================================================
--- grass/trunk/raster/r.support/check.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.support/check.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.support/histo.c
===================================================================
--- grass/trunk/raster/r.support/histo.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.support/histo.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.support/main.c
===================================================================
--- grass/trunk/raster/r.support/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.support/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.support.stats/Makefile
===================================================================
--- grass/trunk/raster/r.support.stats/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.support.stats/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.support.stats
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.support.stats/check.c
===================================================================
--- grass/trunk/raster/r.support.stats/check.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.support.stats/check.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.support.stats/histo.c
===================================================================
--- grass/trunk/raster/r.support.stats/histo.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.support.stats/histo.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 
 /* 

Modified: grass/trunk/raster/r.support.stats/main.c
===================================================================
--- grass/trunk/raster/r.support.stats/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.support.stats/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.surf.area/Makefile
===================================================================
--- grass/trunk/raster/r.surf.area/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.area/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.surf.area
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.surf.area/main.c
===================================================================
--- grass/trunk/raster/r.surf.area/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.area/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -56,7 +56,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.surf.contour/Makefile
===================================================================
--- grass/trunk/raster/r.surf.contour/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.contour/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.surf.contour
 
-LIBES = $(SEGMENTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(SEGMENTDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(SEGMENTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(SEGMENTDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.surf.contour/contour.h
===================================================================
--- grass/trunk/raster/r.surf.contour/contour.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.contour/contour.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "flag.h"
 
 #define NODE		struct _n_o_d_e_

Modified: grass/trunk/raster/r.surf.contour/flag_create.c
===================================================================
--- grass/trunk/raster/r.surf.contour/flag_create.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.contour/flag_create.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "flag.h"
 
 FLAG *flag_create(int nrows, int ncols)

Modified: grass/trunk/raster/r.surf.contour/flag_destroy.c
===================================================================
--- grass/trunk/raster/r.surf.contour/flag_destroy.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.contour/flag_destroy.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "flag.h"
 
 int flag_destroy(FLAG * flags)

Modified: grass/trunk/raster/r.surf.contour/main.c
===================================================================
--- grass/trunk/raster/r.surf.contour/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.contour/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 #include "contour.h"
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int nrows;

Modified: grass/trunk/raster/r.surf.fractal/Makefile
===================================================================
--- grass/trunk/raster/r.surf.fractal/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.fractal/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.surf.fractal
 
-LIBES = $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(FFTWLIB)
-DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(FFTWLIB)
+DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(FFTWINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/trunk/raster/r.surf.fractal/frac.h
===================================================================
--- grass/trunk/raster/r.surf.fractal/frac.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.fractal/frac.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 				/* programs. It sets up the necessary   */
 				/* prototypes for GRASS library calls.  */
 

Modified: grass/trunk/raster/r.surf.fractal/spec_syn.c
===================================================================
--- grass/trunk/raster/r.surf.fractal/spec_syn.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.fractal/spec_syn.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "frac.h"
 #include <grass/gmath.h>

Modified: grass/trunk/raster/r.surf.gauss/Makefile
===================================================================
--- grass/trunk/raster/r.surf.gauss/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.gauss/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.surf.gauss
 
-LIBES = $(GMATHLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.surf.gauss/gaussurf.c
===================================================================
--- grass/trunk/raster/r.surf.gauss/gaussurf.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.gauss/gaussurf.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 
 

Modified: grass/trunk/raster/r.surf.gauss/main.c
===================================================================
--- grass/trunk/raster/r.surf.gauss/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.gauss/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 #include <grass/glocale.h>
 #include "local_proto.h"

Modified: grass/trunk/raster/r.surf.idw/Makefile
===================================================================
--- grass/trunk/raster/r.surf.idw/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.idw/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.surf.idw
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.surf.idw/dist.c
===================================================================
--- grass/trunk/raster/r.surf.idw/dist.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.idw/dist.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "pi.h"
 
 /* distance from point to point along a geodesic 

Modified: grass/trunk/raster/r.surf.idw/ll.c
===================================================================
--- grass/trunk/raster/r.surf.idw/ll.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.idw/ll.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "main.h"
 
 /************************************************************************/

Modified: grass/trunk/raster/r.surf.idw/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.idw/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "main.h"
 

Modified: grass/trunk/raster/r.surf.idw/pi.h
===================================================================
--- grass/trunk/raster/r.surf.idw/pi.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.idw/pi.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define PI	M_PI
 #define Radians(x) ((x) * PI/180.0)

Modified: grass/trunk/raster/r.surf.idw2/Makefile
===================================================================
--- grass/trunk/raster/r.surf.idw2/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.idw2/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.surf.idw2
 
-LIBES = $(GISLIB) $(RASTRLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(DATETIMEDEP)
+LIBES = $(GISLIB) $(RASTERLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(DATETIMEDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.surf.idw2/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.idw2/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.surf.idw2/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/read_cell.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.idw2/read_cell.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.surf.random/Makefile
===================================================================
--- grass/trunk/raster/r.surf.random/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.random/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.surf.random
 
-LIBES = $(GMATHLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(GMATHLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GMATHDEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.surf.random/main.c
===================================================================
--- grass/trunk/raster/r.surf.random/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.random/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.surf.random/randsurf.c
===================================================================
--- grass/trunk/raster/r.surf.random/randsurf.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.surf.random/randsurf.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/gmath.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.terraflow/Makefile
===================================================================
--- grass/trunk/raster/r.terraflow/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.terraflow/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.terraflow
 
-LIBES = $(GISLIB) $(RASTRLIB) $(IOSTREAMLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(IOSTREAMDEP)
+LIBES = $(GISLIB) $(RASTERLIB) $(IOSTREAMLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(IOSTREAMDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.terraflow/common.h
===================================================================
--- grass/trunk/raster/r.terraflow/common.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.terraflow/common.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -31,7 +31,7 @@
 #include "types.h" /* for dimension_type */
 extern "C" {
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 }
 
 

Modified: grass/trunk/raster/r.terraflow/main.cc
===================================================================
--- grass/trunk/raster/r.terraflow/main.cc	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.terraflow/main.cc	2009-06-22 01:49:13 UTC (rev 38014)
@@ -31,7 +31,7 @@
 
 extern "C" {
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 }
 

Modified: grass/trunk/raster/r.texture/Makefile
===================================================================
--- grass/trunk/raster/r.texture/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.texture/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.texture
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.texture/h_measure.c
===================================================================
--- grass/trunk/raster/r.texture/h_measure.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.texture/h_measure.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define RADIX 2.0

Modified: grass/trunk/raster/r.texture/main.c
===================================================================
--- grass/trunk/raster/r.texture/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.texture/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "h_measure.h"
 

Modified: grass/trunk/raster/r.thin/Makefile
===================================================================
--- grass/trunk/raster/r.thin/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.thin/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.thin
 
-LIBES = $(ROWIOLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(ROWIODEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(ROWIOLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(ROWIODEP) $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.thin/io.c
===================================================================
--- grass/trunk/raster/r.thin/io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.thin/io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -34,7 +34,7 @@
 #include <fcntl.h>
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/rowio.h>
 

Modified: grass/trunk/raster/r.thin/main.c
===================================================================
--- grass/trunk/raster/r.thin/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.thin/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.thin/thin_lines.c
===================================================================
--- grass/trunk/raster/r.thin/thin_lines.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.thin/thin_lines.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.rast3/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 #include <grass/config.h>

Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.rast3elev/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 #include <grass/config.h>

Modified: grass/trunk/raster/r.to.vect/Makefile
===================================================================
--- grass/trunk/raster/r.to.vect/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.vect/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,8 +4,8 @@
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/raster/r.to.vect/areas.c
===================================================================
--- grass/trunk/raster/r.to.vect/areas.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.vect/areas.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -68,7 +68,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include "global.h"

Modified: grass/trunk/raster/r.to.vect/areas_io.c
===================================================================
--- grass/trunk/raster/r.to.vect/areas_io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.vect/areas_io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>

Modified: grass/trunk/raster/r.to.vect/lines.c
===================================================================
--- grass/trunk/raster/r.to.vect/lines.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.vect/lines.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include "global.h"

Modified: grass/trunk/raster/r.to.vect/lines_io.c
===================================================================
--- grass/trunk/raster/r.to.vect/lines_io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.vect/lines_io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -33,7 +33,7 @@
 #endif
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>

Modified: grass/trunk/raster/r.to.vect/main.c
===================================================================
--- grass/trunk/raster/r.to.vect/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.vect/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.to.vect/points.c
===================================================================
--- grass/trunk/raster/r.to.vect/points.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.vect/points.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>

Modified: grass/trunk/raster/r.to.vect/util.c
===================================================================
--- grass/trunk/raster/r.to.vect/util.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.to.vect/util.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 #endif
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/raster/r.topidx/Makefile
===================================================================
--- grass/trunk/raster/r.topidx/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topidx/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.topidx
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.topidx/file_io.c
===================================================================
--- grass/trunk/raster/r.topidx/file_io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topidx/file_io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 

Modified: grass/trunk/raster/r.topidx/global.h
===================================================================
--- grass/trunk/raster/r.topidx/global.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topidx/global.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define	cv(i,j)		cell[i][j]
 #define	av(i,j)		a[i][j]

Modified: grass/trunk/raster/r.topidx/main.c
===================================================================
--- grass/trunk/raster/r.topidx/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topidx/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #define _MAIN_C_
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 

Modified: grass/trunk/raster/r.topidx/topidx.c
===================================================================
--- grass/trunk/raster/r.topidx/topidx.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topidx/topidx.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "global.h"
 

Modified: grass/trunk/raster/r.topmodel/Makefile
===================================================================
--- grass/trunk/raster/r.topmodel/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topmodel/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.topmodel
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.topmodel/file_io.c
===================================================================
--- grass/trunk/raster/r.topmodel/file_io.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topmodel/file_io.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "global.h"
 
 

Modified: grass/trunk/raster/r.topmodel/global.h
===================================================================
--- grass/trunk/raster/r.topmodel/global.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topmodel/global.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
 #include <math.h>
 #include <time.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 
 #define	FILL		0x1

Modified: grass/trunk/raster/r.topmodel/topmodel.c
===================================================================
--- grass/trunk/raster/r.topmodel/topmodel.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.topmodel/topmodel.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "global.h"
 
 

Modified: grass/trunk/raster/r.univar/globals.h
===================================================================
--- grass/trunk/raster/r.univar/globals.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.univar/globals.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.uslek/Makefile
===================================================================
--- grass/trunk/raster/r.uslek/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.uslek/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.uslek
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.uslek/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #define POLYGON_DIMENSION 20

Modified: grass/trunk/raster/r.usler/Makefile
===================================================================
--- grass/trunk/raster/r.usler/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.usler/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.usler
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.usler/main.c
===================================================================
--- grass/trunk/raster/r.usler/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.usler/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 double elswaify_1985(double annual_pmm);

Modified: grass/trunk/raster/r.volume/Makefile
===================================================================
--- grass/trunk/raster/r.volume/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.volume/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,8 +4,8 @@
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(SITESDEP) $(VECTDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(SITESDEP) $(VECTDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/raster/r.volume/centroids.c
===================================================================
--- grass/trunk/raster/r.volume/centroids.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.volume/centroids.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
  * col = sigma(col)/n.
  */
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 int centroids(int fd,		/* File descriptor of map layer to process */
 	      /* This file is assumed to be opened before calling */

Modified: grass/trunk/raster/r.volume/main.c
===================================================================
--- grass/trunk/raster/r.volume/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.volume/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/site.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster/r.walk/Makefile
===================================================================
--- grass/trunk/raster/r.walk/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.walk/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.walk
 
-LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTRLIB) $(SEGMENTLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP) $(SEGMENTDEP) $(DATETIMEDEP)
+LIBES = $(SITESLIB) $(VECTLIB) $(GISLIB) $(RASTERLIB) $(SEGMENTLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTERDEP) $(SEGMENTDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/raster/r.walk/btree.c
===================================================================
--- grass/trunk/raster/r.walk/btree.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.walk/btree.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -15,7 +15,7 @@
 
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "local_proto.h"
 #include "memory.h"
 #include <stdlib.h>

Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.walk/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -100,7 +100,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/site.h>
 #include <grass/segment.h>
 #include "cost.h"

Modified: grass/trunk/raster/r.walk/memory.c
===================================================================
--- grass/trunk/raster/r.walk/memory.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.walk/memory.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <errno.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "memory.h"
 
 #define NUM_IN_BLOCK	1024*8

Modified: grass/trunk/raster/r.water.outlet/Makefile
===================================================================
--- grass/trunk/raster/r.water.outlet/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.water.outlet/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.water.outlet
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.water.outlet/basin.h
===================================================================
--- grass/trunk/raster/r.water.outlet/basin.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.water.outlet/basin.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ramseg.h"
 #include "flag.h"
 

Modified: grass/trunk/raster/r.water.outlet/flag_create.c
===================================================================
--- grass/trunk/raster/r.water.outlet/flag_create.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.water.outlet/flag_create.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "flag.h"
 
 FLAG *flag_create(int nrows, int ncols)

Modified: grass/trunk/raster/r.water.outlet/flag_destroy.c
===================================================================
--- grass/trunk/raster/r.water.outlet/flag_destroy.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.water.outlet/flag_destroy.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "flag.h"
 
 int flag_destroy(FLAG * flags)

Modified: grass/trunk/raster/r.water.outlet/main.c
===================================================================
--- grass/trunk/raster/r.water.outlet/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.water.outlet/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 #include "basin.h"

Modified: grass/trunk/raster/r.watershed/front/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/front/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/front/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.watershed
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.watershed/front/main.c
===================================================================
--- grass/trunk/raster/r.watershed/front/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/front/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int write_hist(char *, char *, char *, int, int);

Modified: grass/trunk/raster/r.watershed/ram/Gwater.h
===================================================================
--- grass/trunk/raster/r.watershed/ram/Gwater.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/Gwater.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 /* last modified 03/26/91                       */
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "ramseg.h"
 #include "flag.h"
 

Modified: grass/trunk/raster/r.watershed/ram/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/ram/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.watershed.ram
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Etc.make
 include $(MODULE_TOPDIR)/include/Make/NoHtml.make

Modified: grass/trunk/raster/r.watershed/ram/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/close_maps.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include "Gwater.h"
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.watershed/ram/do_astar.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/do_astar.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/do_astar.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include "Gwater.h"
 #include "do_astar.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int do_astar(void)

Modified: grass/trunk/raster/r.watershed/ram/do_cum.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/do_cum.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/do_cum.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include "Gwater.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.watershed/ram/flag_create.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/flag_create.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/flag_create.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "flag.h"
 
 FLAG *flag_create(int nrows, int ncols)

Modified: grass/trunk/raster/r.watershed/ram/flag_destroy.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/flag_destroy.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/flag_destroy.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "flag.h"
 
 int flag_destroy(FLAG * flags)

Modified: grass/trunk/raster/r.watershed/ram/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/init_vars.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/init_vars.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <string.h>
 #include "Gwater.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int ele_round(double);

Modified: grass/trunk/raster/r.watershed/ram/main.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include "Gwater.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct Cell_head window;

Modified: grass/trunk/raster/r.watershed/ram/sg_factor.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/sg_factor.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/sg_factor.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include "Gwater.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 CELL *ril_buf;

Modified: grass/trunk/raster/r.watershed/ram/usage.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/usage.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/ram/usage.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.watershed/seg/Gwater.h
===================================================================
--- grass/trunk/raster/r.watershed/seg/Gwater.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/Gwater.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 /* last modified 03/26/91                       */
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "cseg.h"
 
 #define AR_SIZE			16

Modified: grass/trunk/raster/r.watershed/seg/Makefile
===================================================================
--- grass/trunk/raster/r.watershed/seg/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.watershed.seg
 
-LIBES = $(GISLIB) $(RASTRLIB) $(SEGMENTLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP) $(SEGMENTDEP)
+LIBES = $(GISLIB) $(RASTERLIB) $(SEGMENTLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(SEGMENTDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Etc.make
 include $(MODULE_TOPDIR)/include/Make/NoHtml.make

Modified: grass/trunk/raster/r.watershed/seg/bseg_close.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_close.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/bseg_close.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/bseg_get.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_get.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/bseg_get.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/bseg_open.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_open.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/bseg_open.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <grass/segment.h>

Modified: grass/trunk/raster/r.watershed/seg/bseg_put.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_put.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/bseg_put.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/bseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_read.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/bseg_read.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/bseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_write.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/bseg_write.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "cseg.h"
 
 static char *me = "bseg_write_cell";

Modified: grass/trunk/raster/r.watershed/seg/cseg_close.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_close.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/cseg_close.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include <grass/segment.h>
 #include "cseg.h"

Modified: grass/trunk/raster/r.watershed/seg/cseg_get.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_get.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/cseg_get.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/cseg_open.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_open.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/cseg_open.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "cseg.h"

Modified: grass/trunk/raster/r.watershed/seg/cseg_put.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_put.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/cseg_put.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/cseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_read.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/cseg_read.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/cseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_write.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/cseg_write.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/do_astar.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/do_astar.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/do_astar.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "Gwater.h"
 #include "do_astar.h"

Modified: grass/trunk/raster/r.watershed/seg/do_cum.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/do_cum.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/do_cum.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include "Gwater.h"
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.watershed/seg/dseg_close.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_close.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/dseg_close.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/dseg_get.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_get.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/dseg_get.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/dseg_open.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_open.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/dseg_open.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <grass/segment.h>

Modified: grass/trunk/raster/r.watershed/seg/dseg_put.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_put.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/dseg_put.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/dseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_read.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/dseg_read.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/dseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_write.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/dseg_write.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/init_vars.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/init_vars.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include "Gwater.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int ele_round(double);

Modified: grass/trunk/raster/r.watershed/seg/main.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include "Gwater.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct Cell_head window;

Modified: grass/trunk/raster/r.watershed/seg/sg_factor.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/sg_factor.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/sg_factor.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include "Gwater.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.watershed/seg/sseg_close.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/sseg_close.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/sseg_close.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include <grass/segment.h>
 #include "cseg.h"

Modified: grass/trunk/raster/r.watershed/seg/sseg_get.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/sseg_get.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/sseg_get.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/sseg_open.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/sseg_open.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/sseg_open.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <grass/segment.h>

Modified: grass/trunk/raster/r.watershed/seg/sseg_put.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/sseg_put.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/sseg_put.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/segment.h>
 #include "cseg.h"
 

Modified: grass/trunk/raster/r.watershed/seg/usage.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/usage.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/seg/usage.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 

Modified: grass/trunk/raster/r.watershed/shed/watershed.h
===================================================================
--- grass/trunk/raster/r.watershed/shed/watershed.h	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.watershed/shed/watershed.h	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #define RAM_NAME		"ram"
 #define SEG_NAME		"seg"

Modified: grass/trunk/raster/r.what/Makefile
===================================================================
--- grass/trunk/raster/r.what/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.what/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.what
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.what/main.c
===================================================================
--- grass/trunk/raster/r.what/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.what/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 struct order

Modified: grass/trunk/raster/r.what.color/Makefile
===================================================================
--- grass/trunk/raster/r.what.color/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.what.color/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = r.what.color
 
-LIBES = $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.what.color/main.c
===================================================================
--- grass/trunk/raster/r.what.color/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster/r.what.color/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 static const char *fmt;

Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.cross.rast/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster3d/r3.gwflow/main.c
===================================================================
--- grass/trunk/raster3d/r3.gwflow/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.gwflow/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 #include <grass/N_pde.h>

Modified: grass/trunk/raster3d/r3.mkdspf/calc_linefax.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/calc_linefax.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.mkdspf/calc_linefax.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "vizual.h"
 
 

Modified: grass/trunk/raster3d/r3.mkdspf/iso_surface.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/iso_surface.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.mkdspf/iso_surface.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <math.h>
 #include "vizual.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include "local_proto.h"
 

Modified: grass/trunk/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.mkdspf/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -44,7 +44,7 @@
 #include <math.h>
 #include "vizual.h"
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include "local_proto.h"
 #include <grass/glocale.h>

Modified: grass/trunk/raster3d/r3.mkdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/r3_find.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.mkdspf/r3_find.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -5,7 +5,7 @@
  **************************************************************/
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 
 

Modified: grass/trunk/raster3d/r3.out.vtk/errorHandling.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/errorHandling.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.out.vtk/errorHandling.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 #include "globalDefs.h"

Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.out.vtk/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/raster3d/r3.out.vtk/parameters.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/parameters.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.out.vtk/parameters.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -16,7 +16,7 @@
 *
 *****************************************************************************/
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include "parameters.h"
 

Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKData.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKData.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 #include "globalDefs.h"

Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 #include "globalDefs.h"

Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/raster3d/r3.to.rast/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/swig/python/Makefile
===================================================================
--- grass/trunk/swig/python/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/swig/python/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -10,11 +10,12 @@
 DOXNAME=
 DOXINPUT=grasspython.dox
 
-MODULES = utils date grass math proj imagery vector display stats \
+MODULES = utils date grass raster math proj imagery vector display stats \
 	dbmi g3d arraystats cluster trans vedit
 
 date_LIBS       = $(DATETIMELIB)
 grass_LIBS      = $(GISLIB)
+raster_LIBS     = $(RASTERLIB)
 math_LIBS       = $(GMATHLIB)
 proj_LIBS       = $(GPROJLIB)
 imagery_LIBS    = $(IMAGERYLIB)
@@ -85,6 +86,7 @@
 date_wrap.c: $(GISBASE)/include/grass/P_datetime.h
 grass_wrap.c: $(GISBASE)/include/grass/gis.h
 grass_wrap.c: $(GISBASE)/include/grass/gisdefs.h
+raster_wrap.c: $(GISBASE)/include/grass/raster.h
 math_wrap.c: $(GISBASE)/include/grass/gmath.h
 proj_wrap.c: $(GISBASE)/include/grass/gprojects.h
 imagery_wrap.c: $(GISBASE)/include/grass/imagedefs.h
@@ -102,4 +104,3 @@
 cluster_wrap.c: $(GISBASE)/include/grass/cluster.h
 trans_wrap.c: $(GISBASE)/include/grass/transform.h
 vedit_wrap.c: $(GISBASE)/include/grass/vedit.h
-utils_wrap.c:

Modified: grass/trunk/vector/lidar/lidarlib/TcholBand.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/TcholBand.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/lidarlib/TcholBand.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/PolimiFunct.h>
 
 /*--------------------------------------------------------------------------------------*/

Modified: grass/trunk/vector/lidar/lidarlib/raster.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/raster.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/lidarlib/raster.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/lidar/lidarlib/zones.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/zones.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/lidarlib/zones.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <string.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/lidar/v.lidar.correction/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.correction/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.lidar.correction
 
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP) 
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP) 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/lidar/v.lidar.correction/correction.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/correction.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.correction/correction.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 

Modified: grass/trunk/vector/lidar/v.lidar.correction/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.correction/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.lidar.edgedetection
 
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(GMATHDEP) 
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(GMATHDEP) 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS) 
 

Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
     /* #include <grass/PolimiFunct.h> */

Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/lidar/v.lidar.growing/ConvexHull.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/ConvexHull.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.growing/ConvexHull.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "growing.h"
 

Modified: grass/trunk/vector/lidar/v.lidar.growing/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.growing/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.lidar.growing
 
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP) 
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP) 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/lidar/v.lidar.growing/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.lidar.growing/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/lidar/v.outlier/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.outlier/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.outlier/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.outlier
 
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP) 
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP) 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/lidar/v.outlier/main.c
===================================================================
--- grass/trunk/vector/lidar/v.outlier/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.outlier/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <grass/config.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/lidar/v.outlier/outlier.c
===================================================================
--- grass/trunk/vector/lidar/v.outlier/outlier.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.outlier/outlier.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 

Modified: grass/trunk/vector/lidar/v.surf.bspline/Makefile
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.surf.bspline/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.surf.bspline
 
-LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
-DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP) 
+LIBES = $(LIDARLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB) $(MATHLIB) $(SEGMENTLIB) $(GMATHLIB)
+DEPENDENCIES= $(LIDARDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP) 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/lidar/v.surf.bspline/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/v.convert/Makefile
===================================================================
--- grass/trunk/vector/v.convert/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.convert/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,8 +3,8 @@
 
 PGM=v.convert
 
-LIBES     = $(VECTLIB) $(VECTLIB_REAL) $(DBMILIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(VECTLIB) $(VECTLIB_REAL) $(DBMILIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
  

Modified: grass/trunk/vector/v.convert/att.c
===================================================================
--- grass/trunk/vector/v.convert/att.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.convert/att.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/v.convert/dist.c
===================================================================
--- grass/trunk/vector/v.convert/dist.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.convert/dist.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include "conv.h"
 #include "local_proto.h"

Modified: grass/trunk/vector/v.convert/main.c
===================================================================
--- grass/trunk/vector/v.convert/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.convert/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>
 #include "conv.h"

Modified: grass/trunk/vector/v.convert/old2new.c
===================================================================
--- grass/trunk/vector/v.convert/old2new.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.convert/old2new.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>
 #include "conv.h"

Modified: grass/trunk/vector/v.convert/read.c
===================================================================
--- grass/trunk/vector/v.convert/read.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.convert/read.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>
 #include "conv.h"

Modified: grass/trunk/vector/v.drape/Makefile
===================================================================
--- grass/trunk/vector/v.drape/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.drape/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,8 +3,8 @@
 
 PGM = v.drape
 
-LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.drape/main.c
===================================================================
--- grass/trunk/vector/v.drape/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.drape/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -30,7 +30,7 @@
 
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/v.extrude/Makefile
===================================================================
--- grass/trunk/vector/v.extrude/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.extrude/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.extrude
 
-LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.extrude/main.c
===================================================================
--- grass/trunk/vector/v.extrude/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.extrude/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>

Modified: grass/trunk/vector/v.kernel/Makefile
===================================================================
--- grass/trunk/vector/v.kernel/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.kernel/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM=v.kernel
 
-LIBES     = $(VECTLIB) $(DBMILIB) $(GMATHLIB) $(GISLIB) $(RASTRLIB) $(DATETIMELIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GMATHDEP) $(GISDEP) $(RASTRDEP) $(DATETIMEDEP)
+LIBES     = $(VECTLIB) $(DBMILIB) $(GMATHLIB) $(GISLIB) $(RASTERLIB) $(DATETIMELIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GMATHDEP) $(GISDEP) $(RASTERDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
  

Modified: grass/trunk/vector/v.kernel/function.c
===================================================================
--- grass/trunk/vector/v.kernel/function.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.kernel/function.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include "global.h"
 

Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.kernel/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <float.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/gmath.h>
 #include <grass/Vect.h>

Modified: grass/trunk/vector/v.neighbors/Makefile
===================================================================
--- grass/trunk/vector/v.neighbors/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.neighbors/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.neighbors
 
-LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.neighbors/main.c
===================================================================
--- grass/trunk/vector/v.neighbors/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.neighbors/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>
 

Modified: grass/trunk/vector/v.sample/Makefile
===================================================================
--- grass/trunk/vector/v.sample/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.sample/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.sample
 
-LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.sample/main.c
===================================================================
--- grass/trunk/vector/v.sample/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.sample/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>

Modified: grass/trunk/vector/v.surf.idw/Makefile
===================================================================
--- grass/trunk/vector/v.surf.idw/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.surf.idw/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,8 +2,8 @@
 
 PGM = v.surf.idw
 
-LIBES = $(VECTLIB) $(GISLIB) $(RASTRLIB) $(DATETIMELIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTRDEP) $(DATETIMEDEP)
+LIBES = $(VECTLIB) $(GISLIB) $(RASTERLIB) $(DATETIMELIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(RASTERDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.surf.idw/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 
 int search_points = 12;

Modified: grass/trunk/vector/v.surf.idw/read_sites.c
===================================================================
--- grass/trunk/vector/v.surf.idw/read_sites.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.surf.idw/read_sites.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <grass/glocale.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include "proto.h"

Modified: grass/trunk/vector/v.to.rast/Makefile
===================================================================
--- grass/trunk/vector/v.to.rast/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.to.rast/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,8 +3,8 @@
 
 PGM=v.to.rast
 
-LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(VECTLIB) $(DBMILIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
  

Modified: grass/trunk/vector/v.to.rast/do_areas.c
===================================================================
--- grass/trunk/vector/v.to.rast/do_areas.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.to.rast/do_areas.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/v.to.rast/do_lines.c
===================================================================
--- grass/trunk/vector/v.to.rast/do_lines.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.to.rast/do_lines.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/v.to.rast/main.c
===================================================================
--- grass/trunk/vector/v.to.rast/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.to.rast/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/v.to.rast/raster.c
===================================================================
--- grass/trunk/vector/v.to.rast/raster.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.to.rast/raster.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,5 +1,5 @@
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include "local.h"
 

Modified: grass/trunk/vector/v.to.rast/support.c
===================================================================
--- grass/trunk/vector/v.to.rast/support.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.to.rast/support.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/v.to.rast/vect2rast.c
===================================================================
--- grass/trunk/vector/v.to.rast/vect2rast.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.to.rast/vect2rast.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/vector/v.vol.rst/dataoct.c
===================================================================
--- grass/trunk/vector/v.vol.rst/dataoct.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.vol.rst/dataoct.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include "dataoct.h"
 #include "externs.h"
 #include "user.h"

Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.vol.rst/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -33,7 +33,7 @@
 #include <unistd.h>
 
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/site.h>
 #include <grass/Vect.h>
 #include "userglobs.h"

Modified: grass/trunk/vector/v.vol.rst/oct.c
===================================================================
--- grass/trunk/vector/v.vol.rst/oct.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.vol.rst/oct.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "oct.h"
 #include "externs.h"

Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.vol.rst/user1.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/G3d.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>

Modified: grass/trunk/vector/v.vol.rst/user2.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user2.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.vol.rst/user2.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -30,7 +30,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "oct.h"
 #include "surf.h"

Modified: grass/trunk/vector/v.vol.rst/user3.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user3.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.vol.rst/user3.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 

Modified: grass/trunk/vector/v.vol.rst/user4.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user4.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.vol.rst/user4.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -31,7 +31,7 @@
 #include <math.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 
 #include "oct.h"
 #include "surf.h"

Modified: grass/trunk/vector/v.vol.rst/vector.c
===================================================================
--- grass/trunk/vector/v.vol.rst/vector.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.vol.rst/vector.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/Vect.h>
 #include <grass/dbmi.h>
 

Modified: grass/trunk/vector/v.what.rast/Makefile
===================================================================
--- grass/trunk/vector/v.what.rast/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.what.rast/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -3,8 +3,8 @@
 
 PGM=v.what.rast
 
-LIBES     = $(VECTLIB) $(GISLIB) $(RASTRLIB)
-DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTRDEP)
+LIBES     = $(VECTLIB) $(GISLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
  

Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/vector/v.what.rast/main.c	2009-06-22 01:49:13 UTC (rev 38014)
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 #include <grass/glocale.h>

Modified: grass/trunk/visualization/xganim/Makefile
===================================================================
--- grass/trunk/visualization/xganim/Makefile	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/visualization/xganim/Makefile	2009-06-22 01:49:13 UTC (rev 38014)
@@ -4,8 +4,8 @@
 
 EXTRA_CFLAGS = $(WXWIDGETSCXXFLAGS) -DWXINTL_NO_GETTEXT_MACRO
 
-LIBES = $(GISLIB) $(RASTRLIB) $(WXWIDGETSLIB)
-DEPENDENCIES = $(GISDEP) $(RASTRDEP)
+LIBES = $(GISLIB) $(RASTERLIB) $(WXWIDGETSLIB)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/visualization/xganim/main.cc
===================================================================
--- grass/trunk/visualization/xganim/main.cc	2009-06-21 15:58:17 UTC (rev 38013)
+++ grass/trunk/visualization/xganim/main.cc	2009-06-22 01:49:13 UTC (rev 38014)
@@ -30,7 +30,7 @@
 
 extern "C" {
 #include <grass/gis.h>
-#include <grass/Rast.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
 }
 

