[GRASS-SVN] r42317 - in grass/trunk: lib lib/lidar vector/lidar

[svn_grass at osgeo.org]

Author: mmetz
Date: 2010-05-19 05:50:37 -0400 (Wed, 19 May 2010)
New Revision: 42317

Added:
   grass/trunk/lib/lidar/
Removed:
   grass/trunk/vector/lidar/lidarlib/
Modified:
   grass/trunk/lib/Makefile
   grass/trunk/lib/lidar/Makefile
   grass/trunk/vector/lidar/Makefile
Log:
reorganizing lidar tools: move lidarlib to lib/lidar

Modified: grass/trunk/lib/Makefile
===================================================================
--- grass/trunk/lib/Makefile	2010-05-19 08:50:08 UTC (rev 42316)
+++ grass/trunk/lib/Makefile	2010-05-19 09:50:37 UTC (rev 42317)
@@ -31,6 +31,7 @@
 	vector \
 	sites \
 	rst \
+	lidar \
 	g3d \
 	gpde \
 	dspf \

Modified: grass/trunk/lib/lidar/Makefile
===================================================================
--- grass/trunk/vector/lidar/lidarlib/Makefile	2010-05-19 08:50:08 UTC (rev 42316)
+++ grass/trunk/lib/lidar/Makefile	2010-05-19 09:50:37 UTC (rev 42317)
@@ -1,11 +1,10 @@
-MODULE_TOPDIR = ../../..
+MODULE_TOPDIR = ../..
 
-DEPENDENCIES= $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
+LIB = LIDAR
+
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
-LIB = LIDAR
-
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 default: $(ARCH_INCDIR)/lidar.h

Modified: grass/trunk/vector/lidar/Makefile
===================================================================
--- grass/trunk/vector/lidar/Makefile	2010-05-19 08:50:08 UTC (rev 42316)
+++ grass/trunk/vector/lidar/Makefile	2010-05-19 09:50:37 UTC (rev 42317)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-SUBDIRS1 = \
+SUBDIRS = \
 	v.surf.bspline \
 	v.outlier \
 	v.lidar.correction \
@@ -8,12 +8,7 @@
 	v.lidar.growing \
         r.resamp.bspline
 
-SUBDIRS = lidarlib $(SUBDIRS1)
-
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs
 
-
-$(SUBDIRS1): lidarlib
-