[mapserver-commits] r9898 - in trunk/mapserver/mapscript: csharp java

[svn at osgeo.org]

Author: tamas
Date: 2010-02-24 17:32:39 -0500 (Wed, 24 Feb 2010)
New Revision: 9898

Modified:
   trunk/mapserver/mapscript/csharp/Makefile.in
   trunk/mapserver/mapscript/java/Makefile.in
Log:
An attempt to fix the csharp and java makefiles

Modified: trunk/mapserver/mapscript/csharp/Makefile.in
===================================================================
--- trunk/mapserver/mapscript/csharp/Makefile.in	2010-02-24 22:12:26 UTC (rev 9897)
+++ trunk/mapserver/mapscript/csharp/Makefile.in	2010-02-24 22:32:39 UTC (rev 9898)
@@ -64,21 +64,11 @@
 PDF_LIB=  @PDF_LIB@
 PDF=      @PDF_ENABLED@
 
-# TIFF distribution (raster support for TIFF and GEOTIFF imagery). (RECOMMENDED)
-TIFF_INC= @TIFF_INC@
-TIFF_LIB= @TIFF_LIB@
-TIFF=     @TIFF_ENABLED@
-
 # JPEG distribution (raster support for grayscale JPEG images, INPUT ONLY).
 JPEG_INC= @JPEG_INC@
 JPEG_LIB= @JPEG_LIB@
 JPEG=     @JPEG_ENABLED@
 
-# EPPL7 Support (this activates ERDAS as well) Included in the distribution. Probably the best raster alternative if
-# you've got EPPL7 laying around. See http://www.lmic.state.mn.us/ for more information. (RECOMMENDED)
-EPPL=     @EPPL_ENABLED@
-EPPL_OBJ= @EPPL_OBJ@
-
 # ESRI SDE Support. You MUST have the SDE Client libraries and include files
 # on your system someplace. The actual SDE server you wish to connect to can
 # be elsewhere.
@@ -175,11 +165,11 @@
 RUNPATHS= @RPATHS@
 
 FLAGS = @DEBUG_FLAGS@ \
-        $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) $(EPPL) $(PROJ) \
-	$(OWS) $(MING) $(ORACLESPATIAL) $(TIFF) $(JPEG) $(GD) $(AGG) $(PDF) $(SDE) \
+        $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) $(PROJ) \
+	$(OWS) $(MING) $(ORACLESPATIAL) $(JPEG) $(GD) $(AGG) $(PDF) $(SDE) \
 	$(SDERASTER) $(OGR) $(GDAL) $(GEOS) $(ICONV) $(FASTCGI) $(PHP_REGEX) \
 	$(REGEX_INC) $(POSTGIS) $(MYGIS) $(THREAD) $(ZLIB) \
-	$(GD_INC) $(AGG_INC) $(PDF_INC) $(PROJ_INC) $(TIFF_INC) $(JPEG_INC) $(EGIS_INC) \
+	$(GD_INC) $(AGG_INC) $(PDF_INC) $(PROJ_INC) $(JPEG_INC) $(EGIS_INC) \
 	$(SDE_INC) $(GDAL_INC) $(POSTGIS_INC) $(MYGIS_INC) \
 	$(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC) $(GEOS_INC) $(ICONV_INC) \
 	$(FASTCGI_INC) $(ZLIB_INC) $(XML2_INC)
@@ -187,7 +177,7 @@
 CCFLAGS   = @CFLAGS@ $(FLAGS)
 
 # Link flags and shared libs only
-SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \
+SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(PROJ_LIBS) \
           $(JPEG_LIB) $(SDE_LIB) $(GDAL_LIB) $(MING_LIB) $(POSTGIS_LIB) \
 	  $(MYGIS_LIB) $(CURL_LIB) $(ORACLESPATIAL_LIB) $(GEOS_LIB) \
 	  $(THREAD_LIB) $(ICONV_LIB) $(ZLIB_LIB) $(XML2_LIB) $(XTRALIBS)

Modified: trunk/mapserver/mapscript/java/Makefile.in
===================================================================
--- trunk/mapserver/mapscript/java/Makefile.in	2010-02-24 22:12:26 UTC (rev 9897)
+++ trunk/mapserver/mapscript/java/Makefile.in	2010-02-24 22:32:39 UTC (rev 9898)
@@ -62,21 +62,11 @@
 PDF_LIB=  @PDF_LIB@
 PDF=      @PDF_ENABLED@
 
-# TIFF distribution (raster support for TIFF and GEOTIFF imagery). (RECOMMENDED)
-TIFF_INC= @TIFF_INC@
-TIFF_LIB= @TIFF_LIB@
-TIFF=     @TIFF_ENABLED@
-
 # JPEG distribution (raster support for grayscale JPEG images, INPUT ONLY).
 JPEG_INC= @JPEG_INC@
 JPEG_LIB= @JPEG_LIB@
 JPEG=     @JPEG_ENABLED@
 
-# EPPL7 Support (this activates ERDAS as well) Included in the distribution. Probably the best raster alternative if
-# you've got EPPL7 laying around. See http://www.lmic.state.mn.us/ for more information. (RECOMMENDED)
-EPPL=     @EPPL_ENABLED@
-EPPL_OBJ= @EPPL_OBJ@
-
 # ESRI SDE Support. You MUST have the SDE Client libraries and include files
 # on your system someplace. The actual SDE server you wish to connect to can
 # be elsewhere.
@@ -176,15 +166,15 @@
 RUNPATHS= @RPATHS@
 
 CCFLAGS= @CFLAGS@ @DEBUG_FLAGS@ \
-        $(IGNORE_MISSING_DATA) $(STRINGS) $(EPPL) $(PROJ) $(OWS) $(MING) \
-	$(ORACLESPATIAL) $(TIFF) $(JPEG) $(GD) $(AGG) $(PDF) $(SDE) $(OGR) $(GDAL) $(GEOS) $(ICONV) \
+        $(IGNORE_MISSING_DATA) $(STRINGS) $(PROJ) $(OWS) $(MING) \
+	$(ORACLESPATIAL) $(JPEG) $(GD) $(AGG) $(PDF) $(SDE) $(OGR) $(GDAL) $(GEOS) $(ICONV) \
 	$(POSTGIS) $(MYGIS) $(THREAD) $(GD_INC) $(AGG_INC) $(PDF_INC) \
-	$(PROJ_INC) $(TIFF_INC) $(JPEG_INC) $(EGIS_INC) $(SDE_INC) \
+	$(PROJ_INC) $(JPEG_INC) $(EGIS_INC) $(SDE_INC) \
 	$(REGEX_INC) $(GDAL_INC) $(POSTGIS_INC) $(MYGIS_INC) \
 	$(CURL_INC) $(MING_INC) $(ORACLESPATIAL_INC) $(GEOS_INC) $(ICONV_INC) $(XML2_INC)
 
 # Link flags and shared libs only
-SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \
+SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(PROJ_LIBS) \
           $(JPEG_LIB) $(SDE_LIB) $(GDAL_LIB) $(MING_LIB) $(POSTGIS_LIB) \
 	  $(MYGIS_LIB) $(CURL_LIB) $(ORACLESPATIAL_LIB) \
 	  $(THREAD_LIB) $(XTRALIBS) $(GEOS_LIB) $(ICONV_INC) $(XML2_LIB)