[GRASS-SVN] r46217 - in grass-addons/grass7/raster: . r.convergence r.stream

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-05-09 05:39:03 -0700 (Mon, 09 May 2011)
New Revision: 46217

Added:
   grass-addons/grass7/raster/Makefile
Modified:
   grass-addons/grass7/raster/r.convergence/local_proto.h
   grass-addons/grass7/raster/r.stream/Makefile
Log:
compilation fix

Added: grass-addons/grass7/raster/Makefile
===================================================================
--- grass-addons/grass7/raster/Makefile	                        (rev 0)
+++ grass-addons/grass7/raster/Makefile	2011-05-09 12:39:03 UTC (rev 46217)
@@ -0,0 +1,16 @@
+MODULE_TOPDIR = ..
+
+SUBDIRS = \
+	r.area/ \
+	r.clump2/ \
+	r.convergence/ \
+	r.convert/ \
+	r.fuzzy/ \
+	r.in.modis/ \
+	r.stream/ \
+	r.stream.extract
+
+include $(MODULE_TOPDIR)/include/Make/Dir.make
+
+default: subdirs
+


Property changes on: grass-addons/grass7/raster/Makefile
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: grass-addons/grass7/raster/r.convergence/local_proto.h
===================================================================
--- grass-addons/grass7/raster/r.convergence/local_proto.h	2011-05-09 12:25:20 UTC (rev 46216)
+++ grass-addons/grass7/raster/r.convergence/local_proto.h	2011-05-09 12:39:03 UTC (rev 46217)
@@ -64,15 +64,15 @@
   int r,g,b
 } FCOLORS;
 
-int gradient, f_circular, f_slope, f_method, window_size,radius;
-float *aspect_matrix, *distance_matrix;
-MAPS elevation;
-FCELL** slope;
-FCELL** aspect;
+GLOBAL int gradient, f_circular, f_slope, f_method, window_size,radius;
+GLOBAL float *aspect_matrix, *distance_matrix;
+GLOBAL MAPS elevation;
+GLOBAL FCELL** slope;
+GLOBAL FCELL** aspect;
 
-int nrows, ncols;
-double H,V;
-struct Cell_head window;
+GLOBAL int nrows, ncols;
+GLOBAL double H,V;
+GLOBAL struct Cell_head window;
 
 int open_map(MAPS* rast);
 int create_maps(void);

Modified: grass-addons/grass7/raster/r.stream/Makefile
===================================================================
--- grass-addons/grass7/raster/r.stream/Makefile	2011-05-09 12:25:20 UTC (rev 46216)
+++ grass-addons/grass7/raster/r.stream/Makefile	2011-05-09 12:39:03 UTC (rev 46217)
@@ -2,7 +2,7 @@
 
 SUBDIRS = \
 	r.stream.order \
-	r.stream.baisns \
+	r.stream.basins \
 	r.stream.distance \
 	r.stream.stats \
 	r.stream.slope \