[GRASS-SVN] r72611 - in grass/trunk: display/d.grid display/d.where general/g.proj general/g.version include/Make raster/r.horizon raster/r.latlong raster/r.proj raster/r.sun raster/r.sunhours raster/r.sunmask raster3d/r3.out.netcdf

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Apr 9 06:48:45 PDT 2018 

Author: neteler
Date: 2018-04-09 06:48:44 -0700 (Mon, 09 Apr 2018)
New Revision: 72611

Modified:
   grass/trunk/display/d.grid/Makefile
   grass/trunk/display/d.where/Makefile
   grass/trunk/general/g.proj/Makefile
   grass/trunk/general/g.version/Makefile
   grass/trunk/include/Make/Platform.make.in
   grass/trunk/raster/r.horizon/Makefile
   grass/trunk/raster/r.latlong/Makefile
   grass/trunk/raster/r.proj/Makefile
   grass/trunk/raster/r.sun/Makefile
   grass/trunk/raster/r.sunhours/Makefile
   grass/trunk/raster/r.sunmask/Makefile
   grass/trunk/raster3d/r3.out.netcdf/Makefile
Log:
Makefiles: remove hardcoded GDALCFLAGS from PROJINC definition

Modified: grass/trunk/display/d.grid/Makefile
===================================================================
--- grass/trunk/display/d.grid/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/display/d.grid/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -4,7 +4,7 @@
 
 LIBES = $(DISPLAYLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(MATHLIB)
 DEPENDENCIES = $(DISPLAYDEP) $(GPROJDEP) $(SYMBDEP) $(GISDEP)
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/display/d.where/Makefile
===================================================================
--- grass/trunk/display/d.where/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/display/d.where/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -4,7 +4,7 @@
 
 LIBES = $(DISPLAYLIB) $(GPROJLIB) $(GISLIB)
 DEPENDENCIES = $(DISPLAYDEP) $(GPROJDEP) $(GISDEP)
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/general/g.proj/Makefile
===================================================================
--- grass/trunk/general/g.proj/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/general/g.proj/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -2,7 +2,7 @@
 
 PGM = g.proj
 
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 LIBES = $(GPROJLIB) $(GISLIB) $(GDALLIBS) $(PROJLIB)
 DEPENDENCIES = $(GPROJDEP) $(GISDEP)
 

Modified: grass/trunk/general/g.version/Makefile
===================================================================
--- grass/trunk/general/g.version/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/general/g.version/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -5,7 +5,7 @@
 # cat the COPYING file, add a c line-break \n at each line end
 # and remove the unix newline (see: include/Makefile)
 
-EXTRA_CFLAGS = $(PROJINC) $(GEOSCFLAGS) $(SQLITEINCPATH) \
+EXTRA_CFLAGS = $(PROJINC) $(GDALCFLAGS) $(GEOSCFLAGS) $(SQLITEINCPATH) \
 	-DGRASS_VERSION_NUMBER=\"'$(GRASS_VERSION_NUMBER)'\" \
 	-DGRASS_VERSION_DATE=\"'$(GRASS_VERSION_DATE)'\" \
 	-DGRASS_VERSION_SVN=\"'$(GRASS_VERSION_SVN)'\" \
@@ -18,4 +18,3 @@
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd
-

Modified: grass/trunk/include/Make/Platform.make.in
===================================================================
--- grass/trunk/include/Make/Platform.make.in	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/include/Make/Platform.make.in	2018-04-09 13:48:44 UTC (rev 72611)
@@ -194,7 +194,7 @@
 FTLIB               = @FTLIB@
 
 #PROJ.4:
-PROJINC             = @PROJINC@ $(GDALCFLAGS)
+PROJINC             = @PROJINC@
 PROJLIB             = @PROJLIB@
 NAD2BIN             = @NAD2BIN@
 PROJSHARE           = @PROJSHARE@

Modified: grass/trunk/raster/r.horizon/Makefile
===================================================================
--- grass/trunk/raster/r.horizon/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/raster/r.horizon/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -4,7 +4,7 @@
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB) $(PROJLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.latlong/Makefile
===================================================================
--- grass/trunk/raster/r.latlong/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/raster/r.latlong/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -4,8 +4,8 @@
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-
 default: cmd

Modified: grass/trunk/raster/r.proj/Makefile
===================================================================
--- grass/trunk/raster/r.proj/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/raster/r.proj/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -7,9 +7,8 @@
 
 EXTRA_LIBS = $(OMPLIB)
 EXTRA_CFLAGS = $(OMPCFLAGS)
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-
 default: cmd

Modified: grass/trunk/raster/r.sun/Makefile
===================================================================
--- grass/trunk/raster/r.sun/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/raster/r.sun/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -4,7 +4,7 @@
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB) $(GMATHLIB) $(PROJLIB) $(OMPLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP) $(GMATHDEP)
-EXTRA_INC = $(PROJINC) $(OCLINCPATH)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS) $(OCLINCPATH)
 EXTRA_CFLAGS = $(OMPCFLAGS)
 EXTRA_LIBS = $(OCLLIB)
 #needed?  LIBES += $(OCLLIBPATH)  or  EXTRA_LDFLAGS = $(OCLLIBPATH)

Modified: grass/trunk/raster/r.sunhours/Makefile
===================================================================
--- grass/trunk/raster/r.sunhours/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/raster/r.sunhours/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -4,6 +4,7 @@
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster/r.sunmask/Makefile
===================================================================
--- grass/trunk/raster/r.sunmask/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/raster/r.sunmask/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -4,6 +4,7 @@
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/raster3d/r3.out.netcdf/Makefile
===================================================================
--- grass/trunk/raster3d/r3.out.netcdf/Makefile	2018-04-09 11:19:57 UTC (rev 72610)
+++ grass/trunk/raster3d/r3.out.netcdf/Makefile	2018-04-09 13:48:44 UTC (rev 72611)
@@ -5,7 +5,7 @@
 LIBES = $(RASTER3DLIB) $(GPROJLIB) $(GISLIB) $(GDALLIBS) $(NETCDFLIBS) $(PROJLIB) $(DATETIMELIB)
 DEPENDENCIES = $(RASTER3DDEP) $(GISDEP) $(GPROJDEP) $(DATETIMEDEP)
 
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 EXTRA_CFLAGS = $(NETCDFCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

More information about the grass-commit mailing list