Преглед изворни кода

reorganizing lidar tools: move lidarlib to lib/lidar

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42317 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz пре 15 година
родитељ
комит
888ef80456
7 измењених фајлова са 5 додато и 10 уклоњено
  1. 1 0
      lib/Makefile
  2. 0 0
      lib/lidar/InterpSpline.c
  3. 3 4
      vector/lidar/lidarlib/Makefile
  4. 0 0
      lib/lidar/lidar.h
  5. 0 0
      lib/lidar/raster.c
  6. 0 0
      lib/lidar/zones.c
  7. 1 6
      vector/lidar/Makefile

+ 1 - 0
lib/Makefile

@@ -31,6 +31,7 @@ SUBDIRS = \
 	vector \
 	sites \
 	rst \
+	lidar \
 	g3d \
 	gpde \
 	dspf \

vector/lidar/lidarlib/InterpSpline.c → lib/lidar/InterpSpline.c


+ 3 - 4
vector/lidar/lidarlib/Makefile

@@ -1,11 +1,10 @@
-MODULE_TOPDIR = ../../..
+MODULE_TOPDIR = ../..
+
+LIB = LIDAR
 
-DEPENDENCIES= $(VECTDEP) $(DBMIDEP) $(GISDEP) $(RASTERDEP) $(BSPLINE_ARCH_OBJ) $(GMATHDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
-LIB = LIDAR
-
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 default: $(ARCH_INCDIR)/lidar.h

vector/lidar/lidarlib/lidar.h → lib/lidar/lidar.h


vector/lidar/lidarlib/raster.c → lib/lidar/raster.c


vector/lidar/lidarlib/zones.c → lib/lidar/zones.c


+ 1 - 6
vector/lidar/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-SUBDIRS1 = \
+SUBDIRS = \
 	v.surf.bspline \
 	v.outlier \
 	v.lidar.correction \
@@ -8,12 +8,7 @@ SUBDIRS1 = \
 	v.lidar.growing \
         r.resamp.bspline
 
-SUBDIRS = lidarlib $(SUBDIRS1)
-
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs
 
-
-$(SUBDIRS1): lidarlib
-