Makefiles: remove hardcoded GDALCFLAGS from PROJINC definition

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

display/d.grid/Makefile

@@ -4,7 +4,7 @@ PGM = d.grid
 
 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
 

display/d.where/Makefile

@@ -4,7 +4,7 @@ PGM = d.where
 
 LIBES = $(DISPLAYLIB) $(GPROJLIB) $(GISLIB)
 DEPENDENCIES = $(DISPLAYDEP) $(GPROJDEP) $(GISDEP)
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

general/g.proj/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = g.proj
 
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 LIBES = $(GPROJLIB) $(GISLIB) $(GDALLIBS) $(PROJLIB)
 DEPENDENCIES = $(GPROJDEP) $(GISDEP)
 

general/g.version/Makefile

@@ -5,7 +5,7 @@ PGM=g.version
 # 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 @@ DEPENDENCIES = $(GISDEP)
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd
-

include/Make/Platform.make.in

@@ -194,7 +194,7 @@ FTINC               = @FTINC@
 FTLIB               = @FTLIB@
 
 #PROJ.4:
-PROJINC             = @PROJINC@ $(GDALCFLAGS)
+PROJINC             = @PROJINC@
 PROJLIB             = @PROJLIB@
 NAD2BIN             = @NAD2BIN@
 PROJSHARE           = @PROJSHARE@

raster/r.horizon/Makefile

@@ -4,7 +4,7 @@ PGM = r.horizon
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB) $(PROJLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.latlong/Makefile

@@ -4,8 +4,8 @@ PGM = r.latlong
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-
 default: cmd

raster/r.proj/Makefile

@@ -7,9 +7,8 @@ DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
 
 EXTRA_LIBS = $(OMPLIB)
 EXTRA_CFLAGS = $(OMPCFLAGS)
-EXTRA_INC = $(PROJINC)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-
 default: cmd

raster/r.sun/Makefile

@@ -4,7 +4,7 @@ PGM = r.sun
 
 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)

raster/r.sunhours/Makefile

@@ -4,6 +4,7 @@ PGM = r.sunhours
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster/r.sunmask/Makefile

@@ -4,6 +4,7 @@ PGM = r.sunmask
 
 LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
 DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP)
+EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

raster3d/r3.out.netcdf/Makefile

@@ -5,7 +5,7 @@ PGM=r3.out.netcdf
 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