From 2582baf21228fa0237bf1f48f5797b68fe159a80 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Mon, 22 May 2006 16:17:20 +0000
Subject: [PATCH] Ajout GDAL Nouvelle version

---
 Utilities/GDAL/port/GNUmakefile        | 31 ---------------
 Utilities/GDAL/pymod/GNUmakefile       | 52 ------------------------
 Utilities/GDAL/swig/GNUmakefile        | 32 ---------------
 Utilities/GDAL/swig/csharp/GNUmakefile | 24 -----------
 Utilities/GDAL/swig/java/GNUmakefile   | 55 --------------------------
 Utilities/GDAL/swig/perl/GNUmakefile   | 52 ------------------------
 Utilities/GDAL/swig/php/GNUmakefile    | 44 ---------------------
 Utilities/GDAL/swig/python/GNUmakefile | 27 -------------
 Utilities/GDAL/swig/ruby/GNUmakefile   | 26 ------------
 9 files changed, 343 deletions(-)
 delete mode 100644 Utilities/GDAL/port/GNUmakefile
 delete mode 100644 Utilities/GDAL/pymod/GNUmakefile
 delete mode 100644 Utilities/GDAL/swig/GNUmakefile
 delete mode 100644 Utilities/GDAL/swig/csharp/GNUmakefile
 delete mode 100644 Utilities/GDAL/swig/java/GNUmakefile
 delete mode 100644 Utilities/GDAL/swig/perl/GNUmakefile
 delete mode 100644 Utilities/GDAL/swig/php/GNUmakefile
 delete mode 100644 Utilities/GDAL/swig/python/GNUmakefile
 delete mode 100644 Utilities/GDAL/swig/ruby/GNUmakefile

diff --git a/Utilities/GDAL/port/GNUmakefile b/Utilities/GDAL/port/GNUmakefile
deleted file mode 100644
index 04ba50fde1..0000000000
--- a/Utilities/GDAL/port/GNUmakefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# CPL (Common Portability Library) makefile
-#
-
-
-ifneq ($(wildcard ../GDALmake.op?),)
-include ../GDALmake.opt
-else
-include GDALmake.opt
-endif
-
-OBJ =	cpl_conv.o cpl_error.o cpl_string.o cplgetsymbol.o cpl_dir.o \
-	cpl_strtod.o cpl_path.o cpl_csv.o cpl_findfile.o cpl_minixml.o \
-	cpl_multiproc.o cpl_list.o cpl_getexecpath.o cplstring.o \
-	cpl_vsil_win32.o cpl_vsisimple.o cpl_vsil.o cpl_vsi_mem.o \
-	cpl_vsil_unix_stdio_64.o 
-
-ifeq ($(ODBC_SETTING),yes)
-OBJ	:= 	$(OBJ) cpl_odbc.o
-endif
-
-default:	$(OBJ)
-
-clean:
-	$(RM) *.o $(LIB)
-
-install:
-	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-
-xmlreformat:	xmlreformat.o 
-	$(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
diff --git a/Utilities/GDAL/pymod/GNUmakefile b/Utilities/GDAL/pymod/GNUmakefile
deleted file mode 100644
index 4bc0240ec5..0000000000
--- a/Utilities/GDAL/pymod/GNUmakefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-include ../GDALmake.opt
-
-GDALMODULE	=	_gdalmodule
-GDALMODULE_SO   =	_gdalmodule.$(PY_SO_EXT)
-
-OBJ        	=       gdal_wrap.o numpydataset.o gdalnumeric.o
-
-CPPFLAGS	:=	$(GDAL_INCLUDE) $(PYTHON_INCLUDES) $(CPPFLAGS)
-CFLAGS		:=	$(PYTHON_CFLAGS) $(CFLAGS)
-CXXFLAGS	:=	$(PYTHON_CFLAGS) $(CXXFLAGS)
-
-PY_COMMANDS	=	epsg_tr.py gdalchksum.py gdal2xyz.py gcps2wld.py \
-			gdalimport.py gdal_merge.py pct2rgb.py rgb2pct.py \
-			gcps2vec.py
-PY_MODULES	=	gdal.py ogr.py osr.py gdalconst.py gdalnumeric.py
-
-# this is needed during install due to the _gdalmodule.so library
-# being relinked by libtool
-ifeq ($(HAVE_LIBTOOL),yes)
-LIBS	+=	-L$(GDAL_ROOT)/.libs
-endif
-
-default:	$(GDALMODULE_SO)
-
-clean:
-	$(RM) *.o *.$(SO_EXT) *.la
-
-gdal_wrap.c:	gdal.i
-	-swig -python gdal.i
-
-$(GDALMODULE_SO):	$(OBJ) $(EXE_DEP_LIBS)
-	$(PY_LD_SHARED) $(OBJ) \
-		$(GDAL_SLIB_LINK) $(PYTHON_LIBS) $(CONFIG_LIBS) -o $@
-
-%.lo:	%.o ;
-
-$(GDALMODULE).la:	$(OBJ:.o=.lo) $(EXE_DEP_LIBS)
-	$(LD) $(OBJ:.o=.lo) $(PYTHON_LIBS) $(CONFIG_LIBS) -o $@ \
-		-rpath $(INST_PYMOD) \
-		-no-undefined \
-		-avoid-version \
-		-module
-
-# special care is taken so that python scripts are installed as executables
-install:	$(GDALMODULE_SO)
-	$(INSTALL_DIR) $(INST_PYMOD)
-	$(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
-	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
-	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
-	# ugh! spurius relinking leaves a file owned by root into .libs/.
-	rm -f .libs/*.soT
diff --git a/Utilities/GDAL/swig/GNUmakefile b/Utilities/GDAL/swig/GNUmakefile
deleted file mode 100644
index f7350cfe59..0000000000
--- a/Utilities/GDAL/swig/GNUmakefile
+++ /dev/null
@@ -1,32 +0,0 @@
-
-include ../GDALmake.opt
-
-# The BINDINGS variable in GDALmake.opt contains a list of language
-# bindings to be built and installed by default.
-
-# The ALL_BINDINGS variable defines all the possible bindings.  It's used
-# in the dist and clean definitions.
-ALL_BINDINGS = python php csharp ruby perl java
-
-default: generate
-
-# The dist target should generate all the wrapper files for all supported
-# language bindings.  This should be called by the top level distribution
-# maker script prior to bundling up the source.  It eliminates the installer
-# from having the proper version of swig installled.
-dist: generate
-
-clean:
-	for dir in ${BINDINGS}; do (cd $$dir; make clean ); done
-
-veryclean:
-	for dir in ${ALL_BINDINGS}; do (cd $$dir; make veryclean ); done
-
-generate:
-	for dir in ${ALL_BINDINGS}; do (cd $$dir; make generate ); done
-
-build:
-	for dir in ${BINDINGS}; do (cd $$dir; make build ); done
-
-install:
-	for dir in ${BINDINGS}; do (cd $$dir; make install ); done
diff --git a/Utilities/GDAL/swig/csharp/GNUmakefile b/Utilities/GDAL/swig/csharp/GNUmakefile
deleted file mode 100644
index c3d33c6eb6..0000000000
--- a/Utilities/GDAL/swig/csharp/GNUmakefile
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-include ../../GDALmake.opt
-
-all: build
-
-BINDING = csharp
-include ../SWIGmake.base
-
-EXTRA_DIST = Band.cs ColorTable.cs CoordinateTransformation.cs DataSource.cs Dataset.cs Driver.cs Feature.cs FeatureDefn.cs FieldDefn.cs GCP.cs Geometry.cs Layer.cs MajorObject.cs SpatialReference.cs gdal.cs gdalPINVOKE.cs gdalconst.cs gdalconstPINVOKE.cs ogr.cs ogrPINVOKE.cs osr.cs osrPINVOKE.cs
-
-clean:
-	-rm -rf build
-
-veryclean: clean
-	-rm -f ${WRAPPERS} ${EXTRA_DIST} SWIGTYPE_p_*.cs
-
-generate: ${WRAPPERS}
-
-build: generate
-	@echo "What are you doing?  C# modules needs to be built with msvc"
-
-install: generate
-	@echo "What are you doing?  C# modules needs to be built with msvc"
diff --git a/Utilities/GDAL/swig/java/GNUmakefile b/Utilities/GDAL/swig/java/GNUmakefile
deleted file mode 100644
index d8777f45b2..0000000000
--- a/Utilities/GDAL/swig/java/GNUmakefile
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-include ../../GDALmake.opt
-include java.opt
-
-all: build
-
-BINDING = java
-include ../SWIGmake.base
-
-SHORT_NAME = $(subst _wrap,,$*)
-SWIGARGS += -outdir "org/gdal/$(SHORT_NAME)" -package "org.gdal.$(SHORT_NAME)"
-
-EXTRA_DIST = org
-
-.PHONY: makedir
-makedir:
-	mkdir -p org/gdal/gdal
-	mkdir -p org/gdal/gdalconst
-	mkdir -p org/gdal/ogr
-	mkdir -p org/gdal/osr
-
-
-JAVA_MODULES = libgdaljni.so libogrjni.so libgdalconstjni.so libosrjni.so
-
-clean:
-	-rm -f ${JAVA_MODULES}
-	-rm *.o *.lo
-
-veryclean: clean
-	-rm -f ${WRAPPERS}
-	-rm -rf ${EXTRA_DIST}
-
-generate: makedir ${WRAPPERS}
-  
-build: generate ${JAVA_MODULES}
-	cp ./.libs/*.so ./
-	ant
-
-install: generate
-	@echo "No installation to be done"
-
-
-$(JAVA_MODULES): lib%jni.so: %_wrap.o
-	$(LD) -shared $(LDFLAGS) $(CONFIG_LIBS) $< -o $@
-
-%.o: %.cpp
-	$(CXX) -fPIC $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
-
-%.o: %.cxx
-	$(CXX) -fPIC $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
-
-%.o: %.c
-	$(CC) -fPIC $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
-
diff --git a/Utilities/GDAL/swig/perl/GNUmakefile b/Utilities/GDAL/swig/perl/GNUmakefile
deleted file mode 100644
index 1f4b1d1fcf..0000000000
--- a/Utilities/GDAL/swig/perl/GNUmakefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-include ../../GDALmake.opt
-
-all: 
-
-BINDING = perl
-include ../SWIGmake.base
-
-clean:
-	-rm -f gdal.bs gdal_wrap.o
-	-rm -f gdalconst.bs gdalconst_wrap.o
-	-rm -f ogr.bs ogr_wrap.o
-	-rm -f osr.bs osr_wrap.o
-	-rm -rf blib
-	-rm -f pm_to_blib
-	-rm -f Makefile_gdal Makefile_gdalconst Makefile_ogr Makefile_osr
-
-veryclean: clean
-	-rm -f ${WRAPPERS} 
-	-rm -f gdal.pm gdalconst.pm osr.pm ogr.pm
-
-generate: ${WRAPPERS}
-
-Makefile_gdal: Makefile.PL ${GDAL_ROOT}/GDALmake.opt
-	PREFIX=${INST_PREFIX} perl Makefile.PL
-
-build:  Makefile_gdal
-	make -f Makefile_gdal
-	make -f Makefile_gdalconst
-	make -f Makefile_ogr
-	make -f Makefile_osr
-
-install: Makefile_gdal build
-	make -f Makefile_gdal install
-
-test: Makefile_gdal
-	make -f Makefile_gdal test
-
-gdal.pod.html: gdal.pod
-	pod2html gdal.pod > gdal.pod.html
-
-gdalconst.pod.html: gdalconst.pod
-	pod2html gdalconst.pod > gdalconst.pod.html
-
-ogr.pod.html: ogr.pod
-	pod2html ogr.pod > ogr.pod.html
-
-osr.pod.html: osr.pod
-	pod2html osr.pod > osr.pod.html
-
-pod2html: gdal.pod.html gdalconst.pod.html ogr.pod.html osr.pod.html
diff --git a/Utilities/GDAL/swig/php/GNUmakefile b/Utilities/GDAL/swig/php/GNUmakefile
deleted file mode 100644
index 57168ceb56..0000000000
--- a/Utilities/GDAL/swig/php/GNUmakefile
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-include ../../GDALmake.opt
-
-all: 
-
-BINDING = php
-include ../SWIGmake.base
-
-CC=gcc
-CXX=g++
-CFLAGS=-fpic
-LDFLAGS=-shared
-PHP_INC=`php-config --includes`
-EXTRA_INC=-I../../port -I../../gcore -I../../alg -I../../ogr
-EXTRA_LIB=
-
-all_libs = php_gdal.so php_ogr.so php_gdalconst.so php_osr.so
-
-PHP_MODULES   =       gdal.php gdalconst.php ogr.php osr.php
-PHP_EXTRADIST =       php_gdal.h php_gdalconst.h php_ogr.h php_osr.h
-
-clean:
-	-rm -rf ${all_libs}
-
-veryclean: clean
-	-rm -f ${WRAPPERS} ${PHP_MODULES} ${PHP_EXTRADIST}
-
-generate: ${WRAPPERS}
-
-build: php_gdal.so
-
-# This directive should actually do an install.
-install: build
-
-php_%.so: %_wrap.o
-	$(CC) $(LDFLAGS) $< -o $@ $(EXTRA_LIB)
-
-%.o: %.cpp
-	$(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
-%.o: %.cxx
-	$(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
-%.o: %.c
-	$(CC) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
diff --git a/Utilities/GDAL/swig/python/GNUmakefile b/Utilities/GDAL/swig/python/GNUmakefile
deleted file mode 100644
index b5305c0e72..0000000000
--- a/Utilities/GDAL/swig/python/GNUmakefile
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-include ../../GDALmake.opt
-
-all:
-
-BINDING = python
-include ../SWIGmake.base
-
-PY_COMMANDS     =       epsg_tr.py gdalchksum.py gdal2xyz.py gcps2wld.py \
-                        gdalimport.py gdal_merge.py pct2rgb.py rgb2pct.py \
-                        gcps2vec.py
-PY_MODULES      =       gdal.py ogr.py osr.py gdalconst.py
-
-clean:
-	-rm -rf build
-
-veryclean: clean
-	-rm -f ${WRAPPERS} ${PY_MODULES}
-
-generate: ${WRAPPERS}
-
-build:
-	python setup.py build
-
-install:
-	python setup.py install --prefix=$(prefix)
diff --git a/Utilities/GDAL/swig/ruby/GNUmakefile b/Utilities/GDAL/swig/ruby/GNUmakefile
deleted file mode 100644
index 4d3f60bbd4..0000000000
--- a/Utilities/GDAL/swig/ruby/GNUmakefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-include ../../GDALmake.opt
-
-all: build
-
-BINDING = ruby
-include ../SWIGmake.base
-
-# Add -prefix "Gdal::" to SWIGARGS
-SWIGARGS += -autorename -prefix "gdal::"
-
-clean:
-	$(MAKE) -f RubyMakefile.mk clean
-
-veryclean: clean
-	rm -f $(WRAPPERS)
-	$(MAKE) -f RubyMakefile.mk veryclean
-
-generate: ${WRAPPERS}
-
-build: ${WRAPPERS}
-	$(MAKE) -f RubyMakefile.mk build
-
-install: 
-	$(MAKE) -f RubyMakefile.mk install
-- 
GitLab