[GRASS-SVN] r50193 - grass/branches/develbranch_6/vector/v.mapcalc

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-01-14 17:20:28 -0800 (Sat, 14 Jan 2012)
New Revision: 50193

Modified:
   grass/branches/develbranch_6/vector/v.mapcalc/Makefile
   grass/branches/develbranch_6/vector/v.mapcalc/vector.c
Log:
more defined way of creating a nan, move Makefile a little closer to the GRASS way

Modified: grass/branches/develbranch_6/vector/v.mapcalc/Makefile
===================================================================
--- grass/branches/develbranch_6/vector/v.mapcalc/Makefile	2012-01-15 01:01:38 UTC (rev 50192)
+++ grass/branches/develbranch_6/vector/v.mapcalc/Makefile	2012-01-15 01:20:28 UTC (rev 50193)
@@ -1,4 +1,6 @@
-CC = gcc
+MODULE_TOPDIR = ../..
+PGM = v.mapcalc
+
 #CFLAGS = -g -Wall -Werror -rdynamic
 CFLAGS = -O2 -Wall -Werror -rdynamic
 LDFLAGS = -ldl -lm #-lefence
@@ -6,6 +8,11 @@
 #YACC = bison -t
 YACCFLAGS = -d
 
+LIBES = $(VECTLIB) $(GISLIB)
+DEPENDENCIES = $(VECTDEP) $(GISDEP)
+EXTRA_INC = $(VECT_INC)
+EXTRA_CFLAGS = $(VECT_CFLAGS)
+
 all: v.mapcalc
 
 v.mapcalc: mapcalc.o yylex.o v.mapcalc.o number.o vector.o map.o any.o \

Modified: grass/branches/develbranch_6/vector/v.mapcalc/vector.c
===================================================================
--- grass/branches/develbranch_6/vector/v.mapcalc/vector.c	2012-01-15 01:01:38 UTC (rev 50192)
+++ grass/branches/develbranch_6/vector/v.mapcalc/vector.c	2012-01-15 01:20:28 UTC (rev 50193)
@@ -124,7 +124,7 @@
     sym->v.p = &pnt_k;
 
     /* initialize NaN */
-    nanval = sqrt(-1);
+    nanval = 0.0 / 0.0;
 }
 
 void printvec(SYMBOL * sym)