[GRASS-SVN] r61404 - grass-addons/grass7/raster3d/r3.flow

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-07-25 13:01:38 -0700 (Fri, 25 Jul 2014)
New Revision: 61404

Modified:
   grass-addons/grass7/raster3d/r3.flow/Makefile
   grass-addons/grass7/raster3d/r3.flow/test_main.c
Log:
r3.flow: disable tests since addon fails to install

Modified: grass-addons/grass7/raster3d/r3.flow/Makefile
===================================================================
--- grass-addons/grass7/raster3d/r3.flow/Makefile	2014-07-25 19:42:30 UTC (rev 61403)
+++ grass-addons/grass7/raster3d/r3.flow/Makefile	2014-07-25 20:01:38 UTC (rev 61404)
@@ -1,15 +1,12 @@
 MODULE_TOPDIR = ../..
 
-PROGRAMS = r3.flow test.r3flow
+PGM=r3.flow
 
 LIBES = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(VECTORLIB)
 DEPENDENCIES = $(RASTER3DDEP) $(RASTERDEP) $(GISDEP) $(VECTORDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
-r3_flow_OBJS = main.o flowline.o gradient.o integrate.o interpolate.o voxel_traversal.o
-test_r3flow_OBJS = test_main.o flowline.o gradient.o integrate.o interpolate.o voxel_traversal.o
+include $(MODULE_TOPDIR)/include/Make/Module.make
 
-include $(MODULE_TOPDIR)/include/Make/Multi.make
-
-default: multi
+default: cmd

Modified: grass-addons/grass7/raster3d/r3.flow/test_main.c
===================================================================
--- grass-addons/grass7/raster3d/r3.flow/test_main.c	2014-07-25 19:42:30 UTC (rev 61403)
+++ grass-addons/grass7/raster3d/r3.flow/test_main.c	2014-07-25 20:01:38 UTC (rev 61404)
@@ -29,7 +29,7 @@
 
 }
 
-int main(int argc, char *argv[])
+int test_main(int argc, char *argv[])
 {
     int i;
     struct GModule *module;