Enable LFS globally

Define, use HAVE_FSEEKO
Makefile cleanup


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40620 15284696-431f-4ddb-bdfa-cd5b030d7da7

configure.in

@@ -1730,7 +1730,7 @@ dnl Warning do not run this test. it interferes with the test
 dnl AC_CHECK_FUNCS(fseeko ftello) from above.
 dnl The test AC_HAVE_LARGEFILES will check whether ftello/fseeko
 dnl are available in Large File mode
-dnl AC_FUNC_FSEEKO
+AC_FUNC_FSEEKO
 AC_HAVE_LARGEFILES
 
 USE_LARGEFILES=

general/manage/lister/Makefile

@@ -10,7 +10,7 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 default: $(ETC)/lister/cell $(ETC)/lister/vector
 
 $(ETC)/lister/%: $(OBJDIR)/%.o | $(ETC)/lister
-	$(CC) $(LDFLAGS) -o $@ $< $(FMODE_OBJ) $(LIST) $(LIBES) $(MATHLIB) $(XDRLIB)
+	$(call linker)
 
 $(ETC)/lister:
 	$(MKDIR) $@

imagery/i.albedo/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.biomass/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.eb.eta/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.eb.evapfr/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.eb.soilheatflux/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.emissivity/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.evapo.time_integration/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.latlong/Makefile

@@ -8,8 +8,5 @@ EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.modis.qc/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.sunhours/Makefile

@@ -8,8 +8,5 @@ EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

imagery/i.vi/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

include/Make/Compile.make

@@ -9,9 +9,9 @@ linker_c = $(call linker_x,$(CC))
 linker_cxx = $(call linker_x,$(CXX))
 linker = $(call linker_x,$(LINK))
 
-compiler_x = $(1) $(2) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -o $@ -c $<
-compiler_c = $(call compiler_x,$(CC),$(CFLAGS) $($*_c_FLAGS))
-compiler_cxx = $(call compiler_x,$(CXX),$(CXXFLAGS) $($*_cc_FLAGS) $($*_cpp_FLAGS))
+compiler_x = $(1) $(2) $(LFS_CFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(DEFS) $(EXTRA_INC) $(INC) -o $@ -c $<
+compiler_c = $(call compiler_x,$(CC),$(COMPILE_FLAGS_C) $($*_c_FLAGS))
+compiler_cxx = $(call compiler_x,$(CXX),$(COMPILE_FLAGS_CXX) $($*_cc_FLAGS) $($*_cpp_FLAGS) $($*_cxx_FLAGS))
 compiler = $(call compiler_x,$(CC))
 
 # default cc rules

include/Make/Grass.make

@@ -70,18 +70,16 @@ GRASS_NAME	= grass$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
 
 ##################### other #############################################
 
-COMPILE_FLAGS      = $(CPPFLAGS) $(CFLAGS1) $(INCLUDE_DIRS)
-COMPILE_FLAGS_CXX  = $(CPPFLAGS) $(CXXFLAGS1) $(INCLUDE_DIRS)
+COMPILE_FLAGS_C    = $(CPPFLAGS) $(CFLAGS) $(INCLUDE_DIRS) $(INC)
+COMPILE_FLAGS_CXX  = $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE_DIRS) $(INC)
 
 # crude hack for vector LFS, LFS_FLAGS should be set by configure
 ifdef USE_LARGEFILES
-VECT_LFS_FLAGS = -D_FILE_OFFSET_BITS=64
+LFS_CFLAGS = -D_FILE_OFFSET_BITS=64
 endif
 
-CFLAGS      =  $(INC) $(COMPILE_FLAGS)
-CXXFLAGS    =  $(INC) $(COMPILE_FLAGS_CXX)
 LDFLAGS     =  $(LIBPATH) $(LINK_FLAGS) $(LD_SEARCH_FLAGS) $(PQLIBPATH)
-VECT_CFLAGS =  $(GDALCFLAGS) $(GEOSCFLAGS) $(VECT_LFS_FLAGS)
+VECT_CFLAGS =  $(GDALCFLAGS) $(GEOSCFLAGS)
 
 # Object with _fmode which must be linked to each executable on Windows
 ifdef MINGW

include/Make/Platform.make.in

@@ -80,8 +80,8 @@ DEFAULT_DATABASE    =
 DEFAULT_LOCATION    =
 
 CPPFLAGS            = @CPPFLAGS@
-CFLAGS1             = @CFLAGS@
-CXXFLAGS1           = @CXXFLAGS@
+CFLAGS              = @CFLAGS@
+CXXFLAGS            = @CXXFLAGS@
 INCLUDE_DIRS        = @INCLUDE_DIRS@
 LINK_FLAGS          = @LDFLAGS@
 

include/config.h.in

@@ -242,6 +242,9 @@
 /* define if pthread.h exists */
 #undef HAVE_PTHREAD_H
 
+/* define if fseeko() exists */
+#undef HAVE_FSEEKO
+
 /*
  * configuration information solely dependent on the above
  * nothing below this point should need changing

lib/bitmap/Makefile

@@ -8,16 +8,12 @@ LIB = BITMAP
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-
 default: lib
 
+$(OBJDIR)/main$(EXE): $(OBJDIR)/main.o $(BITMAPDEP) $(LINKMDEP)
+	$(call linker)
 
-#$(OBJ): #linkm.h
-
-main: main.o $(BITMAPLIB) $(LINKMLIB)
-	$(CC) $(LDFLAGS) main.o $(BITMAPLIB) $(LINKMLIB) -o main
-
-smain: smain.o $(BITMAPLIB) $(LINKMLIB)
-	$(CC) $(LDFLAGS) smain.o $(BITMAPLIB) $(LINKMLIB) -o smain
+$(OBJDIR)/smain$(EXE): $(OBJDIR)/smain.o $(BITMAPDEP) $(LINKMDEP)
+	$(call linker)
 
-#$(LINKMLIB): #
+$(OBJDIR)/main$(EXE) $(OBJDIR)/smain$(EXE): LIBES = $(BITMAPLIB) $(LINKMLIB)

lib/db/sqlp/test/Makefile

@@ -2,14 +2,13 @@
 MODULE_TOPDIR = ../../../..
 
 include $(MODULE_TOPDIR)/include/Make/Other.make
+include $(MODULE_TOPDIR)/include/Make/Compile.make
 
 LIBES = $(SQLPLIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(ZLIBLIBPATH) $(ZLIB)
 
-EXTRA_CLEAN_FILES = sqlptest
+EXTRA_CLEAN_FILES = $(OBJDIR)/sqlptest$(EXE)
 
-default: sqlptest
-
-
-sqlptest: sqlptest.c 
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  $(LIBES)
+default: $(OBJDIR)/sqlptest$(EXE)
 
+$(OBJDIR)/sqlptest$(EXE): $(OBJDIR)/sqlptest.o
+	$(call linker)

lib/gis/Makefile

@@ -18,11 +18,6 @@ DATAFILES := $(patsubst %,$(ETC)/%,$(DATASRC))
 COLORSRC := $(filter-out colors/CVS,$(wildcard colors/[abcdefghijklmnopqrstuvwxyz]*))
 COLORFILES := $(patsubst colors/%,$(ETC)/colors/%,$(COLORSRC))
 
-#compile if LFS Large File Support present:
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
-
 default: lib $(FMODE_OBJ) $(DATAFILES) $(COLORFILES) $(ETC)/colors.desc $(ETC)/element_list
 
 ifdef MINGW

lib/gis/seek.c

@@ -1,5 +1,4 @@
 
-#include <grass/config.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <grass/gis.h>
@@ -7,7 +6,7 @@
 
 off_t G_ftell(FILE *fp)
 {
-#ifdef HAVE_LARGEFILES
+#ifdef HAVE_FSEEKO
     return ftello(fp);
 #else
     return (off_t) ftell(fp);
@@ -16,7 +15,7 @@ off_t G_ftell(FILE *fp)
 
 void G_fseek(FILE *fp, off_t offset, int whence)
 {
-#ifdef HAVE_LARGEFILES
+#ifdef HAVE_FSEEKO
     if (fseeko(fp, offset, whence) != 0)
 	G_fatal_error(_("unable to seek"));
 #else

lib/iostream/Makefile

@@ -4,9 +4,6 @@ LIB = IOSTREAM
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 ifneq ($(strip $(CXX)),)
 default: stlib

lib/raster/Makefile

@@ -7,11 +7,6 @@ include $(MODULE_TOPDIR)/include/Make/Vars.make
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-#compile if LFS Large File Support present:
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
-
 ifneq ($(GDAL_LINK),)
 EXTRA_CFLAGS += -DGDAL_LINK=1
 EXTRA_INC += $(PROJINC) $(GDALCFLAGS)

lib/segment/Makefile

@@ -6,11 +6,6 @@ LIB = SEGMENT
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-#compile if LFS Large File Support present:
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
-
 default: lib
 
 #doxygen:

lib/vector/diglib/Makefile

@@ -19,15 +19,20 @@ else
 	TESTFILE = test32.ok
 endif
 
-TEST = $(OBJDIR)/test
+TEST = $(OBJDIR)/test$(EXE)
 
 default: lib
-	$(MAKE) $(TEST)
+	@echo "==============TEST============="
+	$(MAKE) test
+
+test: $(OBJDIR)/test.tmp $(TESTFILE)
+	diff $(OBJDIR)/test.tmp $(TESTFILE)
+
+$(OBJDIR)/test.tmp: $(TEST)
+	cd $(OBJDIR) && $(call run_grass,./test)
 
 #  Test portable read/write functions
-$(OBJDIR)/test: test.c $(DIG2DEP)
-	echo "==============TEST============="
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) $(INC) $(VECT_INC) -o $@ test.c $(DIG2LIB) $(RTREELIB) \
-				$(GISLIB) $(DATETIMELIB) $(MATHLIB) $(XDRLIB) 
-	cd $(OBJDIR); $(LD_LIBRARY_PATH_VAR)="$($(LD_LIBRARY_PATH_VAR)):$(GISBASE)/lib" ./test; diff ./test.tmp ../$(TESTFILE)
+$(TEST):  $(OBJDIR)/test.o $(DIG2DEP)
+	$(call linker)
 
+$(TEST): LIBES = $(DIG2LIB)

lib/vector/rtree/Makefile

@@ -4,12 +4,6 @@ LIB = RTREE
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-
-#compile if LFS (Large File Support) present:
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
-endif
-
 RTLINC = $(ARCH_INCDIR)/rtree
 HEADERS := $(RTLINC)/card.h $(RTLINC)/index.h $(RTLINC)/split.h \
 	$(ARCH_INCDIR)/rtree.h
@@ -27,8 +21,3 @@ $(RTLINC)/%.h: %.h | $(RTLINC)
 
 $(ARCH_INCDIR)/rtree.h: rtree.h
 	$(INSTALL_DATA) $< $@
-
-$(OBJDIR)/test: test.c
-	$(CC) $(CFLAGS) $(EXTRA_FLAGS) $(LDFLAGS) $(INC) -o $@ test.c $(RTREELIB) -lm
-	cd $(OBJDIR) && ./test
-

lib/vector/transform/Makefile

@@ -5,11 +5,6 @@ LIB = TRANS
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-#compile if LFS (Large File Support) present:
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
-endif
-
 default: lib
 
 

raster/r.grow.distance/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

raster/r.in.arc/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

raster/r.in.ascii/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

raster/r.out.arc/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

raster/r.out.ascii/Makefile

@@ -7,8 +7,5 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

raster/r.proj/Makefile

@@ -8,8 +8,5 @@ EXTRA_INC = $(PROJINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
-endif
 
 default: cmd

raster/r.terraflow/Makefile

@@ -8,9 +8,6 @@ DEPENDENCIES = $(RASTERDEP) $(GISDEP) $(IOSTREAMDEP)
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 EXTRA_CFLAGS = -DUSER=\"$(USER)\" -DNODATA_FIX -DELEV_FLOAT -Wno-sign-compare
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
-endif
 
 LINK = $(CXX)
 

raster3d/r3.in.v5d/Makefile

@@ -5,11 +5,6 @@ PGM=r3.in.v5d
 #for Linux/x86 et al. (needs fix for MacOSX)
 EXTRA_CFLAGS = -DLITTLE
 
-#compile if LFS Large File Support present:
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
-endif
-
 LIBES = $(G3DLIB) $(GISLIB) $(MATHLIB)
 DEPENDENCIES = $(G3DDEP) $(GISDEP)
 

raster3d/r3.out.v5d/Makefile

@@ -5,11 +5,6 @@ PGM=r3.out.v5d
 #for Linux/x86 et al. (needs fix for MacOSX)
 EXTRA_CFLAGS = -DLITTLE
 
-#compile if LFS Large File Support present:
-ifneq ($(USE_LARGEFILES),)
-	EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
-endif
-
 LIBES = $(G3DLIB) $(GISLIB) $(MATHLIB)
 DEPENDENCIES = $(G3DDEP) $(GISDEP)