[GRASS-SVN] r66374 - in grass-addons/grass7/vector: v.kriging v.nnstat

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-09-28 09:20:58 -0700 (Mon, 28 Sep 2015)
New Revision: 66374

Modified:
   grass-addons/grass7/vector/v.kriging/Makefile
   grass-addons/grass7/vector/v.nnstat/Makefile
   grass-addons/grass7/vector/v.nnstat/utils.c
Log:
v.kriging, v.nnstat addons: attempt to fix Makefile; fix compiler warning -Wabsolute-value and return in void function

Modified: grass-addons/grass7/vector/v.kriging/Makefile
===================================================================
--- grass-addons/grass7/vector/v.kriging/Makefile	2015-09-28 10:56:21 UTC (rev 66373)
+++ grass-addons/grass7/vector/v.kriging/Makefile	2015-09-28 16:20:58 UTC (rev 66374)
@@ -2,9 +2,8 @@
 
 PGM = v.kriging
 
-LIBES = $(RASTER3DLIB) $(RASTERLIB) $(VECTORLIB) $(DBMILIB) $(GMATHLIB) $(GISLIB) $(IOSTREAMLIB)  $(RTREELIB)
-
-DEPENDENCIES= $(RASTER3DDEP) $(RASTERDEP) $(VECTORDEP) $(DBMIDEP) $(GMATHDEP) $(GISDEP) $(IOSTREAMDEP) $(RTREEDEP)
+LIBES = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(GMATHLIB) $(IOSTREAMLIB) $(MATHLIB) $(RTREELIB) $(RASTER3DLIB) $(RASTERLIB)
+DEPENDENCIES = $(VECTORDEP) $(DBMIDEP) $(GISDEP) $(GMATHDEP) $(IOSTREAMDEP) $(RTREEDEP) $(RASTER3DDEP) $(RASTERDEP)
 EXTRA_INC = $(VECT_INC) $(PROJINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass-addons/grass7/vector/v.nnstat/Makefile
===================================================================
--- grass-addons/grass7/vector/v.nnstat/Makefile	2015-09-28 10:56:21 UTC (rev 66373)
+++ grass-addons/grass7/vector/v.nnstat/Makefile	2015-09-28 16:20:58 UTC (rev 66374)
@@ -3,7 +3,7 @@
 PGM = v.nnstat
 
 LIBES = $(VECTORLIB) $(DBMILIB) $(GISLIB) $(GMATHLIB) $(IOSTREAMLIB) $(MATHLIB) $(RTREELIB)
-DEPENDENCIES= $(VECTORDEP) $(DBMIDEP) $(GISDEP) $(IOSTREAMDEP) $(RTREEDEP)
+DEPENDENCIES = $(VECTORDEP) $(DBMIDEP) $(GISDEP) $(GMATHDEP) $(IOSTREAMDEP) $(RTREEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass-addons/grass7/vector/v.nnstat/utils.c
===================================================================
--- grass-addons/grass7/vector/v.nnstat/utils.c	2015-09-28 10:56:21 UTC (rev 66373)
+++ grass-addons/grass7/vector/v.nnstat/utils.c	2015-09-28 16:20:58 UTC (rev 66374)
@@ -25,7 +25,7 @@
         return -9999;
     }
 
-    us = atan(fabsf(dy / dx));
+    us = atan(fabs(dy / dx));
     if (dx == 0. && dy > 0.) {
         us = 0.5 * PI;
     }