[GRASS-SVN] r30947 - in grass/trunk: db/drivers/dbf lib/external/shapelib

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-04-11 23:03:06 -0400 (Fri, 11 Apr 2008)
New Revision: 30947

Modified:
   grass/trunk/db/drivers/dbf/Makefile
   grass/trunk/lib/external/shapelib/Makefile
   grass/trunk/lib/external/shapelib/safileio.c
Log:
Make safileio.c compatible with shapefil.h
Change Makefile to compile safileio.c
Remove GDAL flags from DBF driver (reverting previous change)



Modified: grass/trunk/db/drivers/dbf/Makefile
===================================================================
--- grass/trunk/db/drivers/dbf/Makefile	2008-04-11 23:08:25 UTC (rev 30946)
+++ grass/trunk/db/drivers/dbf/Makefile	2008-04-12 03:03:06 UTC (rev 30947)
@@ -8,9 +8,8 @@
 DRIVER=$(DBDRIVERDIR)/dbf$(EXE)
 DEPENDENCIES = $(GISDEP)
 EXTRA_INC = -I$(MODULE_TOPDIR)/lib/db/dbmi_driver
-EXTRA_CFLAGS = $(GDALCFLAGS)
 
-LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBMIEXTRALIB) $(SQLPLIB) $(SHAPELIB) $(DBSTUBSLIB) $(GISLIB) $(DATETIMELIB) $(GDALLIBS)
+LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBMIEXTRALIB) $(SQLPLIB) $(SHAPELIB) $(DBSTUBSLIB) $(GISLIB) $(DATETIMELIB)
 
 DRVDOC=$(GISBASE)/docs/html/grass-dbf.html
 

Modified: grass/trunk/lib/external/shapelib/Makefile
===================================================================
--- grass/trunk/lib/external/shapelib/Makefile	2008-04-11 23:08:25 UTC (rev 30946)
+++ grass/trunk/lib/external/shapelib/Makefile	2008-04-12 03:03:06 UTC (rev 30947)
@@ -2,10 +2,6 @@
 
 LIB_NAME = $(SHAPE_LIBNAME)
 
-LIB_OBJS = \
-	shpopen.o \
-	dbfopen.o
-
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 default: $(ARCH_INCDIR)/shapefil.h

Modified: grass/trunk/lib/external/shapelib/safileio.c
===================================================================
--- grass/trunk/lib/external/shapelib/safileio.c	2008-04-11 23:08:25 UTC (rev 30946)
+++ grass/trunk/lib/external/shapelib/safileio.c	2008-04-12 03:03:06 UTC (rev 30947)
@@ -182,10 +182,8 @@
     psHooks->FTell   = SADFTell;
     psHooks->FFlush  = SADFFlush;
     psHooks->FClose  = SADFClose;
-    psHooks->Remove  = SADRemove;
 
     psHooks->Error   = SADError;
-    psHooks->Atof    = atof;
 }