diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 877871271ce5..2ded08f37fb3 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -3,10 +3,10 @@ name: Android build on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: diff --git a/.github/workflows/android/start.sh b/.github/workflows/android/start.sh index 8787f3514c4a..09d7e1a7a1b6 100755 --- a/.github/workflows/android/start.sh +++ b/.github/workflows/android/start.sh @@ -55,7 +55,6 @@ tar xzf sqlite-autoconf-3250100.tar.gz # Build proj (cd proj; ./autogen.sh && PKG_CONFIG_PATH=/tmp/install/lib/pkgconfig ./configure --host=arm-linux-androideabi --prefix=/tmp/install --disable-static && make -j3 && make install) -cd gdal ./autogen.sh ./configure --host=arm-linux-androideabi --with-proj=/tmp/install --with-sqlite3=/tmp/install make USER_DEFS="-Wextra -Werror" -j3 diff --git a/.github/workflows/asan/start.sh b/.github/workflows/asan/start.sh index e421f067a5d0..b536a91005ae 100755 --- a/.github/workflows/asan/start.sh +++ b/.github/workflows/asan/start.sh @@ -80,12 +80,9 @@ sudo sh -c "apt-get remove -y libproj-dev" export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH -CURRENT_DIR=$PWD -cd gdal - ./autogen.sh SANITIZE_FLAGS="-DMAKE_SANITIZE_HAPPY -fsanitize=undefined -fsanitize=address -fsanitize=unsigned-integer-overflow" -CFLAGS=$SANITIZE_FLAGS CXXFLAGS=$SANITIZE_FLAGS LDFLAGS="-fsanitize=undefined -fsanitize=address -lstdc++" ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --without-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-libtiff=internal --with-rename-internal-libtiff-symbols --with-hide-internal-symbols --with-gnm --with-proj=/usr/local --with-fgdb=$PWD/../FileGDB_API-64gcc51 +CFLAGS=$SANITIZE_FLAGS CXXFLAGS=$SANITIZE_FLAGS LDFLAGS="-fsanitize=undefined -fsanitize=address -lstdc++" ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --without-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-libtiff=internal --with-rename-internal-libtiff-symbols --with-hide-internal-symbols --with-gnm --with-proj=/usr/local --with-fgdb=$PWD/FileGDB_API-64gcc51 sed -i "s/-fsanitize=address/-fsanitize=address -shared-libasan/g" GDALmake.opt sed -i "s/-fsanitize=unsigned-integer-overflow/-fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow/g" GDALmake.opt make USER_DEFS="-Werror" -j3 @@ -108,8 +105,6 @@ sudo ldconfig ccache -s -cd "$CURRENT_DIR" - echo "Saving ccache..." rm -f "$WORK_DIR/ccache.tar.gz" (cd $HOME && tar czf "$WORK_DIR/ccache.tar.gz" .ccache) diff --git a/.github/workflows/asan_build.yml b/.github/workflows/asan_build.yml index a37b5905222c..a1cb5c1fdfac 100644 --- a/.github/workflows/asan_build.yml +++ b/.github/workflows/asan_build.yml @@ -3,10 +3,10 @@ name: ASAN build on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: diff --git a/.github/workflows/clang_static_analyzer.yml b/.github/workflows/clang_static_analyzer.yml index 3e48b9f2edad..67708b36616d 100644 --- a/.github/workflows/clang_static_analyzer.yml +++ b/.github/workflows/clang_static_analyzer.yml @@ -3,10 +3,10 @@ name: CLang Static Analyzer on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2 - name: Run - run: docker run --rm -v $PWD:$PWD ubuntu:16.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./gdal/ci/travis/csa_part_1/before_install.sh && sh ./gdal/ci/travis/csa_part_1/install.sh && sh ./gdal/ci/travis/csa_part_1/script.sh" + run: docker run --rm -v $PWD:$PWD ubuntu:16.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./ci/travis/csa_part_1/before_install.sh && sh ./ci/travis/csa_part_1/install.sh && sh ./ci/travis/csa_part_1/script.sh" clang_static_analyzer_part_2: runs-on: ubuntu-20.04 @@ -29,4 +29,4 @@ jobs: uses: actions/checkout@v2 - name: Run - run: docker run --rm -v $PWD:$PWD ubuntu:16.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./gdal/ci/travis/csa_part_2/before_install.sh && sh ./gdal/ci/travis/csa_part_2/install.sh && sh ./gdal/ci/travis/csa_part_2/script.sh" + run: docker run --rm -v $PWD:$PWD ubuntu:16.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./ci/travis/csa_part_2/before_install.sh && sh ./ci/travis/csa_part_2/install.sh && sh ./ci/travis/csa_part_2/script.sh" diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml index 8f209994b18e..7c501fd239a1 100644 --- a/.github/workflows/code_checks.yml +++ b/.github/workflows/code_checks.yml @@ -3,10 +3,10 @@ name: Code Checks on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: @@ -23,10 +23,10 @@ jobs: sudo apt install -y cppcheck libsqlite3-dev ccache sqlite3 libproj-dev - name: Run configure - run: (cd gdal && ./autogen.sh && ./configure) + run: (./autogen.sh && ./configure) - name: Run cppcheck test - run: ./gdal/scripts/cppcheck.sh + run: ./scripts/cppcheck.sh code_quality_checks: runs-on: ubuntu-latest @@ -35,19 +35,19 @@ jobs: uses: actions/checkout@v2 - name: Detect tabulations - run: ./gdal/scripts/detect_tabulations.sh + run: ./scripts/detect_tabulations.sh - name: Detect printf - run: ./gdal/scripts/detect_printf.sh + run: ./scripts/detect_printf.sh - name: Detect self assignments - run: ./gdal/scripts/detect_self_assignment.sh + run: ./scripts/detect_self_assignment.sh - name: Detect suspicious char digit zero - run: ./gdal/scripts/detect_suspicious_char_digit_zero.sh + run: ./scripts/detect_suspicious_char_digit_zero.sh - name: Shellcheck - run: shellcheck -e SC2086,SC2046,SC2164,SC2054 $(find gdal -name '*.sh' -a -not -name ltmain.sh) + run: shellcheck -e SC2086,SC2046,SC2164,SC2054 $(find . -name '*.sh' -a -not -name ltmain.sh -a -not -wholename "./autotest/*" -a -not -wholename "./.github/*") flake8: runs-on: ubuntu-latest @@ -64,7 +64,7 @@ jobs: run: | export FLAKE8="flake8 --config autotest/setup.cfg" $FLAKE8 autotest - $FLAKE8 gdal/swig/python/gdal-utils/ + $FLAKE8 swig/python/gdal-utils/ doxygen: runs-on: ubuntu-18.04 @@ -79,6 +79,6 @@ jobs: - name: Run doxygen run: | - cd gdal/doc + cd doc make .doxygen_up_to_date >log.txt 2>&1 if grep -i warning log.txt | grep -v -e russian -e brazilian; then echo "Doxygen warnings found" && cat log.txt && /bin/false; else echo "No Doxygen warnings found"; fi diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index d8c1430ccaf0..3072b2ac30ef 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -3,11 +3,11 @@ name: Conda on: push: paths-ignore: - - 'gdal/doc/**' - # Disabled because of https://github.com/OSGeo/gdal/issues/4599 + - 'doc/**' + # Disabled because of https://github.com/OSGeo/issues/4599 #pull_request: # paths-ignore: - # - 'gdal/doc/**' + # - 'doc/**' jobs: @@ -35,7 +35,7 @@ jobs: - name: Setup shell: bash -l {0} run: | - source ./gdal/ci/travis/conda/setup.sh + source ./ci/travis/conda/setup.sh - name: Support longpaths run: git config --system core.longpaths true @@ -44,7 +44,7 @@ jobs: - name: Build shell: bash -l {0} run: | - source ../gdal/ci/travis/conda/compile.sh + source ../ci/travis/conda/compile.sh working-directory: ./gdal-feedstock - uses: ilammy/msvc-dev-cmd@v1 @@ -61,5 +61,5 @@ jobs: env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} run: | - source ../gdal/ci/travis/conda/upload.sh || true + source ../ci/travis/conda/upload.sh || true working-directory: ./gdal-feedstock diff --git a/.github/workflows/fedora_rawhide.yml b/.github/workflows/fedora_rawhide.yml index 329ad9f009b9..829a2bc3326d 100644 --- a/.github/workflows/fedora_rawhide.yml +++ b/.github/workflows/fedora_rawhide.yml @@ -3,10 +3,10 @@ name: Fedora Rawhide on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: diff --git a/.github/workflows/fedora_rawhide/start.sh b/.github/workflows/fedora_rawhide/start.sh index 3cb9d30fdfd9..c60be6190722 100755 --- a/.github/workflows/fedora_rawhide/start.sh +++ b/.github/workflows/fedora_rawhide/start.sh @@ -49,8 +49,6 @@ ccache -M 1G ccache -s # Configure GDAL -CURRENT_DIR=$PWD -cd gdal ./autogen.sh CC='ccache clang' CXX='ccache clang++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-python=/usr/bin/python3 --with-poppler --with-spatialite --with-liblzma --with-webp --with-hdf4 --with-hdf5 --with-armadillo @@ -58,7 +56,7 @@ make USER_DEFS=-Werror -j$(nproc) (cd apps && make USER_DEFS=-Werror -j$(nproc) test_ogrsf) make install ldconfig -cd "$CURRENT_DIR" + (cd autotest/cpp && make -j3) ccache -s diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index db8d4d07d265..060dca8b14e5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,10 +3,10 @@ name: MacOS build on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: @@ -26,17 +26,17 @@ jobs: - name: Install Requirements shell: bash -l {0} run: | - source ./gdal/ci/travis/osx/before_install.sh + source ./ci/travis/osx/before_install.sh - name: Build shell: bash -l {0} run: | - source ./gdal/ci/travis/osx/install.sh + source ./ci/travis/osx/install.sh - name: Run tests shell: bash -l {0} run: | - source ./gdal/ci/travis/osx/script.sh + source ./ci/travis/osx/script.sh env: # Emulate a few Travis-CI env variable so that some tests get properly skipped TRAVIS: true diff --git a/.github/workflows/mingw_w64.yml b/.github/workflows/mingw_w64.yml index f64b161f5013..033489cbfd7c 100644 --- a/.github/workflows/mingw_w64.yml +++ b/.github/workflows/mingw_w64.yml @@ -3,10 +3,10 @@ name: mingw_w64 build on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: diff --git a/.github/workflows/mingw_w64/start.sh b/.github/workflows/mingw_w64/start.sh index 5333effb5ad8..727792d600b7 100755 --- a/.github/workflows/mingw_w64/start.sh +++ b/.github/workflows/mingw_w64/start.sh @@ -75,7 +75,6 @@ tar xzf sqlite-autoconf-3250100.tar.gz (cd proj; sudo make -j3 install) # build GDAL -cd gdal ./autogen.sh ./configure --host=x86_64-w64-mingw32 --with-proj=/tmp/install make USER_DEFS="-Wextra -Werror" -j3 @@ -90,7 +89,7 @@ cd swig/python ln -s "$WINEPREFIX/drive_c/users/root/Local Settings/Application Data/Programs/Python/Python37" $WINEPREFIX/drive_c/Python37 gendef $WINEPREFIX/drive_c/Python37/python37.dll x86_64-w64-mingw32-dlltool --dllname $WINEPREFIX/drive_c/Python37/python37.dll --input-def python37.def --output-lib $WINEPREFIX/drive_c/Python37/libs/libpython37.a -bash fallback_build_mingw32_under_unix_py37.sh +bash fallback_build_mingw32_under_unix_py37.sh cd ../.. ccache -s @@ -101,7 +100,7 @@ rm -f "$WORK_DIR/ccache.tar.gz" wine64 apps/gdalinfo.exe --version -cd ../autotest +cd autotest # Does not work under wine rm -f gcore/rfc30.py rm -f pyscripts/data/test_utf8* @@ -116,7 +115,7 @@ export PYTEST="wine64 $PYTHON_DIR/python.exe -m pytest -vv -p no:sugar --color=n # Run all the Python autotests -GDAL_DATA=$PWD/../gdal/data \ - PYTHONPATH=$PWD/../gdal/swig/python/build/lib.win-amd64-3.7 \ - PATH=$PWD/../gdal:$PWD/../gdal/apps/.libs:$PWD:$PATH \ +GDAL_DATA=$PWD/../data \ + PYTHONPATH=$PWD/../swig/python/build/lib.win-amd64-3.7 \ + PATH=$PWD/../gdal:$PWD/../apps/.libs:$PWD:$PATH \ $PYTEST diff --git a/.github/workflows/ubuntu_18.04.yml b/.github/workflows/ubuntu_18.04.yml index ca6512df2ba3..1d4eb1204c95 100644 --- a/.github/workflows/ubuntu_18.04.yml +++ b/.github/workflows/ubuntu_18.04.yml @@ -3,10 +3,10 @@ name: Ubuntu 18.04 build on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: diff --git a/.github/workflows/ubuntu_18.04/install.sh b/.github/workflows/ubuntu_18.04/install.sh index 8a6f236287fd..32840499f1ad 100755 --- a/.github/workflows/ubuntu_18.04/install.sh +++ b/.github/workflows/ubuntu_18.04/install.sh @@ -42,8 +42,6 @@ sudo sh -c "apt-get remove -y libproj-dev" export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # Configure GDAL -CURRENT_DIR=$PWD -cd gdal ./autogen.sh CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-rasterlite2 --with-fgdb=/usr # --enable-debug --with-podofo @@ -56,7 +54,7 @@ sudo rm -f /usr/lib/libgdal.so* sudo make install sudo ldconfig sudo ln -s libgdal.so /usr/lib/libgdal.so.20 -cd "$CURRENT_DIR" + (cd autotest/cpp && make -j3) ccache -s diff --git a/.github/workflows/ubuntu_18.04_32bit.yml b/.github/workflows/ubuntu_18.04_32bit.yml index 68177138337c..4829aa48cc79 100644 --- a/.github/workflows/ubuntu_18.04_32bit.yml +++ b/.github/workflows/ubuntu_18.04_32bit.yml @@ -3,10 +3,10 @@ name: Ubuntu 18.04 32bit build on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: diff --git a/.github/workflows/ubuntu_18.04_32bit/start.sh b/.github/workflows/ubuntu_18.04_32bit/start.sh index f136f4693e14..f48f1c8500c3 100755 --- a/.github/workflows/ubuntu_18.04_32bit/start.sh +++ b/.github/workflows/ubuntu_18.04_32bit/start.sh @@ -68,8 +68,6 @@ sudo sh -c "apt-get remove -y libproj-dev" export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # Configure GDAL -CURRENT_DIR=$PWD -cd gdal ./autogen.sh CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-rasterlite2 --enable-debug --with-libtiff=internal --with-hide-internal-symbols @@ -79,7 +77,7 @@ sudo rm -f /usr/lib/libgdal.so* sudo make install sudo ldconfig sudo ln -s libgdal.so /usr/lib/libgdal.so.20 -cd "$CURRENT_DIR" + (cd autotest/cpp && make -j3) ccache -s diff --git a/.github/workflows/ubuntu_20.04.yml b/.github/workflows/ubuntu_20.04.yml index fb29e519fbc6..95ac263130ec 100644 --- a/.github/workflows/ubuntu_20.04.yml +++ b/.github/workflows/ubuntu_20.04.yml @@ -3,10 +3,10 @@ name: Ubuntu 20.04 build on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: @@ -65,23 +65,23 @@ jobs: run: docker run -e GITHUB_WORKFLOW --rm gdal sh -c "cd /build/autotest/cpp && make quick_test && make testsse2 && (if (g++ -march=native -dM -E -x c++ - < /dev/null | grep AVX2 >/dev/null); then make testavx2; else /bin/true; fi)" - name: Run SWIG Perl tests - run: docker run --rm gdal sh -c "cd /build/gdal/swig/perl && make test" + run: docker run --rm gdal sh -c "cd /build/swig/perl && make test" - name: Run SWIG Java tests - run: docker run --rm gdal sh -c "cd /build/gdal/swig/java && make test" + run: docker run --rm gdal sh -c "cd /build/swig/java && make test" - name: Run SWIG CSharp tests - run: docker run --rm gdal sh -c "cd /build/gdal/swig/csharp && make && make test" + run: docker run --rm gdal sh -c "cd /build/swig/csharp && make && make test" - name: Build GDAL Python sdist distribution - run: docker run --rm gdal sh -c "cd /build/gdal/swig/python && python3 setup.py sdist" + run: docker run --rm gdal sh -c "cd /build/swig/python && python3 setup.py sdist" - name: Build gdal-utils Python bdist_wheel distribution - run: docker run --rm gdal sh -c "cd /build/gdal/swig/python/gdal-utils && python3 -m pip install wheel && python3 setup.py bdist_wheel" + run: docker run --rm gdal sh -c "cd /build/swig/python/gdal-utils && python3 -m pip install wheel && python3 setup.py bdist_wheel" - name: Run pytest # --security-opt seccomp=unconfined, so that the userfaulfd syscall is available run: docker run -e CI -e TRAVIS=yes -e TRAVIS_BRANCH=ubuntu_2004 -e GITHUB_WORKFLOW --security-opt seccomp=unconfined --rm gdal sh -c "cd /build/autotest && pip3 install -U -r requirements.txt && pytest" - name: Build fake ossfuzz fuzzers - run: docker run --rm gdal sh -c "cd /build/gdal/fuzzers && make dummyfuzzers_dynamic" + run: docker run --rm gdal sh -c "cd /build/fuzzers && make dummyfuzzers_dynamic" diff --git a/.github/workflows/ubuntu_20.04/build.sh b/.github/workflows/ubuntu_20.04/build.sh index 8e62feca5b0b..5daea8b103dc 100755 --- a/.github/workflows/ubuntu_20.04/build.sh +++ b/.github/workflows/ubuntu_20.04/build.sh @@ -23,7 +23,7 @@ else export OTHER_SWITCHES="--enable-debug " fi -cd /build/gdal +cd /build ./autogen.sh @@ -75,9 +75,9 @@ make "-j$(nproc)" USER_DEFS=-Werror make install "-j$(nproc)" ldconfig -(cd ../autotest/cpp && make "-j$(nproc)") +(cd autotest/cpp && make "-j$(nproc)") -#(cd ../autotest/cpp && \ +#(cd autotest/cpp && \ # make vsipreload.so && \ # LD_PRELOAD=./vsipreload.so gdalinfo /vsicurl/http://download.osgeo.org/gdal/data/ecw/spif83.ecw && \ # LD_PRELOAD=./vsipreload.so sqlite3 /vsicurl/http://download.osgeo.org/gdal/data/sqlite3/polygon.db "select * from polygon limit 10" diff --git a/.github/workflows/validate_xml.yml b/.github/workflows/validate_xml.yml index 8d7dedeb7e8f..dbc8007a6c25 100644 --- a/.github/workflows/validate_xml.yml +++ b/.github/workflows/validate_xml.yml @@ -3,10 +3,10 @@ name: Validate XML on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: @@ -24,6 +24,6 @@ jobs: - name: Run xmllint checks run: | - xmllint --schema ./gdal/data/nitf_spec.xsd ./gdal/data/nitf_spec.xml --noout - xmllint --schema ./gdal/data/vdv452.xsd ./gdal/data/vdv452.xml --noout - xmllint --schema ./gdal/data/gmlasconf.xsd ./gdal/data/gmlasconf.xml --noout + xmllint --schema ./data/nitf_spec.xsd ./data/nitf_spec.xml --noout + xmllint --schema ./data/vdv452.xsd ./data/vdv452.xml --noout + xmllint --schema ./data/gmlasconf.xsd ./data/gmlasconf.xml --noout diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 88190672bb86..b6e61b0ecc64 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -3,10 +3,10 @@ name: Windows builds on: push: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' pull_request: paths-ignore: - - 'gdal/doc/**' + - 'doc/**' jobs: @@ -198,7 +198,7 @@ jobs: $env:NMAKE_LOCAL+="WEBP_LIBS = /NODEFAULTLIB:libcmt.lib `$(SDK_PREFIX)\libwebp-1.0.3-windows-x86\lib\libwebp.lib`n" $env:NMAKE_LOCAL+="LIBDEFLATE_CFLAGS = -I`$(SDK_PREFIX)`n" $env:NMAKE_LOCAL+="LIBDEFLATE_LIB = `$(SDK_PREFIX)\libdeflate.lib`n" - $env:NMAKE_LOCAL | Set-Content "$env:GITHUB_WORKSPACE\gdal\nmake.local" + $env:NMAKE_LOCAL | Set-Content "$env:GITHUB_WORKSPACE\nmake.local" # cd $env:GITHUB_WORKSPACE cd proj @@ -218,17 +218,17 @@ jobs: Invoke-WebRequest "http://download.osgeo.org/proj/proj-datumgrid-1.8.zip" -OutFile "proj-datumgrid-1.8.zip" 7z x proj-datumgrid-1.8.zip -aoa # - cd $env:GITHUB_WORKSPACE\gdal + cd $env:GITHUB_WORKSPACE copy $env:GITHUB_WORKSPACE\install-proj\bin\*.dll . exec { nmake /f makefile.vc MSVC_VER=$env:MSVC_VER $env:WIN64_ARG USER_DEFS="/WX $env:ARCH_FLAGS" } cd apps exec { nmake /f makefile.vc test_ogrsf.exe MSVC_VER=$env:MSVC_VER $env:WIN64_ARG USER_DEFS=/WX } $env:DISTUTILS_USE_SDK=1 $env:MSSdk=1 - cd $env:GITHUB_WORKSPACE\gdal\swig\python + cd $env:GITHUB_WORKSPACE\swig\python exec { python setup.py build } exec { python setup.py install } - cd $env:GITHUB_WORKSPACE\gdal\swig\csharp + cd $env:GITHUB_WORKSPACE\swig\csharp dotnet nuget locals all --clear dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org dotnet restore @@ -251,10 +251,10 @@ jobs: $env:SDK_BIN="$env:SDK_PREFIX\bin" # Set USE_PATH_FOR_GDAL_PYTHON=YES and include a fake path in the PATH # to test robustness to nonexistent paths (only relevant for python>=3.8) - # See https://github.com/OSGeo/gdal/issues/3898 + # See https://github.com/OSGeo/issues/3898 $env:USE_PATH_FOR_GDAL_PYTHON="YES" - $env:PATH="$env:GITHUB_WORKSPACE\gdal;$env:GITHUB_WORKSPACE\gdal\apps;$env:SDK_PREFIX\dll;$env:SDK_PREFIX;$env:SDK_BIN;$env:GITHUB_WORKSPACE\not_a_real_path;$env:PATH" - $env:GDAL_DATA="$env:GITHUB_WORKSPACE\gdal\data" + $env:PATH="$env:GITHUB_WORKSPACE;$env:GITHUB_WORKSPACE\apps;$env:SDK_PREFIX\dll;$env:SDK_PREFIX;$env:SDK_BIN;$env:GITHUB_WORKSPACE\not_a_real_path;$env:PATH" + $env:GDAL_DATA="$env:GITHUB_WORKSPACE\data" $env:DO_NOT_FAIL_ON_RECODE_ERRORS="YES" $env:MDB_ODBC_DRIVER_INSTALLED="YES" # The ca-bundle.crt file which we could point to is invalid in the current SDK @@ -265,5 +265,5 @@ jobs: cd $env:GITHUB_WORKSPACE\autotest pip install -Ur requirements.txt exec { pytest -vv } - cd $env:GITHUB_WORKSPACE\gdal\swig\csharp + cd $env:GITHUB_WORKSPACE\swig\csharp exec { nmake /f makefile.vc test } diff --git a/.gitignore b/.gitignore index bb03912da85b..878c8e6f2c69 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,148 @@ -*.pyc +GDALmake.opt +autom4te.cache +detectavx.dSYM +detectsse.dSYM +gdal.pc +config.log +config.status +configure +aclocal.m4 +libtool +cpl_config.h +clean_main_build_output.bat *.o +*.res *.obj +*.lib +*.exe +*.exe.manifest +*.dll +*.pdb +*.idb +*.ilk +*.dll.manifest +*.exp +*.lo +*.la *.so -*~ +.libs +*.pyc +*.sdf +*.sln +*.vcxproj +*.vcxproj.filters +*.vcxproj.user +*.VC.db +*.VC.opendb *.swp -*.lo - +/[Dd]ebug +/[Rr]elease +/x64 +/.vs +/.vscode +/nbproject +frmts/jpipkak/kdu_cache.cpp +frmts/jpipkak/kdu_cache_wrapper.h +frmts/msg/PublicDecompWT/ +frmts/msg/PublicDecompWT_all.h +frmts/jpeg/libjpeg12/*.c +frmts/jpeg/libjpeg12/*.h +gcore/gdal_version.h +libgdal.a +libgdal.so +libgdal.so.* +apps/gdal-config +apps/gdal-config-inst +apps/gdal_contour +apps/gdal_grid +apps/gdal_rasterize +apps/gdal_translate +apps/gdal_viewshed +apps/gdaladdo +apps/gdalbuildvrt +apps/gdaldem +apps/gdalenhance +apps/gdalinfo +apps/gdalmdiminfo +apps/gdalmdimtranslate +apps/gdallocationinfo +apps/gdalmanage +apps/gdalsrsinfo +apps/gdaltindex +apps/gdaltransform +apps/gdalwarp +apps/gnmanalyse +apps/gnmmanage +apps/nearblack +apps/ogr2ogr +apps/ogrinfo +apps/ogrlineref +apps/ogrtindex +apps/testepsg +apps/gdalserver +apps/test_ogrsf +apps/dumpoverviews +apps/gdalwarpsimple +apps/multireadtest +apps/gdal_create +port/dllbuild.prev +port/prev_dllbuild.bat +swig/java/build +swig/java/gdal.jar +swig/java/gdal_wrap.cpp +swig/java/gdalconst_wrap.c +swig/java/libgdalconstjni.so +swig/java/libgdaljni.so +swig/java/libogrjni.so +swig/java/libosrjni.so +swig/java/ogr_wrap.cpp +swig/java/org/ +swig/java/osr_wrap.cpp +swig/java/gnm_wrap.cpp +swig/python/build +swig/python/setup_vars.ini +swig/python/record.txt +swig/perl/Const.bs +swig/perl/GDAL.bs +swig/perl/Makefile_Geo__GDAL +swig/perl/Makefile_Geo__GDAL__Const +swig/perl/Makefile_Geo__OGR +swig/perl/Makefile_Geo__OSR +swig/perl/OGR.bs +swig/perl/OSR.bs +swig/perl/blib/ +swig/perl/lib/Geo/GDAL/*.pm +swig/perl/lib/Geo/*.pm +swig/perl/gdal_wrap.cpp +swig/perl/gdalconst_wrap.c +swig/perl/ogr_wrap.cpp +swig/perl/osr_wrap.cpp +swig/perl/pm_to_blib +swig/perl/GNM.bs +swig/perl/MYMETA.json +swig/perl/MYMETA.yml +swig/perl/Makefile_Geo__GNM +swig/perl/gnm_wrap.cpp +swig/csharp/*.cpp +swig/csharp/*.c +swig/csharp/*.mdb +swig/csharp/*.config +swig/csharp/osr +swig/csharp/ogr +swig/csharp/gdal +swig/csharp/const +fuzzers/libFuzzingEngine.a +fuzzers/tests/test_gdal_fuzzer +fuzzers/tests/test_ogr_fuzzer +fuzzers/tests/test_osr_set_from_user_input_fuzzer +fuzzers/tests/test_wkb_import_fuzzer +fuzzers/tests/test_wkt_import_fuzzer +man/ +html/ +nmake.local* +*~ +*tmp +.python-version .vagrant # IDE ignore @@ -31,4 +168,3 @@ __pycache__/ gdal/packages* gdal/share - diff --git a/.travis.yml b/.travis.yml index a59e60b65a8e..b7b7a7d31e09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -180,13 +180,13 @@ matrix: # - DETAILS="debug build, libtool" before_install: - - ./gdal/ci/travis/${BUILD_NAME}/before_install.sh + - ./ci/travis/${BUILD_NAME}/before_install.sh install: - - ./gdal/ci/travis/${BUILD_NAME}/install.sh + - ./ci/travis/${BUILD_NAME}/install.sh script: - - ./gdal/ci/travis/${BUILD_NAME}/script.sh + - ./ci/travis/${BUILD_NAME}/script.sh notifications: irc: diff --git a/CMakeLists.txt b/CMakeLists.txt index 51c853a298ee..a4b15849dde3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,13 +193,13 @@ else () endif () set_package_properties(Python PROPERTIES PURPOSE "SWIG_PYTHON: Python binding") # -add_subdirectory(gdal) +include(gdal.cmake) # unit tests add_subdirectory(autotest/cpp) # please comment out if you want to exclude autotest from distribution. add_subdirectory(autotest) # Google OSS-Fuzz project utilities -add_subdirectory(gdal/fuzzers) +add_subdirectory(fuzzers) # Google OSS-Fuzz tests -add_subdirectory(gdal/fuzzers/tests) +add_subdirectory(fuzzers/tests) # vim: ts=4 sw=4 sts=4 et diff --git a/gdal/COMMITTERS b/COMMITTERS similarity index 100% rename from gdal/COMMITTERS rename to COMMITTERS diff --git a/gdal/Doxyfile b/Doxyfile similarity index 100% rename from gdal/Doxyfile rename to Doxyfile diff --git a/gdal/DoxygenLayout.xml b/DoxygenLayout.xml similarity index 100% rename from gdal/DoxygenLayout.xml rename to DoxygenLayout.xml diff --git a/gdal/GDALmake.opt.in b/GDALmake.opt.in similarity index 100% rename from gdal/GDALmake.opt.in rename to GDALmake.opt.in diff --git a/gdal/GNUmakefile b/GNUmakefile similarity index 100% rename from gdal/GNUmakefile rename to GNUmakefile diff --git a/gdal/HOWTO-RELEASE b/HOWTO-RELEASE similarity index 100% rename from gdal/HOWTO-RELEASE rename to HOWTO-RELEASE diff --git a/gdal/LICENSE.TXT b/LICENSE.TXT similarity index 100% rename from gdal/LICENSE.TXT rename to LICENSE.TXT diff --git a/gdal/MIGRATION_GUIDE.TXT b/MIGRATION_GUIDE.TXT similarity index 100% rename from gdal/MIGRATION_GUIDE.TXT rename to MIGRATION_GUIDE.TXT diff --git a/gdal/NEWS b/NEWS similarity index 100% rename from gdal/NEWS rename to NEWS diff --git a/gdal/NEWS.template b/NEWS.template similarity index 100% rename from gdal/NEWS.template rename to NEWS.template diff --git a/gdal/PROVENANCE.TXT b/PROVENANCE.TXT similarity index 100% rename from gdal/PROVENANCE.TXT rename to PROVENANCE.TXT diff --git a/gdal/VERSION b/VERSION similarity index 100% rename from gdal/VERSION rename to VERSION diff --git a/gdal/alg/CMakeLists.txt b/alg/CMakeLists.txt similarity index 100% rename from gdal/alg/CMakeLists.txt rename to alg/CMakeLists.txt diff --git a/gdal/alg/GNUmakefile b/alg/GNUmakefile similarity index 100% rename from gdal/alg/GNUmakefile rename to alg/GNUmakefile diff --git a/gdal/alg/armadillo_headers.h b/alg/armadillo_headers.h similarity index 100% rename from gdal/alg/armadillo_headers.h rename to alg/armadillo_headers.h diff --git a/gdal/alg/contour.cpp b/alg/contour.cpp similarity index 100% rename from gdal/alg/contour.cpp rename to alg/contour.cpp diff --git a/gdal/alg/delaunay.c b/alg/delaunay.c similarity index 100% rename from gdal/alg/delaunay.c rename to alg/delaunay.c diff --git a/gdal/alg/gdal_alg.h b/alg/gdal_alg.h similarity index 100% rename from gdal/alg/gdal_alg.h rename to alg/gdal_alg.h diff --git a/gdal/alg/gdal_alg_priv.h b/alg/gdal_alg_priv.h similarity index 100% rename from gdal/alg/gdal_alg_priv.h rename to alg/gdal_alg_priv.h diff --git a/gdal/alg/gdal_crs.cpp b/alg/gdal_crs.cpp similarity index 100% rename from gdal/alg/gdal_crs.cpp rename to alg/gdal_crs.cpp diff --git a/gdal/alg/gdal_octave.cpp b/alg/gdal_octave.cpp similarity index 100% rename from gdal/alg/gdal_octave.cpp rename to alg/gdal_octave.cpp diff --git a/gdal/alg/gdal_rpc.cpp b/alg/gdal_rpc.cpp similarity index 100% rename from gdal/alg/gdal_rpc.cpp rename to alg/gdal_rpc.cpp diff --git a/gdal/alg/gdal_simplesurf.cpp b/alg/gdal_simplesurf.cpp similarity index 100% rename from gdal/alg/gdal_simplesurf.cpp rename to alg/gdal_simplesurf.cpp diff --git a/gdal/alg/gdal_simplesurf.h b/alg/gdal_simplesurf.h similarity index 100% rename from gdal/alg/gdal_simplesurf.h rename to alg/gdal_simplesurf.h diff --git a/gdal/alg/gdal_tps.cpp b/alg/gdal_tps.cpp similarity index 100% rename from gdal/alg/gdal_tps.cpp rename to alg/gdal_tps.cpp diff --git a/gdal/alg/gdalapplyverticalshiftgrid.cpp b/alg/gdalapplyverticalshiftgrid.cpp similarity index 100% rename from gdal/alg/gdalapplyverticalshiftgrid.cpp rename to alg/gdalapplyverticalshiftgrid.cpp diff --git a/gdal/alg/gdalchecksum.cpp b/alg/gdalchecksum.cpp similarity index 100% rename from gdal/alg/gdalchecksum.cpp rename to alg/gdalchecksum.cpp diff --git a/gdal/alg/gdalcutline.cpp b/alg/gdalcutline.cpp similarity index 100% rename from gdal/alg/gdalcutline.cpp rename to alg/gdalcutline.cpp diff --git a/gdal/alg/gdaldither.cpp b/alg/gdaldither.cpp similarity index 100% rename from gdal/alg/gdaldither.cpp rename to alg/gdaldither.cpp diff --git a/gdal/alg/gdalgeoloc.cpp b/alg/gdalgeoloc.cpp similarity index 100% rename from gdal/alg/gdalgeoloc.cpp rename to alg/gdalgeoloc.cpp diff --git a/gdal/alg/gdalgrid.cpp b/alg/gdalgrid.cpp similarity index 100% rename from gdal/alg/gdalgrid.cpp rename to alg/gdalgrid.cpp diff --git a/gdal/alg/gdalgrid.h b/alg/gdalgrid.h similarity index 100% rename from gdal/alg/gdalgrid.h rename to alg/gdalgrid.h diff --git a/gdal/alg/gdalgrid_priv.h b/alg/gdalgrid_priv.h similarity index 100% rename from gdal/alg/gdalgrid_priv.h rename to alg/gdalgrid_priv.h diff --git a/gdal/alg/gdalgridavx.cpp b/alg/gdalgridavx.cpp similarity index 100% rename from gdal/alg/gdalgridavx.cpp rename to alg/gdalgridavx.cpp diff --git a/gdal/alg/gdalgridsse.cpp b/alg/gdalgridsse.cpp similarity index 100% rename from gdal/alg/gdalgridsse.cpp rename to alg/gdalgridsse.cpp diff --git a/gdal/alg/gdallinearsystem.cpp b/alg/gdallinearsystem.cpp similarity index 100% rename from gdal/alg/gdallinearsystem.cpp rename to alg/gdallinearsystem.cpp diff --git a/gdal/alg/gdallinearsystem.h b/alg/gdallinearsystem.h similarity index 100% rename from gdal/alg/gdallinearsystem.h rename to alg/gdallinearsystem.h diff --git a/gdal/alg/gdalmatching.cpp b/alg/gdalmatching.cpp similarity index 100% rename from gdal/alg/gdalmatching.cpp rename to alg/gdalmatching.cpp diff --git a/gdal/alg/gdalmediancut.cpp b/alg/gdalmediancut.cpp similarity index 100% rename from gdal/alg/gdalmediancut.cpp rename to alg/gdalmediancut.cpp diff --git a/gdal/alg/gdalpansharpen.cpp b/alg/gdalpansharpen.cpp similarity index 100% rename from gdal/alg/gdalpansharpen.cpp rename to alg/gdalpansharpen.cpp diff --git a/gdal/alg/gdalpansharpen.h b/alg/gdalpansharpen.h similarity index 100% rename from gdal/alg/gdalpansharpen.h rename to alg/gdalpansharpen.h diff --git a/gdal/alg/gdalproximity.cpp b/alg/gdalproximity.cpp similarity index 100% rename from gdal/alg/gdalproximity.cpp rename to alg/gdalproximity.cpp diff --git a/gdal/alg/gdalrasterize.cpp b/alg/gdalrasterize.cpp similarity index 100% rename from gdal/alg/gdalrasterize.cpp rename to alg/gdalrasterize.cpp diff --git a/gdal/alg/gdalrasterpolygonenumerator.cpp b/alg/gdalrasterpolygonenumerator.cpp similarity index 100% rename from gdal/alg/gdalrasterpolygonenumerator.cpp rename to alg/gdalrasterpolygonenumerator.cpp diff --git a/gdal/alg/gdalsievefilter.cpp b/alg/gdalsievefilter.cpp similarity index 100% rename from gdal/alg/gdalsievefilter.cpp rename to alg/gdalsievefilter.cpp diff --git a/gdal/alg/gdalsimplewarp.cpp b/alg/gdalsimplewarp.cpp similarity index 100% rename from gdal/alg/gdalsimplewarp.cpp rename to alg/gdalsimplewarp.cpp diff --git a/gdal/alg/gdaltransformer.cpp b/alg/gdaltransformer.cpp similarity index 100% rename from gdal/alg/gdaltransformer.cpp rename to alg/gdaltransformer.cpp diff --git a/gdal/alg/gdaltransformgeolocs.cpp b/alg/gdaltransformgeolocs.cpp similarity index 100% rename from gdal/alg/gdaltransformgeolocs.cpp rename to alg/gdaltransformgeolocs.cpp diff --git a/gdal/alg/gdalwarper.cpp b/alg/gdalwarper.cpp similarity index 100% rename from gdal/alg/gdalwarper.cpp rename to alg/gdalwarper.cpp diff --git a/gdal/alg/gdalwarper.h b/alg/gdalwarper.h similarity index 100% rename from gdal/alg/gdalwarper.h rename to alg/gdalwarper.h diff --git a/gdal/alg/gdalwarpkernel.cpp b/alg/gdalwarpkernel.cpp similarity index 100% rename from gdal/alg/gdalwarpkernel.cpp rename to alg/gdalwarpkernel.cpp diff --git a/gdal/alg/gdalwarpkernel_opencl.cpp b/alg/gdalwarpkernel_opencl.cpp similarity index 100% rename from gdal/alg/gdalwarpkernel_opencl.cpp rename to alg/gdalwarpkernel_opencl.cpp diff --git a/gdal/alg/gdalwarpkernel_opencl.h b/alg/gdalwarpkernel_opencl.h similarity index 100% rename from gdal/alg/gdalwarpkernel_opencl.h rename to alg/gdalwarpkernel_opencl.h diff --git a/gdal/alg/gdalwarpoperation.cpp b/alg/gdalwarpoperation.cpp similarity index 100% rename from gdal/alg/gdalwarpoperation.cpp rename to alg/gdalwarpoperation.cpp diff --git a/gdal/alg/gvgcpfit.h b/alg/gvgcpfit.h similarity index 100% rename from gdal/alg/gvgcpfit.h rename to alg/gvgcpfit.h diff --git a/gdal/alg/internal_libqhull/CMakeLists.txt b/alg/internal_libqhull/CMakeLists.txt similarity index 100% rename from gdal/alg/internal_libqhull/CMakeLists.txt rename to alg/internal_libqhull/CMakeLists.txt diff --git a/gdal/alg/internal_libqhull/COPYING.txt b/alg/internal_libqhull/COPYING.txt similarity index 100% rename from gdal/alg/internal_libqhull/COPYING.txt rename to alg/internal_libqhull/COPYING.txt diff --git a/gdal/alg/internal_libqhull/README.txt b/alg/internal_libqhull/README.txt similarity index 100% rename from gdal/alg/internal_libqhull/README.txt rename to alg/internal_libqhull/README.txt diff --git a/gdal/alg/internal_libqhull/geom.c b/alg/internal_libqhull/geom.c similarity index 100% rename from gdal/alg/internal_libqhull/geom.c rename to alg/internal_libqhull/geom.c diff --git a/gdal/alg/internal_libqhull/geom.h b/alg/internal_libqhull/geom.h similarity index 100% rename from gdal/alg/internal_libqhull/geom.h rename to alg/internal_libqhull/geom.h diff --git a/gdal/alg/internal_libqhull/geom2.c b/alg/internal_libqhull/geom2.c similarity index 100% rename from gdal/alg/internal_libqhull/geom2.c rename to alg/internal_libqhull/geom2.c diff --git a/gdal/alg/internal_libqhull/global.c b/alg/internal_libqhull/global.c similarity index 100% rename from gdal/alg/internal_libqhull/global.c rename to alg/internal_libqhull/global.c diff --git a/gdal/alg/internal_libqhull/io.c b/alg/internal_libqhull/io.c similarity index 100% rename from gdal/alg/internal_libqhull/io.c rename to alg/internal_libqhull/io.c diff --git a/gdal/alg/internal_libqhull/io.h b/alg/internal_libqhull/io.h similarity index 100% rename from gdal/alg/internal_libqhull/io.h rename to alg/internal_libqhull/io.h diff --git a/gdal/alg/internal_libqhull/libqhull.c b/alg/internal_libqhull/libqhull.c similarity index 100% rename from gdal/alg/internal_libqhull/libqhull.c rename to alg/internal_libqhull/libqhull.c diff --git a/gdal/alg/internal_libqhull/libqhull.h b/alg/internal_libqhull/libqhull.h similarity index 100% rename from gdal/alg/internal_libqhull/libqhull.h rename to alg/internal_libqhull/libqhull.h diff --git a/gdal/alg/internal_libqhull/mem.c b/alg/internal_libqhull/mem.c similarity index 100% rename from gdal/alg/internal_libqhull/mem.c rename to alg/internal_libqhull/mem.c diff --git a/gdal/alg/internal_libqhull/mem.h b/alg/internal_libqhull/mem.h similarity index 100% rename from gdal/alg/internal_libqhull/mem.h rename to alg/internal_libqhull/mem.h diff --git a/gdal/alg/internal_libqhull/merge.c b/alg/internal_libqhull/merge.c similarity index 100% rename from gdal/alg/internal_libqhull/merge.c rename to alg/internal_libqhull/merge.c diff --git a/gdal/alg/internal_libqhull/merge.h b/alg/internal_libqhull/merge.h similarity index 100% rename from gdal/alg/internal_libqhull/merge.h rename to alg/internal_libqhull/merge.h diff --git a/gdal/alg/internal_libqhull/poly.c b/alg/internal_libqhull/poly.c similarity index 100% rename from gdal/alg/internal_libqhull/poly.c rename to alg/internal_libqhull/poly.c diff --git a/gdal/alg/internal_libqhull/poly.h b/alg/internal_libqhull/poly.h similarity index 100% rename from gdal/alg/internal_libqhull/poly.h rename to alg/internal_libqhull/poly.h diff --git a/gdal/alg/internal_libqhull/poly2.c b/alg/internal_libqhull/poly2.c similarity index 100% rename from gdal/alg/internal_libqhull/poly2.c rename to alg/internal_libqhull/poly2.c diff --git a/gdal/alg/internal_libqhull/qhull_a.h b/alg/internal_libqhull/qhull_a.h similarity index 100% rename from gdal/alg/internal_libqhull/qhull_a.h rename to alg/internal_libqhull/qhull_a.h diff --git a/gdal/alg/internal_libqhull/qset.c b/alg/internal_libqhull/qset.c similarity index 100% rename from gdal/alg/internal_libqhull/qset.c rename to alg/internal_libqhull/qset.c diff --git a/gdal/alg/internal_libqhull/qset.h b/alg/internal_libqhull/qset.h similarity index 100% rename from gdal/alg/internal_libqhull/qset.h rename to alg/internal_libqhull/qset.h diff --git a/gdal/alg/internal_libqhull/random.c b/alg/internal_libqhull/random.c similarity index 100% rename from gdal/alg/internal_libqhull/random.c rename to alg/internal_libqhull/random.c diff --git a/gdal/alg/internal_libqhull/random.h b/alg/internal_libqhull/random.h similarity index 100% rename from gdal/alg/internal_libqhull/random.h rename to alg/internal_libqhull/random.h diff --git a/gdal/alg/internal_libqhull/rboxlib.c b/alg/internal_libqhull/rboxlib.c similarity index 100% rename from gdal/alg/internal_libqhull/rboxlib.c rename to alg/internal_libqhull/rboxlib.c diff --git a/gdal/alg/internal_libqhull/stat.c b/alg/internal_libqhull/stat.c similarity index 100% rename from gdal/alg/internal_libqhull/stat.c rename to alg/internal_libqhull/stat.c diff --git a/gdal/alg/internal_libqhull/stat.h b/alg/internal_libqhull/stat.h similarity index 100% rename from gdal/alg/internal_libqhull/stat.h rename to alg/internal_libqhull/stat.h diff --git a/gdal/alg/internal_libqhull/user.c b/alg/internal_libqhull/user.c similarity index 100% rename from gdal/alg/internal_libqhull/user.c rename to alg/internal_libqhull/user.c diff --git a/gdal/alg/internal_libqhull/user.h b/alg/internal_libqhull/user.h similarity index 100% rename from gdal/alg/internal_libqhull/user.h rename to alg/internal_libqhull/user.h diff --git a/gdal/alg/internal_libqhull/usermem.c b/alg/internal_libqhull/usermem.c similarity index 100% rename from gdal/alg/internal_libqhull/usermem.c rename to alg/internal_libqhull/usermem.c diff --git a/gdal/alg/internal_libqhull/userprintf.c b/alg/internal_libqhull/userprintf.c similarity index 100% rename from gdal/alg/internal_libqhull/userprintf.c rename to alg/internal_libqhull/userprintf.c diff --git a/gdal/alg/internal_libqhull/userprintf_rbox.c b/alg/internal_libqhull/userprintf_rbox.c similarity index 100% rename from gdal/alg/internal_libqhull/userprintf_rbox.c rename to alg/internal_libqhull/userprintf_rbox.c diff --git a/gdal/alg/internal_qhull_headers.h b/alg/internal_qhull_headers.h similarity index 100% rename from gdal/alg/internal_qhull_headers.h rename to alg/internal_qhull_headers.h diff --git a/gdal/alg/llrasterize.cpp b/alg/llrasterize.cpp similarity index 100% rename from gdal/alg/llrasterize.cpp rename to alg/llrasterize.cpp diff --git a/gdal/alg/makefile.vc b/alg/makefile.vc similarity index 100% rename from gdal/alg/makefile.vc rename to alg/makefile.vc diff --git a/gdal/alg/marching_squares/contour_generator.h b/alg/marching_squares/contour_generator.h similarity index 100% rename from gdal/alg/marching_squares/contour_generator.h rename to alg/marching_squares/contour_generator.h diff --git a/gdal/alg/marching_squares/level_generator.h b/alg/marching_squares/level_generator.h similarity index 100% rename from gdal/alg/marching_squares/level_generator.h rename to alg/marching_squares/level_generator.h diff --git a/gdal/alg/marching_squares/point.h b/alg/marching_squares/point.h similarity index 100% rename from gdal/alg/marching_squares/point.h rename to alg/marching_squares/point.h diff --git a/gdal/alg/marching_squares/polygon_ring_appender.h b/alg/marching_squares/polygon_ring_appender.h similarity index 100% rename from gdal/alg/marching_squares/polygon_ring_appender.h rename to alg/marching_squares/polygon_ring_appender.h diff --git a/gdal/alg/marching_squares/segment_merger.h b/alg/marching_squares/segment_merger.h similarity index 100% rename from gdal/alg/marching_squares/segment_merger.h rename to alg/marching_squares/segment_merger.h diff --git a/gdal/alg/marching_squares/square.h b/alg/marching_squares/square.h similarity index 100% rename from gdal/alg/marching_squares/square.h rename to alg/marching_squares/square.h diff --git a/gdal/alg/marching_squares/utility.h b/alg/marching_squares/utility.h similarity index 100% rename from gdal/alg/marching_squares/utility.h rename to alg/marching_squares/utility.h diff --git a/gdal/alg/polygonize.cpp b/alg/polygonize.cpp similarity index 100% rename from gdal/alg/polygonize.cpp rename to alg/polygonize.cpp diff --git a/gdal/alg/rasterfill.cpp b/alg/rasterfill.cpp similarity index 100% rename from gdal/alg/rasterfill.cpp rename to alg/rasterfill.cpp diff --git a/gdal/alg/thinplatespline.cpp b/alg/thinplatespline.cpp similarity index 100% rename from gdal/alg/thinplatespline.cpp rename to alg/thinplatespline.cpp diff --git a/gdal/alg/thinplatespline.h b/alg/thinplatespline.h similarity index 100% rename from gdal/alg/thinplatespline.h rename to alg/thinplatespline.h diff --git a/gdal/alg/viewshed.cpp b/alg/viewshed.cpp similarity index 100% rename from gdal/alg/viewshed.cpp rename to alg/viewshed.cpp diff --git a/gdal/apps/CMakeLists.txt b/apps/CMakeLists.txt similarity index 100% rename from gdal/apps/CMakeLists.txt rename to apps/CMakeLists.txt diff --git a/gdal/apps/GNUmakefile b/apps/GNUmakefile similarity index 100% rename from gdal/apps/GNUmakefile rename to apps/GNUmakefile diff --git a/gdal/apps/commonutils.cpp b/apps/commonutils.cpp similarity index 100% rename from gdal/apps/commonutils.cpp rename to apps/commonutils.cpp diff --git a/gdal/apps/commonutils.h b/apps/commonutils.h similarity index 100% rename from gdal/apps/commonutils.h rename to apps/commonutils.h diff --git a/gdal/apps/dumpoverviews.cpp b/apps/dumpoverviews.cpp similarity index 100% rename from gdal/apps/dumpoverviews.cpp rename to apps/dumpoverviews.cpp diff --git a/gdal/apps/gdal-config.in b/apps/gdal-config.in similarity index 100% rename from gdal/apps/gdal-config.in rename to apps/gdal-config.in diff --git a/gdal/apps/gdal2ogr.c b/apps/gdal2ogr.c similarity index 100% rename from gdal/apps/gdal2ogr.c rename to apps/gdal2ogr.c diff --git a/gdal/apps/gdal_contour.cpp b/apps/gdal_contour.cpp similarity index 100% rename from gdal/apps/gdal_contour.cpp rename to apps/gdal_contour.cpp diff --git a/gdal/apps/gdal_create.cpp b/apps/gdal_create.cpp similarity index 100% rename from gdal/apps/gdal_create.cpp rename to apps/gdal_create.cpp diff --git a/gdal/apps/gdal_grid_bin.cpp b/apps/gdal_grid_bin.cpp similarity index 100% rename from gdal/apps/gdal_grid_bin.cpp rename to apps/gdal_grid_bin.cpp diff --git a/gdal/apps/gdal_grid_lib.cpp b/apps/gdal_grid_lib.cpp similarity index 100% rename from gdal/apps/gdal_grid_lib.cpp rename to apps/gdal_grid_lib.cpp diff --git a/gdal/apps/gdal_rasterize_bin.cpp b/apps/gdal_rasterize_bin.cpp similarity index 100% rename from gdal/apps/gdal_rasterize_bin.cpp rename to apps/gdal_rasterize_bin.cpp diff --git a/gdal/apps/gdal_rasterize_lib.cpp b/apps/gdal_rasterize_lib.cpp similarity index 100% rename from gdal/apps/gdal_rasterize_lib.cpp rename to apps/gdal_rasterize_lib.cpp diff --git a/gdal/apps/gdal_translate_bin.cpp b/apps/gdal_translate_bin.cpp similarity index 100% rename from gdal/apps/gdal_translate_bin.cpp rename to apps/gdal_translate_bin.cpp diff --git a/gdal/apps/gdal_translate_lib.cpp b/apps/gdal_translate_lib.cpp similarity index 100% rename from gdal/apps/gdal_translate_lib.cpp rename to apps/gdal_translate_lib.cpp diff --git a/gdal/apps/gdal_utils.h b/apps/gdal_utils.h similarity index 100% rename from gdal/apps/gdal_utils.h rename to apps/gdal_utils.h diff --git a/gdal/apps/gdal_utils_priv.h b/apps/gdal_utils_priv.h similarity index 100% rename from gdal/apps/gdal_utils_priv.h rename to apps/gdal_utils_priv.h diff --git a/gdal/apps/gdal_viewshed.cpp b/apps/gdal_viewshed.cpp similarity index 100% rename from gdal/apps/gdal_viewshed.cpp rename to apps/gdal_viewshed.cpp diff --git a/gdal/apps/gdaladdo.cpp b/apps/gdaladdo.cpp similarity index 100% rename from gdal/apps/gdaladdo.cpp rename to apps/gdaladdo.cpp diff --git a/gdal/apps/gdalasyncread.cpp b/apps/gdalasyncread.cpp similarity index 100% rename from gdal/apps/gdalasyncread.cpp rename to apps/gdalasyncread.cpp diff --git a/gdal/apps/gdalbuildvrt_bin.cpp b/apps/gdalbuildvrt_bin.cpp similarity index 100% rename from gdal/apps/gdalbuildvrt_bin.cpp rename to apps/gdalbuildvrt_bin.cpp diff --git a/gdal/apps/gdalbuildvrt_lib.cpp b/apps/gdalbuildvrt_lib.cpp similarity index 100% rename from gdal/apps/gdalbuildvrt_lib.cpp rename to apps/gdalbuildvrt_lib.cpp diff --git a/gdal/apps/gdaldem_bin.cpp b/apps/gdaldem_bin.cpp similarity index 100% rename from gdal/apps/gdaldem_bin.cpp rename to apps/gdaldem_bin.cpp diff --git a/gdal/apps/gdaldem_lib.cpp b/apps/gdaldem_lib.cpp similarity index 100% rename from gdal/apps/gdaldem_lib.cpp rename to apps/gdaldem_lib.cpp diff --git a/gdal/apps/gdalenhance.cpp b/apps/gdalenhance.cpp similarity index 100% rename from gdal/apps/gdalenhance.cpp rename to apps/gdalenhance.cpp diff --git a/gdal/apps/gdalflattenmask.c b/apps/gdalflattenmask.c similarity index 100% rename from gdal/apps/gdalflattenmask.c rename to apps/gdalflattenmask.c diff --git a/gdal/apps/gdalinfo_bin.cpp b/apps/gdalinfo_bin.cpp similarity index 100% rename from gdal/apps/gdalinfo_bin.cpp rename to apps/gdalinfo_bin.cpp diff --git a/gdal/apps/gdalinfo_lib.cpp b/apps/gdalinfo_lib.cpp similarity index 100% rename from gdal/apps/gdalinfo_lib.cpp rename to apps/gdalinfo_lib.cpp diff --git a/gdal/apps/gdallocationinfo.cpp b/apps/gdallocationinfo.cpp similarity index 100% rename from gdal/apps/gdallocationinfo.cpp rename to apps/gdallocationinfo.cpp diff --git a/gdal/apps/gdalmanage.cpp b/apps/gdalmanage.cpp similarity index 100% rename from gdal/apps/gdalmanage.cpp rename to apps/gdalmanage.cpp diff --git a/gdal/apps/gdalmdiminfo_bin.cpp b/apps/gdalmdiminfo_bin.cpp similarity index 100% rename from gdal/apps/gdalmdiminfo_bin.cpp rename to apps/gdalmdiminfo_bin.cpp diff --git a/gdal/apps/gdalmdiminfo_lib.cpp b/apps/gdalmdiminfo_lib.cpp similarity index 100% rename from gdal/apps/gdalmdiminfo_lib.cpp rename to apps/gdalmdiminfo_lib.cpp diff --git a/gdal/apps/gdalmdimtranslate_bin.cpp b/apps/gdalmdimtranslate_bin.cpp similarity index 100% rename from gdal/apps/gdalmdimtranslate_bin.cpp rename to apps/gdalmdimtranslate_bin.cpp diff --git a/gdal/apps/gdalmdimtranslate_lib.cpp b/apps/gdalmdimtranslate_lib.cpp similarity index 100% rename from gdal/apps/gdalmdimtranslate_lib.cpp rename to apps/gdalmdimtranslate_lib.cpp diff --git a/gdal/apps/gdalsrsinfo.cpp b/apps/gdalsrsinfo.cpp similarity index 100% rename from gdal/apps/gdalsrsinfo.cpp rename to apps/gdalsrsinfo.cpp diff --git a/gdal/apps/gdaltindex.cpp b/apps/gdaltindex.cpp similarity index 100% rename from gdal/apps/gdaltindex.cpp rename to apps/gdaltindex.cpp diff --git a/gdal/apps/gdaltorture.cpp b/apps/gdaltorture.cpp similarity index 100% rename from gdal/apps/gdaltorture.cpp rename to apps/gdaltorture.cpp diff --git a/gdal/apps/gdaltransform.cpp b/apps/gdaltransform.cpp similarity index 100% rename from gdal/apps/gdaltransform.cpp rename to apps/gdaltransform.cpp diff --git a/gdal/apps/gdalwarp_bin.cpp b/apps/gdalwarp_bin.cpp similarity index 100% rename from gdal/apps/gdalwarp_bin.cpp rename to apps/gdalwarp_bin.cpp diff --git a/gdal/apps/gdalwarp_lib.cpp b/apps/gdalwarp_lib.cpp similarity index 100% rename from gdal/apps/gdalwarp_lib.cpp rename to apps/gdalwarp_lib.cpp diff --git a/gdal/apps/gdalwarpsimple.c b/apps/gdalwarpsimple.c similarity index 100% rename from gdal/apps/gdalwarpsimple.c rename to apps/gdalwarpsimple.c diff --git a/gdal/apps/gnmanalyse.cpp b/apps/gnmanalyse.cpp similarity index 100% rename from gdal/apps/gnmanalyse.cpp rename to apps/gnmanalyse.cpp diff --git a/gdal/apps/gnmmanage.cpp b/apps/gnmmanage.cpp similarity index 100% rename from gdal/apps/gnmmanage.cpp rename to apps/gnmmanage.cpp diff --git a/gdal/apps/makefile.vc b/apps/makefile.vc similarity index 100% rename from gdal/apps/makefile.vc rename to apps/makefile.vc diff --git a/gdal/apps/multireadtest.cpp b/apps/multireadtest.cpp similarity index 100% rename from gdal/apps/multireadtest.cpp rename to apps/multireadtest.cpp diff --git a/gdal/apps/nearblack_bin.cpp b/apps/nearblack_bin.cpp similarity index 100% rename from gdal/apps/nearblack_bin.cpp rename to apps/nearblack_bin.cpp diff --git a/gdal/apps/nearblack_lib.cpp b/apps/nearblack_lib.cpp similarity index 100% rename from gdal/apps/nearblack_lib.cpp rename to apps/nearblack_lib.cpp diff --git a/gdal/apps/ogr2ogr_bin.cpp b/apps/ogr2ogr_bin.cpp similarity index 100% rename from gdal/apps/ogr2ogr_bin.cpp rename to apps/ogr2ogr_bin.cpp diff --git a/gdal/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp similarity index 100% rename from gdal/apps/ogr2ogr_lib.cpp rename to apps/ogr2ogr_lib.cpp diff --git a/gdal/apps/ogrdissolve.cpp b/apps/ogrdissolve.cpp similarity index 100% rename from gdal/apps/ogrdissolve.cpp rename to apps/ogrdissolve.cpp diff --git a/gdal/apps/ogrinfo.cpp b/apps/ogrinfo.cpp similarity index 100% rename from gdal/apps/ogrinfo.cpp rename to apps/ogrinfo.cpp diff --git a/gdal/apps/ogrlineref.cpp b/apps/ogrlineref.cpp similarity index 100% rename from gdal/apps/ogrlineref.cpp rename to apps/ogrlineref.cpp diff --git a/gdal/apps/ogrtindex.cpp b/apps/ogrtindex.cpp similarity index 100% rename from gdal/apps/ogrtindex.cpp rename to apps/ogrtindex.cpp diff --git a/gdal/apps/test_ogrsf.cpp b/apps/test_ogrsf.cpp similarity index 100% rename from gdal/apps/test_ogrsf.cpp rename to apps/test_ogrsf.cpp diff --git a/gdal/apps/testepsg.cpp b/apps/testepsg.cpp similarity index 100% rename from gdal/apps/testepsg.cpp rename to apps/testepsg.cpp diff --git a/gdal/apps/testreprojmulti.cpp b/apps/testreprojmulti.cpp similarity index 100% rename from gdal/apps/testreprojmulti.cpp rename to apps/testreprojmulti.cpp diff --git a/appveyor.yml b/appveyor.yml index 72aa35ce7003..aecb1a2ce130 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ branches: # the file patterns below skip_commits: files: - - gdal/doc/**/* + - doc/**/* environment: matrix: @@ -155,7 +155,7 @@ install: $env:NMAKE_LOCAL+="NETCDF_HAS_NC4 = yes`n" $env:NMAKE_LOCAL+="PROJ_INCLUDE=-I$env:APPVEYOR_BUILD_FOLDER\install-proj\include`n" $env:NMAKE_LOCAL+="PROJ_LIBRARY=$env:APPVEYOR_BUILD_FOLDER\install-proj\lib\proj.lib`n" - $env:NMAKE_LOCAL | Set-Content "$env:APPVEYOR_BUILD_FOLDER\gdal\nmake.local" + $env:NMAKE_LOCAL | Set-Content "$env:APPVEYOR_BUILD_FOLDER\nmake.local" # cd $env:APPVEYOR_BUILD_FOLDER exec { git clone --depth=1 -b $env:PROJ_BRANCH https://github.com/OSGeo/PROJ proj } @@ -176,17 +176,17 @@ install: appveyor DownloadFile http://download.osgeo.org/proj/proj-datumgrid-1.8.zip exec { 7z x proj-datumgrid-1.8.zip -aoa } # - cd $env:APPVEYOR_BUILD_FOLDER\gdal + cd $env:APPVEYOR_BUILD_FOLDER exec { copy $env:APPVEYOR_BUILD_FOLDER\install-proj\bin\*.dll . } exec { nmake /f makefile.vc MSVC_VER=$env:MSVC_VER $env:WIN64_ARG USER_DEFS=/WX } cd apps exec { nmake /f makefile.vc test_ogrsf.exe MSVC_VER=$env:MSVC_VER $env:WIN64_ARG USER_DEFS=/WX } $env:DISTUTILS_USE_SDK=1 $env:MSSdk=1 - cd $env:APPVEYOR_BUILD_FOLDER\gdal\swig\python + cd $env:APPVEYOR_BUILD_FOLDER\swig\python exec { python setup.py build } exec { python setup.py install } - cd $env:APPVEYOR_BUILD_FOLDER\gdal\swig\csharp + cd $env:APPVEYOR_BUILD_FOLDER\swig\csharp exec { nmake /f makefile.vc interface} exec { nmake /f makefile.vc all $env:WIN64_ARG} cd $env:APPVEYOR_BUILD_FOLDER\autotest\cpp @@ -196,8 +196,8 @@ build: off test_script: - ps: | - $env:PATH="$env:APPVEYOR_BUILD_FOLDER\gdal;$env:APPVEYOR_BUILD_FOLDER\gdal\apps;$env:SDK_BIN;$env:PATH" - $env:GDAL_DATA="$env:APPVEYOR_BUILD_FOLDER\gdal\data" + $env:PATH="$env:APPVEYOR_BUILD_FOLDER;$env:APPVEYOR_BUILD_FOLDER\apps;$env:SDK_BIN;$env:PATH" + $env:GDAL_DATA="$env:APPVEYOR_BUILD_FOLDER\data" # $env:PROJ_LIB="$env:APPVEYOR_BUILD_FOLDER\install-proj\share" $env:DO_NOT_FAIL_ON_RECODE_ERRORS="YES" # The ca-bundle.crt file which we could point to is invalid in the current SDK @@ -208,7 +208,7 @@ test_script: cd $env:APPVEYOR_BUILD_FOLDER\autotest exec { pip install -Ur requirements.txt } exec { pytest -vv } - cd $env:APPVEYOR_BUILD_FOLDER\gdal\swig\csharp + cd $env:APPVEYOR_BUILD_FOLDER\swig\csharp exec { nmake /f makefile.vc test} deploy: off diff --git a/gdal/autogen.sh b/autogen.sh similarity index 100% rename from gdal/autogen.sh rename to autogen.sh diff --git a/autotest/CMakeLists.txt b/autotest/CMakeLists.txt index 18841bf62c85..6ed3db687137 100644 --- a/autotest/CMakeLists.txt +++ b/autotest/CMakeLists.txt @@ -13,7 +13,7 @@ if (Python_FOUND) set(_SEP ":") endif () get_target_property(PLUGIN_OUTPUT_DIR gdal PLUGIN_OUTPUT_DIR) - list(APPEND _TEST_ENV "PATH=${CMAKE_BINARY_DIR}/gdal/apps${_SEP}$ENV{PATH}" "GDAL_DATA=${CMAKE_SOURCE_DIR}/gdal/data" + list(APPEND _TEST_ENV "PATH=${CMAKE_BINARY_DIR}/apps${_SEP}$ENV{PATH}" "GDAL_DATA=${CMAKE_SOURCE_DIR}/data" "GDAL_DRIVER_PATH=${PLUGIN_OUTPUT_DIR}") if (GDAL_DOWNLOAD_TEST_DATA) list(APPEND _TEST_ENV GDAL_DOWNLOAD_TEST_DATA=YES) @@ -30,8 +30,8 @@ if (Python_FOUND) configure_file(${GDAL_CMAKE_TEMPLATE_PATH}/pytest.ini.in ${CMAKE_CURRENT_BINARY_DIR}/pytest.ini @ONLY) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/conftest.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - set(PYTHON_RUN_ENV "PYTHONPATH=${CMAKE_BINARY_DIR}/gdal/swig/python/" - "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/gdal${_SEP}$ENV{LD_LIBRARY_PATH}") + set(PYTHON_RUN_ENV "PYTHONPATH=${CMAKE_BINARY_DIR}/swig/python/" + "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}${_SEP}$ENV{LD_LIBRARY_PATH}") foreach ( tgt IN ITEMS ogr @@ -40,6 +40,7 @@ if (Python_FOUND) alg osr gnm + pymod pyscripts utilities) if (CMAKE_VERSION VERSION_GREATER 3.14) @@ -100,6 +101,6 @@ int main(int argc, char **argv) { autotest_runner COMMAND ${CMAKE_COMMAND} -E env ${PYTHON_RUN_ENV} $ -c ${CMAKE_CURRENT_BINARY_DIR}/pytest.ini - DEPENDS gdal gdalapps python_binding - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/autotest) + DEPENDS gdal gdalapps python_binding pytest_runner + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) endif () diff --git a/autotest/cpp/CMakeLists.txt b/autotest/cpp/CMakeLists.txt index 54c5901011ec..866767be66a4 100644 --- a/autotest/cpp/CMakeLists.txt +++ b/autotest/cpp/CMakeLists.txt @@ -4,10 +4,10 @@ set(GDAL_ROOT_TEST_DIR "${CMAKE_SOURCE_DIR}/autotest") if (NOT CMAKE_CROSSCOMPILING) if (LINUX) - add_library(vsipreload MODULE ${CMAKE_SOURCE_DIR}/gdal/port/vsipreload.cpp) + add_library(vsipreload MODULE ${CMAKE_SOURCE_DIR}/port/vsipreload.cpp) target_link_libraries(vsipreload PRIVATE $) if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16) - set_property(SOURCE ${CMAKE_SOURCE_DIR}/gdal/port/vsipreload.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON) + set_property(SOURCE ${CMAKE_SOURCE_DIR}/port/vsipreload.cpp PROPERTY SKIP_UNITY_BUILD_INCLUSION ON) endif () endif () endif () @@ -58,10 +58,10 @@ else () endif () # FIXME: better handling of output path w/o hard coded. set(GDAL_OUTPUT_DIR # "$") -file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/gdal" GDAL_OUTPUT_DIR) +file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}" GDAL_OUTPUT_DIR) # set(GDAL_DRIVER_PATH "$ diff --git a/autotest/gdrivers/data/zarr/gzip.zarr/0 b/autotest/gdrivers/data/zarr/gzip.zarr/0 index ef2f5a99aacc..435f2699bdd6 100644 Binary files a/autotest/gdrivers/data/zarr/gzip.zarr/0 and b/autotest/gdrivers/data/zarr/gzip.zarr/0 differ diff --git a/autotest/pymod/test_py_scripts.py b/autotest/pymod/test_py_scripts.py index 74694d51a9db..d35aeb066005 100755 --- a/autotest/pymod/test_py_scripts.py +++ b/autotest/pymod/test_py_scripts.py @@ -43,7 +43,7 @@ # path relative to gdal root utils_subdir = 'swig/python/gdal-utils/osgeo_utils' samples_subdir = utils_subdir + '/samples' -samples_path = '../../gdal/' + samples_subdir +samples_path = '../../' + samples_subdir def get_data_path(dir): @@ -52,7 +52,7 @@ def get_data_path(dir): def get_py_script(script_name): # how to get to {root_dir}/gdal from {root_dir}/autotest/X - base_gdal_path = os.path.join(os.getcwd(), '..', '..', 'gdal') + base_gdal_path = os.path.join(os.getcwd(), '..', '..') # now we need to look for the script in the utils or samples subdirs... for subdir in [utils_subdir, samples_subdir]: try: diff --git a/autotest/pytest.ini b/autotest/pytest.ini index 09922473f726..b91605d0ed3a 100644 --- a/autotest/pytest.ini +++ b/autotest/pytest.ini @@ -26,9 +26,9 @@ env = GDAL_ENABLE_DEPRECATED_DRIVER_TIGER=YES # GDAL_RUN_SLOW_TESTS=NO # GDAL_DOWNLOAD_TEST_DATA=NO -# DYLD_LIBRARY_PATH=../gdal -# LD_LIBRARY_PATH=../gdal -# GDAL_DATA=../gdal/data +# DYLD_LIBRARY_PATH=.. +# LD_LIBRARY_PATH=.. +# GDAL_DATA=../data # GDAL_DRIVER_PATH=/usr/lib/gdal/gdalplugins markers = diff --git a/gdal/ci/travis/android/before_install.sh b/ci/travis/android/before_install.sh similarity index 100% rename from gdal/ci/travis/android/before_install.sh rename to ci/travis/android/before_install.sh diff --git a/gdal/ci/travis/android/install.sh b/ci/travis/android/install.sh similarity index 100% rename from gdal/ci/travis/android/install.sh rename to ci/travis/android/install.sh diff --git a/gdal/ci/travis/android/script.sh b/ci/travis/android/script.sh similarity index 100% rename from gdal/ci/travis/android/script.sh rename to ci/travis/android/script.sh diff --git a/gdal/ci/travis/big_endian/before_install.sh b/ci/travis/big_endian/before_install.sh similarity index 100% rename from gdal/ci/travis/big_endian/before_install.sh rename to ci/travis/big_endian/before_install.sh diff --git a/gdal/ci/travis/big_endian/install.sh b/ci/travis/big_endian/install.sh similarity index 100% rename from gdal/ci/travis/big_endian/install.sh rename to ci/travis/big_endian/install.sh diff --git a/gdal/ci/travis/big_endian/script.sh b/ci/travis/big_endian/script.sh similarity index 100% rename from gdal/ci/travis/big_endian/script.sh rename to ci/travis/big_endian/script.sh diff --git a/gdal/ci/travis/common_install.sh b/ci/travis/common_install.sh similarity index 100% rename from gdal/ci/travis/common_install.sh rename to ci/travis/common_install.sh diff --git a/gdal/ci/travis/conda/compile.sh b/ci/travis/conda/compile.sh similarity index 100% rename from gdal/ci/travis/conda/compile.sh rename to ci/travis/conda/compile.sh diff --git a/gdal/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh similarity index 92% rename from gdal/ci/travis/conda/setup.sh rename to ci/travis/conda/setup.sh index 38c7699a8819..a6e2936eca52 100755 --- a/gdal/ci/travis/conda/setup.sh +++ b/ci/travis/conda/setup.sh @@ -5,7 +5,7 @@ if grep -q "windows" <<< "$PLATFORM"; then else conda install -c conda-forge conda-build automake pkgconfig anaconda-client python=3.8 -y # Generating ./configure # - (cd gdal && ./autogen.sh && cd ../ ) + ./autogen.sh fi git clone https://github.com/conda-forge/gdal-feedstock.git diff --git a/gdal/ci/travis/conda/upload.sh b/ci/travis/conda/upload.sh similarity index 100% rename from gdal/ci/travis/conda/upload.sh rename to ci/travis/conda/upload.sh diff --git a/gdal/ci/travis/csa_common/before_install.sh b/ci/travis/csa_common/before_install.sh similarity index 100% rename from gdal/ci/travis/csa_common/before_install.sh rename to ci/travis/csa_common/before_install.sh diff --git a/gdal/ci/travis/csa_common/install.sh b/ci/travis/csa_common/install.sh similarity index 54% rename from gdal/ci/travis/csa_common/install.sh rename to ci/travis/csa_common/install.sh index 09ecbc6de27f..304a71b67fb4 100755 --- a/gdal/ci/travis/csa_common/install.sh +++ b/ci/travis/csa_common/install.sh @@ -20,4 +20,4 @@ $SCRIPT_DIR/../common_install.sh (cd proj; sudo make -j3 install && sudo ldconfig) export PATH=$PWD/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04/bin:$PATH -(cd gdal && ./autogen.sh && CXXFLAGS="-std=c++11 -DCSA_BUILD" CFLAGS="-DCSA_BUILD" scan-build ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --with-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-java --with-mdb --with-jvm-lib-add-rpath --with-epsilon --with-ecw=/usr/local --with-fgdb=/usr/local --with-libkml --with-openjpeg=/usr/local --without-grib --with-proj=/usr/local) +(./autogen.sh && CXXFLAGS="-std=c++11 -DCSA_BUILD" CFLAGS="-DCSA_BUILD" scan-build ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --with-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-java --with-mdb --with-jvm-lib-add-rpath --with-epsilon --with-ecw=/usr/local --with-fgdb=/usr/local --with-libkml --with-openjpeg=/usr/local --without-grib --with-proj=/usr/local) diff --git a/gdal/ci/travis/csa_common/script.sh b/ci/travis/csa_common/script.sh similarity index 95% rename from gdal/ci/travis/csa_common/script.sh rename to ci/travis/csa_common/script.sh index c117da203c15..6546b56f4d28 100755 --- a/gdal/ci/travis/csa_common/script.sh +++ b/ci/travis/csa_common/script.sh @@ -5,7 +5,7 @@ set -e sudo apt-get install -y jq rm -f filtered_scanbuild.txt -files=$(find gdal/scanbuildoutput -name "*.sarif") +files=$(find scanbuildoutput -name "*.sarif") for f in $files; do # CSA 10 uses artifactLocation. Earlier versions used fileLocation (sed 's/fileLocation/artifactLocation/g' < $f) |jq '.runs[].results[] | (if .locations[].physicalLocation.artifactLocation.uri | (contains("/usr/include") or contains("degrib") or contains("libpng") or contains("libjpeg") or contains("EHapi") or contains("GDapi") or contains("SWapi") or contains("osr_cs_wkt_parser") or contains("ods_formula_parser") or contains("swq_parser") or contains("json_tokener") ) then empty else { "uri": .locations[].physicalLocation.artifactLocation.uri, "msg": .message.text, "location": .codeFlows[-1].threadFlows[-1].locations[-1] } end)' > tmp.txt diff --git a/gdal/ci/travis/csa_part_1/before_install.sh b/ci/travis/csa_part_1/before_install.sh similarity index 100% rename from gdal/ci/travis/csa_part_1/before_install.sh rename to ci/travis/csa_part_1/before_install.sh diff --git a/ci/travis/csa_part_1/install.sh b/ci/travis/csa_part_1/install.sh new file mode 100755 index 000000000000..ff7540525a33 --- /dev/null +++ b/ci/travis/csa_part_1/install.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +# shellcheck source=ci/travis/csa_common/install.sh +. $(dirname $0)/../csa_common/install.sh + +GDAL_TOPDIR=$PWD + +for dirname in port gcore frmts alg gnm ; do + (cd $dirname; scan-build -o $GDAL_TOPDIR/scanbuildoutput -sarif -v -enable-checker alpha.unix.cstring.OutOfBounds,alpha.unix.cstring.BufferOverlap,optin.cplusplus.VirtualCall,optin.cplusplus.UninitializedObject make -j4) +done + +(cd apps; scan-build -o $GDAL_TOPDIR/scanbuildoutput -sarif -v -enable-checker alpha.unix.cstring.OutOfBounds,alpha.unix.cstring.BufferOverlap,optin.cplusplus.VirtualCall,optin.cplusplus.UninitializedObject make -j4 appslib) diff --git a/gdal/ci/travis/csa_part_1/script.sh b/ci/travis/csa_part_1/script.sh similarity index 100% rename from gdal/ci/travis/csa_part_1/script.sh rename to ci/travis/csa_part_1/script.sh diff --git a/gdal/ci/travis/csa_part_2/before_install.sh b/ci/travis/csa_part_2/before_install.sh similarity index 100% rename from gdal/ci/travis/csa_part_2/before_install.sh rename to ci/travis/csa_part_2/before_install.sh diff --git a/ci/travis/csa_part_2/install.sh b/ci/travis/csa_part_2/install.sh new file mode 100755 index 000000000000..fbcbdbb6cac7 --- /dev/null +++ b/ci/travis/csa_part_2/install.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +# shellcheck source=ci/travis/csa_common/install.sh +. $(dirname $0)/../csa_common/install.sh + +GDAL_TOPDIR=$PWD + +make generate_gdal_version_h +(cd ogr && scan-build -o $GDAL_TOPDIR/scanbuildoutput -sarif -v -enable-checker alpha.unix.cstring.OutOfBounds,alpha.unix.cstring.BufferOverlap,alpha.unix.cstring.BufferOverlap,optin.cplusplus.VirtualCall,optin.cplusplus.UninitializedObject make -j4) + diff --git a/gdal/ci/travis/csa_part_2/script.sh b/ci/travis/csa_part_2/script.sh similarity index 100% rename from gdal/ci/travis/csa_part_2/script.sh rename to ci/travis/csa_part_2/script.sh diff --git a/gdal/ci/travis/graviton2/before_install.sh b/ci/travis/graviton2/before_install.sh similarity index 100% rename from gdal/ci/travis/graviton2/before_install.sh rename to ci/travis/graviton2/before_install.sh diff --git a/gdal/ci/travis/graviton2/install.sh b/ci/travis/graviton2/install.sh similarity index 59% rename from gdal/ci/travis/graviton2/install.sh rename to ci/travis/graviton2/install.sh index 22421ef233a2..c31f40be15bd 100755 --- a/gdal/ci/travis/graviton2/install.sh +++ b/ci/travis/graviton2/install.sh @@ -27,12 +27,12 @@ sudo sh -c "apt-get remove -y libproj-dev" export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # Configure GDAL -sh -c "cd $PWD/gdal && ./autogen.sh && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols" +sh -c "cd $PWD && ./autogen.sh && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols" -sh -c "cd $PWD/gdal && CCACHE_CPP2=yes make USER_DEFS=-Werror -j3" -sh -c "cd $PWD/gdal/apps && make USER_DEFS=-Werror -j3 test_ogrsf" +sh -c "cd $PWD && CCACHE_CPP2=yes make USER_DEFS=-Werror -j3" +sh -c "cd $PWD/apps && make USER_DEFS=-Werror -j3 test_ogrsf" sudo sh -c "rm -f /usr/lib/libgdal.so*" -sudo sh -c "cd $PWD/gdal && make install" +sudo sh -c "cd $PWD && make install" sudo sh -c "sudo ldconfig" sudo sh -c "ln -s libgdal.so /usr/lib/libgdal.so.20" sh -c "cd $PWD/autotest/cpp && CCACHE_CPP2=yes make -j3" diff --git a/gdal/ci/travis/graviton2/script.sh b/ci/travis/graviton2/script.sh similarity index 100% rename from gdal/ci/travis/graviton2/script.sh rename to ci/travis/graviton2/script.sh diff --git a/gdal/ci/travis/mingw_w64/before_install.sh b/ci/travis/mingw_w64/before_install.sh similarity index 100% rename from gdal/ci/travis/mingw_w64/before_install.sh rename to ci/travis/mingw_w64/before_install.sh diff --git a/gdal/ci/travis/mingw_w64/install.sh b/ci/travis/mingw_w64/install.sh similarity index 100% rename from gdal/ci/travis/mingw_w64/install.sh rename to ci/travis/mingw_w64/install.sh diff --git a/gdal/ci/travis/mingw_w64/script.sh b/ci/travis/mingw_w64/script.sh similarity index 100% rename from gdal/ci/travis/mingw_w64/script.sh rename to ci/travis/mingw_w64/script.sh diff --git a/gdal/ci/travis/osx/before_install.sh b/ci/travis/osx/before_install.sh similarity index 100% rename from gdal/ci/travis/osx/before_install.sh rename to ci/travis/osx/before_install.sh diff --git a/gdal/ci/travis/osx/install.sh b/ci/travis/osx/install.sh similarity index 96% rename from gdal/ci/travis/osx/install.sh rename to ci/travis/osx/install.sh index a1a95de9654a..fa6a6f0e36d5 100755 --- a/gdal/ci/travis/osx/install.sh +++ b/ci/travis/osx/install.sh @@ -10,7 +10,6 @@ CONDA_PREFIX=/usr/local/miniconda/envs/test find ${CONDA_PREFIX}/lib -name '*.la' -delete # build GDAL -cd gdal ./autogen.sh # --without-tiledb because of https://github.com/OSGeo/gdal/issues/3122 ./configure --prefix=$HOME/install-gdal \ @@ -40,14 +39,14 @@ export PATH=$HOME/install-gdal/bin:$PWD/apps/.libs:$PATH export DYLD_LIBRARY_PATH=$HOME/install-gdal/lib export GDAL_DATA=$HOME/install-gdal/share/gdal -cd ../autotest/cpp +cd autotest/cpp echo $PATH gdal-config --version gdal-config --cflags gdal-config --libs make -j3 -cd ../../gdal +cd ../.. # Post-install testing # ../autotest/postinstall/test_pkg-config.sh $HOME/install-gdal diff --git a/gdal/ci/travis/osx/script.sh b/ci/travis/osx/script.sh similarity index 92% rename from gdal/ci/travis/osx/script.sh rename to ci/travis/osx/script.sh index 4f8c64f9150a..0e739a140f8f 100755 --- a/gdal/ci/travis/osx/script.sh +++ b/ci/travis/osx/script.sh @@ -2,7 +2,7 @@ set -e -export PYTHONPATH=$PWD/gdal/swig/python/build/lib.macosx-10.9-x86_64-3.8 +export PYTHONPATH=$PWD/swig/python/build/lib.macosx-10.9-x86_64-3.8 export PYTEST="python3 -m pytest -vv -p no:sugar --color=no" export DYLD_LIBRARY_PATH=$HOME/install-gdal/lib export GDAL_DATA=$HOME/install-gdal/share/gdal diff --git a/gdal/ci/travis/python3/before_install.sh b/ci/travis/python3/before_install.sh similarity index 100% rename from gdal/ci/travis/python3/before_install.sh rename to ci/travis/python3/before_install.sh diff --git a/gdal/ci/travis/python3/install.sh b/ci/travis/python3/install.sh similarity index 100% rename from gdal/ci/travis/python3/install.sh rename to ci/travis/python3/install.sh diff --git a/gdal/ci/travis/python3/script.sh b/ci/travis/python3/script.sh similarity index 100% rename from gdal/ci/travis/python3/script.sh rename to ci/travis/python3/script.sh diff --git a/gdal/ci/travis/s390x/before_install.sh b/ci/travis/s390x/before_install.sh similarity index 100% rename from gdal/ci/travis/s390x/before_install.sh rename to ci/travis/s390x/before_install.sh diff --git a/gdal/ci/travis/s390x/install.sh b/ci/travis/s390x/install.sh similarity index 59% rename from gdal/ci/travis/s390x/install.sh rename to ci/travis/s390x/install.sh index 22421ef233a2..c31f40be15bd 100755 --- a/gdal/ci/travis/s390x/install.sh +++ b/ci/travis/s390x/install.sh @@ -27,12 +27,12 @@ sudo sh -c "apt-get remove -y libproj-dev" export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # Configure GDAL -sh -c "cd $PWD/gdal && ./autogen.sh && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols" +sh -c "cd $PWD && ./autogen.sh && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-mysql --with-liblzma --without-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-libtiff=internal --with-rename-internal-libtiff-symbols" -sh -c "cd $PWD/gdal && CCACHE_CPP2=yes make USER_DEFS=-Werror -j3" -sh -c "cd $PWD/gdal/apps && make USER_DEFS=-Werror -j3 test_ogrsf" +sh -c "cd $PWD && CCACHE_CPP2=yes make USER_DEFS=-Werror -j3" +sh -c "cd $PWD/apps && make USER_DEFS=-Werror -j3 test_ogrsf" sudo sh -c "rm -f /usr/lib/libgdal.so*" -sudo sh -c "cd $PWD/gdal && make install" +sudo sh -c "cd $PWD && make install" sudo sh -c "sudo ldconfig" sudo sh -c "ln -s libgdal.so /usr/lib/libgdal.so.20" sh -c "cd $PWD/autotest/cpp && CCACHE_CPP2=yes make -j3" diff --git a/gdal/ci/travis/s390x/script.sh b/ci/travis/s390x/script.sh similarity index 100% rename from gdal/ci/travis/s390x/script.sh rename to ci/travis/s390x/script.sh diff --git a/gdal/ci/travis/sanitize/before_install.sh b/ci/travis/sanitize/before_install.sh similarity index 100% rename from gdal/ci/travis/sanitize/before_install.sh rename to ci/travis/sanitize/before_install.sh diff --git a/gdal/ci/travis/sanitize/install.sh b/ci/travis/sanitize/install.sh similarity index 100% rename from gdal/ci/travis/sanitize/install.sh rename to ci/travis/sanitize/install.sh diff --git a/gdal/ci/travis/sanitize/script.sh b/ci/travis/sanitize/script.sh similarity index 100% rename from gdal/ci/travis/sanitize/script.sh rename to ci/travis/sanitize/script.sh diff --git a/gdal/ci/travis/trusty_32bit/before_install.sh b/ci/travis/trusty_32bit/before_install.sh similarity index 100% rename from gdal/ci/travis/trusty_32bit/before_install.sh rename to ci/travis/trusty_32bit/before_install.sh diff --git a/gdal/ci/travis/trusty_32bit/install.sh b/ci/travis/trusty_32bit/install.sh similarity index 100% rename from gdal/ci/travis/trusty_32bit/install.sh rename to ci/travis/trusty_32bit/install.sh diff --git a/gdal/ci/travis/trusty_32bit/script.sh b/ci/travis/trusty_32bit/script.sh similarity index 100% rename from gdal/ci/travis/trusty_32bit/script.sh rename to ci/travis/trusty_32bit/script.sh diff --git a/gdal/ci/travis/trusty_clang/before_install.sh b/ci/travis/trusty_clang/before_install.sh similarity index 100% rename from gdal/ci/travis/trusty_clang/before_install.sh rename to ci/travis/trusty_clang/before_install.sh diff --git a/gdal/ci/travis/trusty_clang/install.sh b/ci/travis/trusty_clang/install.sh similarity index 100% rename from gdal/ci/travis/trusty_clang/install.sh rename to ci/travis/trusty_clang/install.sh diff --git a/gdal/ci/travis/trusty_clang/script.sh b/ci/travis/trusty_clang/script.sh similarity index 100% rename from gdal/ci/travis/trusty_clang/script.sh rename to ci/travis/trusty_clang/script.sh diff --git a/gdal/ci/travis/ubuntu_1604/before_install.sh b/ci/travis/ubuntu_1604/before_install.sh similarity index 100% rename from gdal/ci/travis/ubuntu_1604/before_install.sh rename to ci/travis/ubuntu_1604/before_install.sh diff --git a/gdal/ci/travis/ubuntu_1604/install.sh b/ci/travis/ubuntu_1604/install.sh similarity index 100% rename from gdal/ci/travis/ubuntu_1604/install.sh rename to ci/travis/ubuntu_1604/install.sh diff --git a/gdal/ci/travis/ubuntu_1604/script.sh b/ci/travis/ubuntu_1604/script.sh similarity index 100% rename from gdal/ci/travis/ubuntu_1604/script.sh rename to ci/travis/ubuntu_1604/script.sh diff --git a/gdal/ci/travis/ubuntu_1804/before_install.sh b/ci/travis/ubuntu_1804/before_install.sh similarity index 100% rename from gdal/ci/travis/ubuntu_1804/before_install.sh rename to ci/travis/ubuntu_1804/before_install.sh diff --git a/gdal/ci/travis/ubuntu_1804/install.sh b/ci/travis/ubuntu_1804/install.sh similarity index 100% rename from gdal/ci/travis/ubuntu_1804/install.sh rename to ci/travis/ubuntu_1804/install.sh diff --git a/gdal/ci/travis/ubuntu_1804/script.sh b/ci/travis/ubuntu_1804/script.sh similarity index 100% rename from gdal/ci/travis/ubuntu_1804/script.sh rename to ci/travis/ubuntu_1804/script.sh diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake index 60ba000ed043..5f8e5059d746 100644 --- a/cmake/helpers/CheckDependentLibraries.cmake +++ b/cmake/helpers/CheckDependentLibraries.cmake @@ -1,5 +1,5 @@ # Distributed under the GDAL/OGR MIT/X style License. See accompanying -# file gdal/LICENSE.TXT. +# file LICENSE.TXT. #[=======================================================================[.rst: CheckDependentLibraries.cmake diff --git a/cmake/helpers/GdalDriverHelper.cmake b/cmake/helpers/GdalDriverHelper.cmake index 94d6345f44a5..828bc9bd167d 100644 --- a/cmake/helpers/GdalDriverHelper.cmake +++ b/cmake/helpers/GdalDriverHelper.cmake @@ -1,5 +1,5 @@ # Distributed under the GDAL/OGR MIT/X style License. See accompanying -# file gdal/LICENSE.TXT. +# file LICENSE.TXT. #[=======================================================================[.rst: GdalDriverHelper @@ -196,8 +196,8 @@ endmacro() # Macro for including driver directories. # Following macro should use only in the directories: # -# gdal/ogr/ogrsf_frmts/ -# gdal/frmts/ +# ogr/ogrsf_frmts/ +# frmts/ # include(CMakeDependentOption) diff --git a/cmake/helpers/GdalStandardIncludes.cmake b/cmake/helpers/GdalStandardIncludes.cmake index d89859aa6f12..c38c057b1261 100644 --- a/cmake/helpers/GdalStandardIncludes.cmake +++ b/cmake/helpers/GdalStandardIncludes.cmake @@ -1,5 +1,5 @@ # Distributed under the GDAL/OGR MIT/X style License. See accompanying -# file gdal/LICENSE.TXT. +# file LICENSE.TXT. #[=======================================================================[.rst: GdalStandardIncludes @@ -16,7 +16,7 @@ function(gdal_standard_includes _TARGET) $ # port $ $ - $ # gdal/ogr/ogrsf_frmts - $ # gdal/frmts + $ # ogr/ogrsf_frmts + $ # frmts ) -endfunction() \ No newline at end of file +endfunction() diff --git a/cmake/helpers/GdalSwigBindings.cmake b/cmake/helpers/GdalSwigBindings.cmake index 6c47d41fc021..86f1f3f7b959 100644 --- a/cmake/helpers/GdalSwigBindings.cmake +++ b/cmake/helpers/GdalSwigBindings.cmake @@ -1,5 +1,5 @@ # Distributed under the GDAL/OGR MIT/X style License. See accompanying -# file gdal/LICENSE.TXT. +# file LICENSE.TXT. #[=======================================================================[.rst: GdalSwigBindings @@ -16,8 +16,8 @@ function(gdal_swig_bindings) set(_oneValueArgs BINDING) set(_multiValueArgs "ARGS;DEPENDS;OUTPUT") cmake_parse_arguments(_SWIG "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/gdal/swig/${_SWIG_BINDING}/extensions) - set(SWIG_ARGS -Wall ${_SWIG_ARGS} -I${CMAKE_SOURCE_DIR}/gdal/swig/include -I${CMAKE_SOURCE_DIR}/gdal/swig/include/${_SWIG_BINDING}) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/swig/${_SWIG_BINDING}/extensions) + set(SWIG_ARGS -Wall ${_SWIG_ARGS} -I${CMAKE_SOURCE_DIR}/swig/include -I${CMAKE_SOURCE_DIR}/swig/include/${_SWIG_BINDING}) # for gdalconst.i gdal_swig_binding_target( TARGET gdalconst @@ -26,8 +26,8 @@ function(gdal_swig_bindings) OUTPUT ${SWIG_OUTPUT} DEPENDS ${GDAL_SWIG_COMMON_INTERFACE_FILES} ${_SWIG_DEPENDS} - ${CMAKE_SOURCE_DIR}/gdal/swig/include/${_SWIG_BINDING}/typemaps_${_SWIG_BINDING}.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/gdalconst.i + ${CMAKE_SOURCE_DIR}/swig/include/${_SWIG_BINDING}/typemaps_${_SWIG_BINDING}.i + ${CMAKE_SOURCE_DIR}/swig/include/gdalconst.i ) # for other interfaces foreach (tgt IN ITEMS gdal ogr osr gnm) @@ -38,9 +38,9 @@ function(gdal_swig_bindings) OUTPUT ${SWIG_OUTPUT} DEPENDS ${GDAL_SWIG_COMMON_INTERFACE_FILES} ${_SWIG_DEPENDS} - ${CMAKE_SOURCE_DIR}/gdal/swig/include/${_SWIG_BINDING}/typemaps_${_SWIG_BINDING}.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/${tgt}.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/${_SWIG_BINDING}/${tgt}_${_SWIG_BINDING}.i + ${CMAKE_SOURCE_DIR}/swig/include/${_SWIG_BINDING}/typemaps_${_SWIG_BINDING}.i + ${CMAKE_SOURCE_DIR}/swig/include/${tgt}.i + ${CMAKE_SOURCE_DIR}/swig/include/${_SWIG_BINDING}/${tgt}_${_SWIG_BINDING}.i ) endforeach () endfunction() @@ -52,16 +52,16 @@ function(gdal_swig_binding_target) set(_multiValueArgs "ARGS;DEPENDS;OUTPUT") cmake_parse_arguments(_SWIG "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) if (_SWIG_CXX) - set(_OUTPUT ${CMAKE_BINARY_DIR}/gdal/swig/${_SWIG_BINDING}/extensions/${_SWIG_TARGET}_wrap.cpp) + set(_OUTPUT ${CMAKE_BINARY_DIR}/swig/${_SWIG_BINDING}/extensions/${_SWIG_TARGET}_wrap.cpp) else () - set(_OUTPUT ${CMAKE_BINARY_DIR}/gdal/swig/${_SWIG_BINDING}/extensions/${_SWIG_TARGET}_wrap.c) + set(_OUTPUT ${CMAKE_BINARY_DIR}/swig/${_SWIG_BINDING}/extensions/${_SWIG_TARGET}_wrap.c) endif () add_custom_command( OUTPUT ${_OUTPUT} ${_SWIG_OUTPUT} COMMAND ${SWIG_EXECUTABLE} ${_SWIG_ARGS} ${SWIG_DEFINES} -I${CMAKE_SOURCE_DIR}/gdal $<$:-c++> -${_SWIG_BINDING} -o ${_OUTPUT} - ${CMAKE_SOURCE_DIR}/gdal/swig/include/${_SWIG_TARGET}.i + ${CMAKE_SOURCE_DIR}/swig/include/${_SWIG_TARGET}.i DEPENDS ${_SWIG_DEPENDS}) set_source_files_properties(${SWIG_OUTPUT} PROPERTIES GENERATED 1) endfunction() diff --git a/cmake/helpers/GdalVersion.cmake b/cmake/helpers/GdalVersion.cmake index 58acc3663ce7..1f52eaba20d2 100644 --- a/cmake/helpers/GdalVersion.cmake +++ b/cmake/helpers/GdalVersion.cmake @@ -1,5 +1,5 @@ # Distributed under the GDAL/OGR MIT/X style License. See accompanying -# file gdal/LICENSE.TXT. +# file LICENSE.TXT. #[=======================================================================[.rst: GdalVersion @@ -17,7 +17,7 @@ GdalVersion #]=======================================================================] # parse the version number from gdal_version.h and include in GDAL_MAJOR_VERSION and GDAL_MINOR_VERSION -file(READ ${CMAKE_SOURCE_DIR}/gdal/gcore/gdal_version.h.in GDAL_VERSION_H_CONTENTS) +file(READ ${CMAKE_SOURCE_DIR}/gcore/gdal_version.h.in GDAL_VERSION_H_CONTENTS) string(REGEX MATCH "GDAL_VERSION_MAJOR[ \t]+([0-9]+)" GDAL_VERSION_MAJOR ${GDAL_VERSION_H_CONTENTS}) string(REGEX MATCH "([0-9]+)" @@ -46,7 +46,7 @@ else () git_local_changes(GIT_LOCAL_CHG ${CMAKE_SOURCE_DIR}) string(SUBSTRING ${GDAL_GIT_HASH} 0 10 REV) set(GDAL_DEV_REVISION "dev-${REV}") - file(READ ${CMAKE_SOURCE_DIR}/gdal/gcore/gdal_version.h.in GDAL_VERSION_H_CONTENTS) + file(READ ${CMAKE_SOURCE_DIR}/gcore/gdal_version.h.in GDAL_VERSION_H_CONTENTS) string(CONCAT GDAL_VERSION_H_CONTENTS "/* This is a generated file from gdal_version.h.in. DO NOT MODIFY !!!! */\n" @@ -59,7 +59,7 @@ else () OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gcore/gdal_version.h CONTENT "${GDAL_VERSION_H_CONTENTS}") else () - file(READ ${CMAKE_SOURCE_DIR}/gdal/gcore/gdal_version.h.in GDAL_VERSION_H_CONTENTS) + file(READ ${CMAKE_SOURCE_DIR}/gcore/gdal_version.h.in GDAL_VERSION_H_CONTENTS) string(CONCAT GDAL_VERSION_H_CONTENTS "/* This is a generated file from gdal_version.h.in. DO NOT MODIFY !!!! */\n" @@ -71,7 +71,7 @@ else () endif () if (NOT GDAL_SOVERSION) - file(READ ${CMAKE_SOURCE_DIR}/gdal/GDALmake.opt.in GDAL_MAKE_OPT_CONTENT) + file(READ ${CMAKE_SOURCE_DIR}/GDALmake.opt.in GDAL_MAKE_OPT_CONTENT) string(REGEX MATCH "^LIBGDAL_CURRENT :=[ /t]+([0-9]+)$" "${GDAL_MAKE_OPT_CONTENT}" GDAL_SOVERSION) string(REGEX MATCH "([0-9]+)" "${GDAL_SOVERSION}" GDAL_SOVERSION) # when fails to get soversion, fallback to some default diff --git a/cmake/helpers/TargetPublicHeader.cmake b/cmake/helpers/TargetPublicHeader.cmake index 3e2079e85d21..e6ffe5aedbaa 100644 --- a/cmake/helpers/TargetPublicHeader.cmake +++ b/cmake/helpers/TargetPublicHeader.cmake @@ -1,5 +1,5 @@ # Distributed under the GDAL/OGR MIT/X style License. See accompanying -# file gdal/LICENSE.TXT. +# file LICENSE.TXT. #[=======================================================================[.rst: TargetPublicHeader @@ -32,4 +32,4 @@ function(target_public_header) endif() _convert_to_full_path(FILE_LISTS _PUBLIC_HEADERS) set_property(TARGET gdal APPEND PROPERTY PUBLIC_HEADER "${FILE_LISTS}") -endfunction() \ No newline at end of file +endfunction() diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake index 9d7e16ed3f6a..ec065388ef8f 100644 --- a/cmake/helpers/configure.cmake +++ b/cmake/helpers/configure.cmake @@ -1,4 +1,4 @@ -# Distributed under the GDAL/OGR MIT/X style License. See accompanying file gdal/LICENSE.TXT. +# Distributed under the GDAL/OGR MIT/X style License. See accompanying file LICENSE.TXT. #[=======================================================================[.rst: configure @@ -438,6 +438,6 @@ if (UNIX) endif () endif () -configure_file(${GDAL_CMAKE_TEMPLATE_PATH}/cpl_config.h.in ${CMAKE_BINARY_DIR}/gdal/port/cpl_config.h @ONLY) +configure_file(${GDAL_CMAKE_TEMPLATE_PATH}/cpl_config.h.in ${CMAKE_BINARY_DIR}/port/cpl_config.h @ONLY) # vim: ts=4 sw=4 sts=4 et diff --git a/cmake/modules/packages/FindMRSID.cmake b/cmake/modules/packages/FindMRSID.cmake index 5b0cf90e8a7c..0cf1521099dd 100644 --- a/cmake/modules/packages/FindMRSID.cmake +++ b/cmake/modules/packages/FindMRSID.cmake @@ -1,5 +1,5 @@ # Distributed under the GDAL/OGR MIT/X style License. See accompanying -# file gdal/LICENSE.TXT. +# file LICENSE.TXT. #[=======================================================================[.rst: configure diff --git a/cmake/template/Doxyfile.in b/cmake/template/Doxyfile.in index fe11765ac69d..36a1399693f0 100644 --- a/cmake/template/Doxyfile.in +++ b/cmake/template/Doxyfile.in @@ -494,7 +494,7 @@ REFERENCES_RELATION = NO # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will # link to the source code. Otherwise they will link to the documentation. # -# http://trac.osgeo.org/gdal/ticket/2723 +# http://trac.osgeo.org/ticket/2723 REFERENCES_LINK_SOURCE = NO @@ -558,7 +558,7 @@ HTML_HEADER = # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = ${CMAKE_SOURCE_DIR}/gdal/doc/gdal_footer.html +HTML_FOOTER = ${CMAKE_SOURCE_DIR}/doc/gdal_footer.html # Custom layout (see http://www.stack.nl/~dimitri/doxygen/manual/customize.html) LAYOUT_FILE = ${GDAL_DOXYGEN_LAYOUT_FILE} diff --git a/cmake/template/Makefile.PL.in b/cmake/template/Makefile.PL.in index aec185541e18..1cbd42cbf335 100644 --- a/cmake/template/Makefile.PL.in +++ b/cmake/template/Makefile.PL.in @@ -8,7 +8,7 @@ use Cwd; my $source_tree = '@CMAKE_SOURCE_DIR@/gdal'; my $build_tree = '@CMAKE_BINARY_DIR@/gdal'; my $wrap_dir = '@GDAL_PERL_WRAP_OBJ_DIR@'; -my $config = "@CMAKE_BINARY_DIR@/gdal/apps/gdal-config"; +my $config = "@CMAKE_BINARY_DIR@/apps/gdal-config"; push @ARGV, "INSTALLSITEMAN1DIR=@INSTALL_PREFIX@/@INSTALL_BASE@/man1"; push @ARGV, "INSTALLSITEMAN3DIR=@INSTALL_PREFIX@/@INSTALL_BASE@/man3"; @@ -23,12 +23,12 @@ for my $module (sort keys %$objects) { my $OPTIMIZE = ''; $OPTIMIZE .= ' '.$ENV{CFLAGS} if $ENV{CFLAGS}; $OPTIMIZE .= ' '.$ENV{CPPFLAGS} if $ENV{CFLAGS}; - + my %PM = ( 'lib/Geo/GDAL.pm' => '$(INST_LIBDIR)/GDAL.pm', 'lib/Geo/OGR.pm' => '$(INST_LIBDIR)/OGR.pm', 'lib/Geo/OSR.pm' => '$(INST_LIBDIR)/OSR.pm', 'lib/Geo/Const.pm' => '$(INST_LIBDIR)/GDAL/Const.pm' ); - + $PM{'lib/Geo/GNM.pm'} = '$(INST_LIBDIR)/GNM.pm' if $objects->{'Geo::GNM'}; WriteMakefile( NAME => $module, @@ -64,7 +64,7 @@ sub get_config { if (/^CONFIG_LIBS/) { s/^CONFIG_LIBS="//; s/"\s*$//; - if ($_ =~ /\.la$/) { + if ($_ =~ /\.la$/) { $LIB .= parse_libtool_library_file_for_l($_); } else { $LIB .= $_; diff --git a/cmake/template/setup.py.in b/cmake/template/setup.py.in index 37e8609c08b3..19ec552dab38 100644 --- a/cmake/template/setup.py.in +++ b/cmake/template/setup.py.in @@ -16,8 +16,8 @@ from subprocess import check_output, CalledProcessError # Switches # --------------------------------------------------------------------------- -include_dirs = ['@CMAKE_BINARY_DIR@/gdal/port', '@CMAKE_SOURCE_DIR@/gdal/port', '@CMAKE_BINARY_DIR@/gdal/gcore', '@CMAKE_SOURCE_DIR@/gdal/gcore', '@CMAKE_SOURCE_DIR@/gdal/alg', '@CMAKE_SOURCE_DIR@/gdal/ogr/', '@CMAKE_SOURCE_DIR@/gdal/ogr/ogrsf_frmts', '@CMAKE_SOURCE_DIR@/gdal/gnm', '@CMAKE_SOURCE_DIR@/gdal/apps'] -library_dirs = ['@CMAKE_BINARY_DIR@/gdal/'] +include_dirs = ['@CMAKE_BINARY_DIR@/port', '@CMAKE_SOURCE_DIR@/port', '@CMAKE_BINARY_DIR@/gcore', '@CMAKE_SOURCE_DIR@/gcore', '@CMAKE_SOURCE_DIR@/alg', '@CMAKE_SOURCE_DIR@/ogr/', '@CMAKE_SOURCE_DIR@/ogr/ogrsf_frmts', '@CMAKE_SOURCE_DIR@/gnm', '@CMAKE_SOURCE_DIR@/apps'] +library_dirs = ['@CMAKE_BINARY_DIR@/'] libraries = ['gdal'] diff --git a/gdal/config.guess b/config.guess similarity index 100% rename from gdal/config.guess rename to config.guess diff --git a/gdal/config.rpath b/config.rpath similarity index 100% rename from gdal/config.rpath rename to config.rpath diff --git a/gdal/config.sub b/config.sub similarity index 100% rename from gdal/config.sub rename to config.sub diff --git a/gdal/configure.ac b/configure.ac similarity index 100% rename from gdal/configure.ac rename to configure.ac diff --git a/gdal/data/GDALLogoBW.svg b/data/GDALLogoBW.svg similarity index 100% rename from gdal/data/GDALLogoBW.svg rename to data/GDALLogoBW.svg diff --git a/gdal/data/GDALLogoColor.svg b/data/GDALLogoColor.svg similarity index 100% rename from gdal/data/GDALLogoColor.svg rename to data/GDALLogoColor.svg diff --git a/gdal/data/GDALLogoGS.svg b/data/GDALLogoGS.svg similarity index 100% rename from gdal/data/GDALLogoGS.svg rename to data/GDALLogoGS.svg diff --git a/gdal/data/bag_template.xml b/data/bag_template.xml similarity index 100% rename from gdal/data/bag_template.xml rename to data/bag_template.xml diff --git a/gdal/data/cubewerx_extra.wkt b/data/cubewerx_extra.wkt similarity index 100% rename from gdal/data/cubewerx_extra.wkt rename to data/cubewerx_extra.wkt diff --git a/gdal/data/default.rsc b/data/default.rsc similarity index 100% rename from gdal/data/default.rsc rename to data/default.rsc diff --git a/gdal/data/ecw_cs.wkt b/data/ecw_cs.wkt similarity index 100% rename from gdal/data/ecw_cs.wkt rename to data/ecw_cs.wkt diff --git a/gdal/data/eedaconf.json b/data/eedaconf.json similarity index 100% rename from gdal/data/eedaconf.json rename to data/eedaconf.json diff --git a/gdal/data/epsg.wkt b/data/epsg.wkt similarity index 100% rename from gdal/data/epsg.wkt rename to data/epsg.wkt diff --git a/gdal/data/esri_StatePlane_extra.wkt b/data/esri_StatePlane_extra.wkt similarity index 100% rename from gdal/data/esri_StatePlane_extra.wkt rename to data/esri_StatePlane_extra.wkt diff --git a/gdal/data/gdalicon.png b/data/gdalicon.png similarity index 100% rename from gdal/data/gdalicon.png rename to data/gdalicon.png diff --git a/gdal/data/gdalmdiminfo_output.schema.json b/data/gdalmdiminfo_output.schema.json similarity index 100% rename from gdal/data/gdalmdiminfo_output.schema.json rename to data/gdalmdiminfo_output.schema.json diff --git a/gdal/data/gdalvrt.xsd b/data/gdalvrt.xsd similarity index 100% rename from gdal/data/gdalvrt.xsd rename to data/gdalvrt.xsd diff --git a/gdal/data/gml_registry.xml b/data/gml_registry.xml similarity index 100% rename from gdal/data/gml_registry.xml rename to data/gml_registry.xml diff --git a/gdal/data/gmlasconf.xml b/data/gmlasconf.xml similarity index 100% rename from gdal/data/gmlasconf.xml rename to data/gmlasconf.xml diff --git a/gdal/data/gmlasconf.xsd b/data/gmlasconf.xsd similarity index 100% rename from gdal/data/gmlasconf.xsd rename to data/gmlasconf.xsd diff --git a/gdal/data/gt_datum.csv b/data/gt_datum.csv similarity index 100% rename from gdal/data/gt_datum.csv rename to data/gt_datum.csv diff --git a/gdal/data/gt_ellips.csv b/data/gt_ellips.csv similarity index 100% rename from gdal/data/gt_ellips.csv rename to data/gt_ellips.csv diff --git a/gdal/data/header.dxf b/data/header.dxf similarity index 100% rename from gdal/data/header.dxf rename to data/header.dxf diff --git a/gdal/data/inspire_cp_BasicPropertyUnit.gfs b/data/inspire_cp_BasicPropertyUnit.gfs similarity index 100% rename from gdal/data/inspire_cp_BasicPropertyUnit.gfs rename to data/inspire_cp_BasicPropertyUnit.gfs diff --git a/gdal/data/inspire_cp_CadastralBoundary.gfs b/data/inspire_cp_CadastralBoundary.gfs similarity index 100% rename from gdal/data/inspire_cp_CadastralBoundary.gfs rename to data/inspire_cp_CadastralBoundary.gfs diff --git a/gdal/data/inspire_cp_CadastralParcel.gfs b/data/inspire_cp_CadastralParcel.gfs similarity index 100% rename from gdal/data/inspire_cp_CadastralParcel.gfs rename to data/inspire_cp_CadastralParcel.gfs diff --git a/gdal/data/inspire_cp_CadastralZoning.gfs b/data/inspire_cp_CadastralZoning.gfs similarity index 100% rename from gdal/data/inspire_cp_CadastralZoning.gfs rename to data/inspire_cp_CadastralZoning.gfs diff --git a/gdal/data/jpfgdgml_AdmArea.gfs b/data/jpfgdgml_AdmArea.gfs similarity index 100% rename from gdal/data/jpfgdgml_AdmArea.gfs rename to data/jpfgdgml_AdmArea.gfs diff --git a/gdal/data/jpfgdgml_AdmBdry.gfs b/data/jpfgdgml_AdmBdry.gfs similarity index 100% rename from gdal/data/jpfgdgml_AdmBdry.gfs rename to data/jpfgdgml_AdmBdry.gfs diff --git a/gdal/data/jpfgdgml_AdmPt.gfs b/data/jpfgdgml_AdmPt.gfs similarity index 100% rename from gdal/data/jpfgdgml_AdmPt.gfs rename to data/jpfgdgml_AdmPt.gfs diff --git a/gdal/data/jpfgdgml_BldA.gfs b/data/jpfgdgml_BldA.gfs similarity index 100% rename from gdal/data/jpfgdgml_BldA.gfs rename to data/jpfgdgml_BldA.gfs diff --git a/gdal/data/jpfgdgml_BldL.gfs b/data/jpfgdgml_BldL.gfs similarity index 100% rename from gdal/data/jpfgdgml_BldL.gfs rename to data/jpfgdgml_BldL.gfs diff --git a/gdal/data/jpfgdgml_Cntr.gfs b/data/jpfgdgml_Cntr.gfs similarity index 100% rename from gdal/data/jpfgdgml_Cntr.gfs rename to data/jpfgdgml_Cntr.gfs diff --git a/gdal/data/jpfgdgml_CommBdry.gfs b/data/jpfgdgml_CommBdry.gfs similarity index 100% rename from gdal/data/jpfgdgml_CommBdry.gfs rename to data/jpfgdgml_CommBdry.gfs diff --git a/gdal/data/jpfgdgml_CommPt.gfs b/data/jpfgdgml_CommPt.gfs similarity index 100% rename from gdal/data/jpfgdgml_CommPt.gfs rename to data/jpfgdgml_CommPt.gfs diff --git a/gdal/data/jpfgdgml_Cstline.gfs b/data/jpfgdgml_Cstline.gfs similarity index 100% rename from gdal/data/jpfgdgml_Cstline.gfs rename to data/jpfgdgml_Cstline.gfs diff --git a/gdal/data/jpfgdgml_ElevPt.gfs b/data/jpfgdgml_ElevPt.gfs similarity index 100% rename from gdal/data/jpfgdgml_ElevPt.gfs rename to data/jpfgdgml_ElevPt.gfs diff --git a/gdal/data/jpfgdgml_GCP.gfs b/data/jpfgdgml_GCP.gfs similarity index 100% rename from gdal/data/jpfgdgml_GCP.gfs rename to data/jpfgdgml_GCP.gfs diff --git a/gdal/data/jpfgdgml_LeveeEdge.gfs b/data/jpfgdgml_LeveeEdge.gfs similarity index 100% rename from gdal/data/jpfgdgml_LeveeEdge.gfs rename to data/jpfgdgml_LeveeEdge.gfs diff --git a/gdal/data/jpfgdgml_RailCL.gfs b/data/jpfgdgml_RailCL.gfs similarity index 100% rename from gdal/data/jpfgdgml_RailCL.gfs rename to data/jpfgdgml_RailCL.gfs diff --git a/gdal/data/jpfgdgml_RdASL.gfs b/data/jpfgdgml_RdASL.gfs similarity index 100% rename from gdal/data/jpfgdgml_RdASL.gfs rename to data/jpfgdgml_RdASL.gfs diff --git a/gdal/data/jpfgdgml_RdArea.gfs b/data/jpfgdgml_RdArea.gfs similarity index 100% rename from gdal/data/jpfgdgml_RdArea.gfs rename to data/jpfgdgml_RdArea.gfs diff --git a/gdal/data/jpfgdgml_RdCompt.gfs b/data/jpfgdgml_RdCompt.gfs similarity index 100% rename from gdal/data/jpfgdgml_RdCompt.gfs rename to data/jpfgdgml_RdCompt.gfs diff --git a/gdal/data/jpfgdgml_RdEdg.gfs b/data/jpfgdgml_RdEdg.gfs similarity index 100% rename from gdal/data/jpfgdgml_RdEdg.gfs rename to data/jpfgdgml_RdEdg.gfs diff --git a/gdal/data/jpfgdgml_RdMgtBdry.gfs b/data/jpfgdgml_RdMgtBdry.gfs similarity index 100% rename from gdal/data/jpfgdgml_RdMgtBdry.gfs rename to data/jpfgdgml_RdMgtBdry.gfs diff --git a/gdal/data/jpfgdgml_RdSgmtA.gfs b/data/jpfgdgml_RdSgmtA.gfs similarity index 100% rename from gdal/data/jpfgdgml_RdSgmtA.gfs rename to data/jpfgdgml_RdSgmtA.gfs diff --git a/gdal/data/jpfgdgml_RvrMgtBdry.gfs b/data/jpfgdgml_RvrMgtBdry.gfs similarity index 100% rename from gdal/data/jpfgdgml_RvrMgtBdry.gfs rename to data/jpfgdgml_RvrMgtBdry.gfs diff --git a/gdal/data/jpfgdgml_SBAPt.gfs b/data/jpfgdgml_SBAPt.gfs similarity index 100% rename from gdal/data/jpfgdgml_SBAPt.gfs rename to data/jpfgdgml_SBAPt.gfs diff --git a/gdal/data/jpfgdgml_SBArea.gfs b/data/jpfgdgml_SBArea.gfs similarity index 100% rename from gdal/data/jpfgdgml_SBArea.gfs rename to data/jpfgdgml_SBArea.gfs diff --git a/gdal/data/jpfgdgml_SBBdry.gfs b/data/jpfgdgml_SBBdry.gfs similarity index 100% rename from gdal/data/jpfgdgml_SBBdry.gfs rename to data/jpfgdgml_SBBdry.gfs diff --git a/gdal/data/jpfgdgml_WA.gfs b/data/jpfgdgml_WA.gfs similarity index 100% rename from gdal/data/jpfgdgml_WA.gfs rename to data/jpfgdgml_WA.gfs diff --git a/gdal/data/jpfgdgml_WL.gfs b/data/jpfgdgml_WL.gfs similarity index 100% rename from gdal/data/jpfgdgml_WL.gfs rename to data/jpfgdgml_WL.gfs diff --git a/gdal/data/jpfgdgml_WStrA.gfs b/data/jpfgdgml_WStrA.gfs similarity index 100% rename from gdal/data/jpfgdgml_WStrA.gfs rename to data/jpfgdgml_WStrA.gfs diff --git a/gdal/data/jpfgdgml_WStrL.gfs b/data/jpfgdgml_WStrL.gfs similarity index 100% rename from gdal/data/jpfgdgml_WStrL.gfs rename to data/jpfgdgml_WStrL.gfs diff --git a/gdal/data/netcdf_config.xsd b/data/netcdf_config.xsd similarity index 100% rename from gdal/data/netcdf_config.xsd rename to data/netcdf_config.xsd diff --git a/gdal/data/nitf_spec.xml b/data/nitf_spec.xml similarity index 100% rename from gdal/data/nitf_spec.xml rename to data/nitf_spec.xml diff --git a/gdal/data/nitf_spec.xsd b/data/nitf_spec.xsd similarity index 100% rename from gdal/data/nitf_spec.xsd rename to data/nitf_spec.xsd diff --git a/gdal/data/ogrvrt.xsd b/data/ogrvrt.xsd similarity index 100% rename from gdal/data/ogrvrt.xsd rename to data/ogrvrt.xsd diff --git a/gdal/data/osmconf.ini b/data/osmconf.ini similarity index 100% rename from gdal/data/osmconf.ini rename to data/osmconf.ini diff --git a/gdal/data/ozi_datum.csv b/data/ozi_datum.csv similarity index 100% rename from gdal/data/ozi_datum.csv rename to data/ozi_datum.csv diff --git a/gdal/data/ozi_ellips.csv b/data/ozi_ellips.csv similarity index 100% rename from gdal/data/ozi_ellips.csv rename to data/ozi_ellips.csv diff --git a/gdal/data/pci_datum.txt b/data/pci_datum.txt similarity index 100% rename from gdal/data/pci_datum.txt rename to data/pci_datum.txt diff --git a/gdal/data/pci_ellips.txt b/data/pci_ellips.txt similarity index 100% rename from gdal/data/pci_ellips.txt rename to data/pci_ellips.txt diff --git a/gdal/data/pdfcomposition.xsd b/data/pdfcomposition.xsd similarity index 100% rename from gdal/data/pdfcomposition.xsd rename to data/pdfcomposition.xsd diff --git a/gdal/data/pds4_template.xml b/data/pds4_template.xml similarity index 100% rename from gdal/data/pds4_template.xml rename to data/pds4_template.xml diff --git a/gdal/data/plscenesconf.json b/data/plscenesconf.json similarity index 100% rename from gdal/data/plscenesconf.json rename to data/plscenesconf.json diff --git a/gdal/data/ruian_vf_ob_v1.gfs b/data/ruian_vf_ob_v1.gfs similarity index 100% rename from gdal/data/ruian_vf_ob_v1.gfs rename to data/ruian_vf_ob_v1.gfs diff --git a/gdal/data/ruian_vf_st_uvoh_v1.gfs b/data/ruian_vf_st_uvoh_v1.gfs similarity index 100% rename from gdal/data/ruian_vf_st_uvoh_v1.gfs rename to data/ruian_vf_st_uvoh_v1.gfs diff --git a/gdal/data/ruian_vf_st_v1.gfs b/data/ruian_vf_st_v1.gfs similarity index 100% rename from gdal/data/ruian_vf_st_v1.gfs rename to data/ruian_vf_st_v1.gfs diff --git a/gdal/data/ruian_vf_v1.gfs b/data/ruian_vf_v1.gfs similarity index 100% rename from gdal/data/ruian_vf_v1.gfs rename to data/ruian_vf_v1.gfs diff --git a/gdal/data/s57agencies.csv b/data/s57agencies.csv similarity index 100% rename from gdal/data/s57agencies.csv rename to data/s57agencies.csv diff --git a/gdal/data/s57attributes.csv b/data/s57attributes.csv similarity index 100% rename from gdal/data/s57attributes.csv rename to data/s57attributes.csv diff --git a/gdal/data/s57expectedinput.csv b/data/s57expectedinput.csv similarity index 100% rename from gdal/data/s57expectedinput.csv rename to data/s57expectedinput.csv diff --git a/gdal/data/s57objectclasses.csv b/data/s57objectclasses.csv similarity index 100% rename from gdal/data/s57objectclasses.csv rename to data/s57objectclasses.csv diff --git a/gdal/data/seed_2d.dgn b/data/seed_2d.dgn similarity index 100% rename from gdal/data/seed_2d.dgn rename to data/seed_2d.dgn diff --git a/gdal/data/seed_3d.dgn b/data/seed_3d.dgn similarity index 100% rename from gdal/data/seed_3d.dgn rename to data/seed_3d.dgn diff --git a/gdal/data/stateplane.csv b/data/stateplane.csv similarity index 100% rename from gdal/data/stateplane.csv rename to data/stateplane.csv diff --git a/gdal/data/template_tiles.mapml b/data/template_tiles.mapml similarity index 100% rename from gdal/data/template_tiles.mapml rename to data/template_tiles.mapml diff --git a/gdal/data/tms_LINZAntarticaMapTileGrid.json b/data/tms_LINZAntarticaMapTileGrid.json similarity index 100% rename from gdal/data/tms_LINZAntarticaMapTileGrid.json rename to data/tms_LINZAntarticaMapTileGrid.json diff --git a/gdal/data/tms_MapML_APSTILE.json b/data/tms_MapML_APSTILE.json similarity index 100% rename from gdal/data/tms_MapML_APSTILE.json rename to data/tms_MapML_APSTILE.json diff --git a/gdal/data/tms_MapML_CBMTILE.json b/data/tms_MapML_CBMTILE.json similarity index 100% rename from gdal/data/tms_MapML_CBMTILE.json rename to data/tms_MapML_CBMTILE.json diff --git a/gdal/data/tms_NZTM2000.json b/data/tms_NZTM2000.json similarity index 100% rename from gdal/data/tms_NZTM2000.json rename to data/tms_NZTM2000.json diff --git a/gdal/data/trailer.dxf b/data/trailer.dxf similarity index 100% rename from gdal/data/trailer.dxf rename to data/trailer.dxf diff --git a/gdal/data/vdv452.xml b/data/vdv452.xml similarity index 100% rename from gdal/data/vdv452.xml rename to data/vdv452.xml diff --git a/gdal/data/vdv452.xsd b/data/vdv452.xsd similarity index 100% rename from gdal/data/vdv452.xsd rename to data/vdv452.xsd diff --git a/gdal/data/vicar.json b/data/vicar.json similarity index 100% rename from gdal/data/vicar.json rename to data/vicar.json diff --git a/gdal/doc/.azure-pipelines.yml b/doc/.azure-pipelines.yml similarity index 95% rename from gdal/doc/.azure-pipelines.yml rename to doc/.azure-pipelines.yml index 48b764b7b44b..e695b636812a 100644 --- a/gdal/doc/.azure-pipelines.yml +++ b/doc/.azure-pipelines.yml @@ -33,7 +33,7 @@ jobs: displayName: 'Sphinx version' - script: | set -e - cd gdal/doc + cd doc if find . -name '*.rst' | xargs grep -P '\t'; then echo 'Tabs are bad, please use four spaces in .rst files.'; false; fi if find . -name '*.rst' | xargs grep "\.\.versionadded"; then echo 'Wrong annotation. Should be .. versionadded'; false; fi if find . -name '*.rst' | xargs grep "\.\.note"; then echo 'Wrong annotation. Should be .. note'; false; fi @@ -42,12 +42,12 @@ jobs: displayName: 'Lint .rst files' - script: | set -e - cd gdal/doc + cd doc make html O="-D enable_redirects=1 -t website" displayName: 'Make html' - script: | set -e - cd gdal/doc + cd doc make latexpdf displayName: 'Make pdf' - task: DownloadSecureFile@1 @@ -64,9 +64,9 @@ jobs: condition: notin(variables['Build.Reason'], 'PullRequest') - script: | set -e - mv gdal/doc/build/html gdal-docs + mv doc/build/html gdal-docs rm gdal-docs/gdal.pdf - cp gdal/doc/build/latex/gdal.pdf gdal-docs + cp doc/build/latex/gdal.pdf gdal-docs cp gdal/data/gdalicon.png gdal-docs # For GDAL autotest... cd gdal-docs wget http://download.osgeo.org/gdal/for_doc/javadoc.zip -O /tmp/javadoc.zip diff --git a/gdal/doc/.gitignore b/doc/.gitignore similarity index 100% rename from gdal/doc/.gitignore rename to doc/.gitignore diff --git a/gdal/doc/CMakeLists.txt b/doc/CMakeLists.txt similarity index 100% rename from gdal/doc/CMakeLists.txt rename to doc/CMakeLists.txt diff --git a/gdal/doc/Makefile b/doc/Makefile similarity index 100% rename from gdal/doc/Makefile rename to doc/Makefile diff --git a/gdal/doc/build_doc_snapshot.sh b/doc/build_doc_snapshot.sh similarity index 100% rename from gdal/doc/build_doc_snapshot.sh rename to doc/build_doc_snapshot.sh diff --git a/gdal/doc/environment.yml b/doc/environment.yml similarity index 100% rename from gdal/doc/environment.yml rename to doc/environment.yml diff --git a/gdal/doc/generate-sponsor-logos.sh b/doc/generate-sponsor-logos.sh similarity index 100% rename from gdal/doc/generate-sponsor-logos.sh rename to doc/generate-sponsor-logos.sh diff --git a/gdal/doc/images/GDALLogoColor.svg b/doc/images/GDALLogoColor.svg similarity index 100% rename from gdal/doc/images/GDALLogoColor.svg rename to doc/images/GDALLogoColor.svg diff --git a/gdal/doc/images/OSGeo_project.png b/doc/images/OSGeo_project.png similarity index 100% rename from gdal/doc/images/OSGeo_project.png rename to doc/images/OSGeo_project.png diff --git a/gdal/doc/images/components.PNG b/doc/images/components.PNG similarity index 100% rename from gdal/doc/images/components.PNG rename to doc/images/components.PNG diff --git a/gdal/doc/images/favicon.png b/doc/images/favicon.png similarity index 100% rename from gdal/doc/images/favicon.png rename to doc/images/favicon.png diff --git a/gdal/doc/images/foss4g2021.png b/doc/images/foss4g2021.png similarity index 100% rename from gdal/doc/images/foss4g2021.png rename to doc/images/foss4g2021.png diff --git a/gdal/doc/images/gdal_viewshed.png b/doc/images/gdal_viewshed.png similarity index 100% rename from gdal/doc/images/gdal_viewshed.png rename to doc/images/gdal_viewshed.png diff --git a/gdal/doc/images/gdalicon.png b/doc/images/gdalicon.png similarity index 100% rename from gdal/doc/images/gdalicon.png rename to doc/images/gdalicon.png diff --git a/gdal/doc/images/gdalicon_big.png b/doc/images/gdalicon_big.png similarity index 100% rename from gdal/doc/images/gdalicon_big.png rename to doc/images/gdalicon_big.png diff --git a/gdal/doc/images/gdalsequence.PNG b/doc/images/gdalsequence.PNG similarity index 100% rename from gdal/doc/images/gdalsequence.PNG rename to doc/images/gdalsequence.PNG diff --git a/gdal/doc/images/grid/ellipse.eps b/doc/images/grid/ellipse.eps similarity index 100% rename from gdal/doc/images/grid/ellipse.eps rename to doc/images/grid/ellipse.eps diff --git a/gdal/doc/images/grid/ellipse.png b/doc/images/grid/ellipse.png similarity index 100% rename from gdal/doc/images/grid/ellipse.png rename to doc/images/grid/ellipse.png diff --git a/gdal/doc/images/grid/gridding.eps b/doc/images/grid/gridding.eps similarity index 100% rename from gdal/doc/images/grid/gridding.eps rename to doc/images/grid/gridding.eps diff --git a/gdal/doc/images/grid/gridding.png b/doc/images/grid/gridding.png similarity index 100% rename from gdal/doc/images/grid/gridding.png rename to doc/images/grid/gridding.png diff --git a/gdal/doc/images/grid/src/GNUmakefile b/doc/images/grid/src/GNUmakefile similarity index 100% rename from gdal/doc/images/grid/src/GNUmakefile rename to doc/images/grid/src/GNUmakefile diff --git a/gdal/doc/images/grid/src/ellipse.tex b/doc/images/grid/src/ellipse.tex similarity index 100% rename from gdal/doc/images/grid/src/ellipse.tex rename to doc/images/grid/src/ellipse.tex diff --git a/gdal/doc/images/grid/src/figures.mp b/doc/images/grid/src/figures.mp similarity index 100% rename from gdal/doc/images/grid/src/figures.mp rename to doc/images/grid/src/figures.mp diff --git a/gdal/doc/images/grid/src/gridding.tex b/doc/images/grid/src/gridding.tex similarity index 100% rename from gdal/doc/images/grid/src/gridding.tex rename to doc/images/grid/src/gridding.tex diff --git a/gdal/doc/images/jpipsequence.PNG b/doc/images/jpipsequence.PNG similarity index 100% rename from gdal/doc/images/jpipsequence.PNG rename to doc/images/jpipsequence.PNG diff --git a/gdal/doc/images/logo-faunalia.png b/doc/images/logo-faunalia.png similarity index 100% rename from gdal/doc/images/logo-faunalia.png rename to doc/images/logo-faunalia.png diff --git a/gdal/doc/images/logo-mundialis.png b/doc/images/logo-mundialis.png similarity index 100% rename from gdal/doc/images/logo-mundialis.png rename to doc/images/logo-mundialis.png diff --git a/gdal/doc/images/logo-numfocus.png b/doc/images/logo-numfocus.png similarity index 100% rename from gdal/doc/images/logo-numfocus.png rename to doc/images/logo-numfocus.png diff --git a/gdal/doc/images/logo-osgeo.png b/doc/images/logo-osgeo.png similarity index 100% rename from gdal/doc/images/logo-osgeo.png rename to doc/images/logo-osgeo.png diff --git a/gdal/doc/images/logo-osgeo.svg b/doc/images/logo-osgeo.svg similarity index 100% rename from gdal/doc/images/logo-osgeo.svg rename to doc/images/logo-osgeo.svg diff --git a/gdal/doc/images/logo-spatialys.png b/doc/images/logo-spatialys.png similarity index 100% rename from gdal/doc/images/logo-spatialys.png rename to doc/images/logo-spatialys.png diff --git a/gdal/doc/images/logo/GDALLogoBW.svg b/doc/images/logo/GDALLogoBW.svg similarity index 100% rename from gdal/doc/images/logo/GDALLogoBW.svg rename to doc/images/logo/GDALLogoBW.svg diff --git a/gdal/doc/images/logo/GDALLogoColor.svg b/doc/images/logo/GDALLogoColor.svg similarity index 100% rename from gdal/doc/images/logo/GDALLogoColor.svg rename to doc/images/logo/GDALLogoColor.svg diff --git a/gdal/doc/images/logo/GDALLogoGS.svg b/doc/images/logo/GDALLogoGS.svg similarity index 100% rename from gdal/doc/images/logo/GDALLogoGS.svg rename to doc/images/logo/GDALLogoGS.svg diff --git a/gdal/doc/images/logo/tshirt/Koszulka v2.ai b/doc/images/logo/tshirt/Koszulka v2.ai similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v2.ai rename to doc/images/logo/tshirt/Koszulka v2.ai diff --git a/gdal/doc/images/logo/tshirt/Koszulka v2.pdf b/doc/images/logo/tshirt/Koszulka v2.pdf similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v2.pdf rename to doc/images/logo/tshirt/Koszulka v2.pdf diff --git a/gdal/doc/images/logo/tshirt/Koszulka v3.ai b/doc/images/logo/tshirt/Koszulka v3.ai similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v3.ai rename to doc/images/logo/tshirt/Koszulka v3.ai diff --git a/gdal/doc/images/logo/tshirt/Koszulka v3.pdf b/doc/images/logo/tshirt/Koszulka v3.pdf similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v3.pdf rename to doc/images/logo/tshirt/Koszulka v3.pdf diff --git a/gdal/doc/images/logo/tshirt/Koszulka v4.ai b/doc/images/logo/tshirt/Koszulka v4.ai similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v4.ai rename to doc/images/logo/tshirt/Koszulka v4.ai diff --git a/gdal/doc/images/logo/tshirt/Koszulka v4.pdf b/doc/images/logo/tshirt/Koszulka v4.pdf similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v4.pdf rename to doc/images/logo/tshirt/Koszulka v4.pdf diff --git a/gdal/doc/images/logo/tshirt/Koszulka v5.ai b/doc/images/logo/tshirt/Koszulka v5.ai similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v5.ai rename to doc/images/logo/tshirt/Koszulka v5.ai diff --git a/gdal/doc/images/logo/tshirt/Koszulka v5.pdf b/doc/images/logo/tshirt/Koszulka v5.pdf similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v5.pdf rename to doc/images/logo/tshirt/Koszulka v5.pdf diff --git a/gdal/doc/images/logo/tshirt/Koszulka v6.ai b/doc/images/logo/tshirt/Koszulka v6.ai similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v6.ai rename to doc/images/logo/tshirt/Koszulka v6.ai diff --git a/gdal/doc/images/logo/tshirt/Koszulka v6.pdf b/doc/images/logo/tshirt/Koszulka v6.pdf similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v6.pdf rename to doc/images/logo/tshirt/Koszulka v6.pdf diff --git a/gdal/doc/images/logo/tshirt/Koszulka v7.ai b/doc/images/logo/tshirt/Koszulka v7.ai similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v7.ai rename to doc/images/logo/tshirt/Koszulka v7.ai diff --git a/gdal/doc/images/logo/tshirt/Koszulka v7.pdf b/doc/images/logo/tshirt/Koszulka v7.pdf similarity index 100% rename from gdal/doc/images/logo/tshirt/Koszulka v7.pdf rename to doc/images/logo/tshirt/Koszulka v7.pdf diff --git a/gdal/doc/images/rfc45/rfc_2d_array.png b/doc/images/rfc45/rfc_2d_array.png similarity index 100% rename from gdal/doc/images/rfc45/rfc_2d_array.png rename to doc/images/rfc45/rfc_2d_array.png diff --git a/gdal/doc/images/rfc45/rfc_BIT.png b/doc/images/rfc45/rfc_BIT.png similarity index 100% rename from gdal/doc/images/rfc45/rfc_BIT.png rename to doc/images/rfc45/rfc_BIT.png diff --git a/gdal/doc/images/rfc45/rfc_BSQ.png b/doc/images/rfc45/rfc_BSQ.png similarity index 100% rename from gdal/doc/images/rfc45/rfc_BSQ.png rename to doc/images/rfc45/rfc_BSQ.png diff --git a/gdal/doc/images/rfc45/rfc_TIP.png b/doc/images/rfc45/rfc_TIP.png similarity index 100% rename from gdal/doc/images/rfc45/rfc_TIP.png rename to doc/images/rfc45/rfc_TIP.png diff --git a/gdal/doc/images/rfc45/rfc_tiled.png b/doc/images/rfc45/rfc_tiled.png similarity index 100% rename from gdal/doc/images/rfc45/rfc_tiled.png rename to doc/images/rfc45/rfc_tiled.png diff --git a/gdal/doc/images/rfc49/classOGRGeometry.png b/doc/images/rfc49/classOGRGeometry.png similarity index 100% rename from gdal/doc/images/rfc49/classOGRGeometry.png rename to doc/images/rfc49/classOGRGeometry.png diff --git a/gdal/doc/images/rfc64/classOGRGeometry_RFC64.png b/doc/images/rfc64/classOGRGeometry_RFC64.png similarity index 100% rename from gdal/doc/images/rfc64/classOGRGeometry_RFC64.png rename to doc/images/rfc64/classOGRGeometry_RFC64.png diff --git a/gdal/doc/images/sponsors/AWS_logo_RGB.svg b/doc/images/sponsors/AWS_logo_RGB.svg similarity index 100% rename from gdal/doc/images/sponsors/AWS_logo_RGB.svg rename to doc/images/sponsors/AWS_logo_RGB.svg diff --git a/gdal/doc/images/sponsors/logo-FrontierSI.svg b/doc/images/sponsors/logo-FrontierSI.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-FrontierSI.svg rename to doc/images/sponsors/logo-FrontierSI.svg diff --git a/gdal/doc/images/sponsors/logo-aerometrex.png b/doc/images/sponsors/logo-aerometrex.png similarity index 100% rename from gdal/doc/images/sponsors/logo-aerometrex.png rename to doc/images/sponsors/logo-aerometrex.png diff --git a/gdal/doc/images/sponsors/logo-aerometrex.svg b/doc/images/sponsors/logo-aerometrex.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-aerometrex.svg rename to doc/images/sponsors/logo-aerometrex.svg diff --git a/gdal/doc/images/sponsors/logo-aws.png b/doc/images/sponsors/logo-aws.png similarity index 100% rename from gdal/doc/images/sponsors/logo-aws.png rename to doc/images/sponsors/logo-aws.png diff --git a/gdal/doc/images/sponsors/logo-esri.png b/doc/images/sponsors/logo-esri.png similarity index 100% rename from gdal/doc/images/sponsors/logo-esri.png rename to doc/images/sponsors/logo-esri.png diff --git a/gdal/doc/images/sponsors/logo-esri.svg b/doc/images/sponsors/logo-esri.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-esri.svg rename to doc/images/sponsors/logo-esri.svg diff --git a/gdal/doc/images/sponsors/logo-frontiersi.png b/doc/images/sponsors/logo-frontiersi.png similarity index 100% rename from gdal/doc/images/sponsors/logo-frontiersi.png rename to doc/images/sponsors/logo-frontiersi.png diff --git a/gdal/doc/images/sponsors/logo-google.png b/doc/images/sponsors/logo-google.png similarity index 100% rename from gdal/doc/images/sponsors/logo-google.png rename to doc/images/sponsors/logo-google.png diff --git a/gdal/doc/images/sponsors/logo-google.svg b/doc/images/sponsors/logo-google.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-google.svg rename to doc/images/sponsors/logo-google.svg diff --git a/gdal/doc/images/sponsors/logo-koordinates.png b/doc/images/sponsors/logo-koordinates.png similarity index 100% rename from gdal/doc/images/sponsors/logo-koordinates.png rename to doc/images/sponsors/logo-koordinates.png diff --git a/gdal/doc/images/sponsors/logo-koordinates.svg b/doc/images/sponsors/logo-koordinates.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-koordinates.svg rename to doc/images/sponsors/logo-koordinates.svg diff --git a/gdal/doc/images/sponsors/logo-mapgears.png b/doc/images/sponsors/logo-mapgears.png similarity index 100% rename from gdal/doc/images/sponsors/logo-mapgears.png rename to doc/images/sponsors/logo-mapgears.png diff --git a/gdal/doc/images/sponsors/logo-maxar.ai b/doc/images/sponsors/logo-maxar.ai similarity index 100% rename from gdal/doc/images/sponsors/logo-maxar.ai rename to doc/images/sponsors/logo-maxar.ai diff --git a/gdal/doc/images/sponsors/logo-maxar.png b/doc/images/sponsors/logo-maxar.png similarity index 100% rename from gdal/doc/images/sponsors/logo-maxar.png rename to doc/images/sponsors/logo-maxar.png diff --git a/gdal/doc/images/sponsors/logo-maxar.svg b/doc/images/sponsors/logo-maxar.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-maxar.svg rename to doc/images/sponsors/logo-maxar.svg diff --git a/gdal/doc/images/sponsors/logo-microsoft.png b/doc/images/sponsors/logo-microsoft.png similarity index 100% rename from gdal/doc/images/sponsors/logo-microsoft.png rename to doc/images/sponsors/logo-microsoft.png diff --git a/gdal/doc/images/sponsors/logo-microsoft.svg b/doc/images/sponsors/logo-microsoft.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-microsoft.svg rename to doc/images/sponsors/logo-microsoft.svg diff --git a/gdal/doc/images/sponsors/logo-planet.png b/doc/images/sponsors/logo-planet.png similarity index 100% rename from gdal/doc/images/sponsors/logo-planet.png rename to doc/images/sponsors/logo-planet.png diff --git a/gdal/doc/images/sponsors/logo-planet.svg b/doc/images/sponsors/logo-planet.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-planet.svg rename to doc/images/sponsors/logo-planet.svg diff --git a/gdal/doc/images/sponsors/logo-safe.png b/doc/images/sponsors/logo-safe.png similarity index 100% rename from gdal/doc/images/sponsors/logo-safe.png rename to doc/images/sponsors/logo-safe.png diff --git a/gdal/doc/images/sponsors/logo-safe.svg b/doc/images/sponsors/logo-safe.svg similarity index 100% rename from gdal/doc/images/sponsors/logo-safe.svg rename to doc/images/sponsors/logo-safe.svg diff --git a/gdal/doc/images/sponsors/logo-sparkgeo-big.png b/doc/images/sponsors/logo-sparkgeo-big.png similarity index 100% rename from gdal/doc/images/sponsors/logo-sparkgeo-big.png rename to doc/images/sponsors/logo-sparkgeo-big.png diff --git a/gdal/doc/images/sponsors/logo-sparkgeo.png b/doc/images/sponsors/logo-sparkgeo.png similarity index 100% rename from gdal/doc/images/sponsors/logo-sparkgeo.png rename to doc/images/sponsors/logo-sparkgeo.png diff --git a/gdal/doc/images/style_ogr_brush.png b/doc/images/style_ogr_brush.png similarity index 100% rename from gdal/doc/images/style_ogr_brush.png rename to doc/images/style_ogr_brush.png diff --git a/gdal/doc/images/style_ogr_sym.png b/doc/images/style_ogr_sym.png similarity index 100% rename from gdal/doc/images/style_ogr_sym.png rename to doc/images/style_ogr_sym.png diff --git a/gdal/doc/images/style_pen1.png b/doc/images/style_pen1.png similarity index 100% rename from gdal/doc/images/style_pen1.png rename to doc/images/style_pen1.png diff --git a/gdal/doc/images/style_pen2.png b/doc/images/style_pen2.png similarity index 100% rename from gdal/doc/images/style_pen2.png rename to doc/images/style_pen2.png diff --git a/gdal/doc/images/style_pen3.png b/doc/images/style_pen3.png similarity index 100% rename from gdal/doc/images/style_pen3.png rename to doc/images/style_pen3.png diff --git a/gdal/doc/images/style_textanchor.png b/doc/images/style_textanchor.png similarity index 100% rename from gdal/doc/images/style_textanchor.png rename to doc/images/style_textanchor.png diff --git a/gdal/doc/requirements.txt b/doc/requirements.txt similarity index 100% rename from gdal/doc/requirements.txt rename to doc/requirements.txt diff --git a/gdal/doc/source/_extensions/configoptions.py b/doc/source/_extensions/configoptions.py similarity index 100% rename from gdal/doc/source/_extensions/configoptions.py rename to doc/source/_extensions/configoptions.py diff --git a/gdal/doc/source/_extensions/driverproperties.py b/doc/source/_extensions/driverproperties.py similarity index 100% rename from gdal/doc/source/_extensions/driverproperties.py rename to doc/source/_extensions/driverproperties.py diff --git a/gdal/doc/source/_extensions/redirects.py b/doc/source/_extensions/redirects.py similarity index 100% rename from gdal/doc/source/_extensions/redirects.py rename to doc/source/_extensions/redirects.py diff --git a/gdal/doc/source/about.rst b/doc/source/about.rst similarity index 100% rename from gdal/doc/source/about.rst rename to doc/source/about.rst diff --git a/gdal/doc/source/about_no_title.rst b/doc/source/about_no_title.rst similarity index 100% rename from gdal/doc/source/about_no_title.rst rename to doc/source/about_no_title.rst diff --git a/gdal/doc/source/api/cpl.rst b/doc/source/api/cpl.rst similarity index 100% rename from gdal/doc/source/api/cpl.rst rename to doc/source/api/cpl.rst diff --git a/gdal/doc/source/api/cpl_cpp.rst b/doc/source/api/cpl_cpp.rst similarity index 100% rename from gdal/doc/source/api/cpl_cpp.rst rename to doc/source/api/cpl_cpp.rst diff --git a/gdal/doc/source/api/csharp/csharp_compile.rst b/doc/source/api/csharp/csharp_compile.rst similarity index 100% rename from gdal/doc/source/api/csharp/csharp_compile.rst rename to doc/source/api/csharp/csharp_compile.rst diff --git a/gdal/doc/source/api/csharp/csharp_conda.rst b/doc/source/api/csharp/csharp_conda.rst similarity index 100% rename from gdal/doc/source/api/csharp/csharp_conda.rst rename to doc/source/api/csharp/csharp_conda.rst diff --git a/gdal/doc/source/api/csharp/csharp_raster.rst b/doc/source/api/csharp/csharp_raster.rst similarity index 100% rename from gdal/doc/source/api/csharp/csharp_raster.rst rename to doc/source/api/csharp/csharp_raster.rst diff --git a/gdal/doc/source/api/csharp/csharp_usage.rst b/doc/source/api/csharp/csharp_usage.rst similarity index 100% rename from gdal/doc/source/api/csharp/csharp_usage.rst rename to doc/source/api/csharp/csharp_usage.rst diff --git a/gdal/doc/source/api/csharp/csharp_vector.rst b/doc/source/api/csharp/csharp_vector.rst similarity index 100% rename from gdal/doc/source/api/csharp/csharp_vector.rst rename to doc/source/api/csharp/csharp_vector.rst diff --git a/gdal/doc/source/api/csharp/index.rst b/doc/source/api/csharp/index.rst similarity index 100% rename from gdal/doc/source/api/csharp/index.rst rename to doc/source/api/csharp/index.rst diff --git a/gdal/doc/source/api/gdal_alg.rst b/doc/source/api/gdal_alg.rst similarity index 100% rename from gdal/doc/source/api/gdal_alg.rst rename to doc/source/api/gdal_alg.rst diff --git a/gdal/doc/source/api/gdal_utils.rst b/doc/source/api/gdal_utils.rst similarity index 100% rename from gdal/doc/source/api/gdal_utils.rst rename to doc/source/api/gdal_utils.rst diff --git a/gdal/doc/source/api/gdalabstractmdarray_cpp.rst b/doc/source/api/gdalabstractmdarray_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdalabstractmdarray_cpp.rst rename to doc/source/api/gdalabstractmdarray_cpp.rst diff --git a/gdal/doc/source/api/gdalattribute_cpp.rst b/doc/source/api/gdalattribute_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdalattribute_cpp.rst rename to doc/source/api/gdalattribute_cpp.rst diff --git a/gdal/doc/source/api/gdaldataset_cpp.rst b/doc/source/api/gdaldataset_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdaldataset_cpp.rst rename to doc/source/api/gdaldataset_cpp.rst diff --git a/gdal/doc/source/api/gdaldimension_cpp.rst b/doc/source/api/gdaldimension_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdaldimension_cpp.rst rename to doc/source/api/gdaldimension_cpp.rst diff --git a/gdal/doc/source/api/gdaldriver_cpp.rst b/doc/source/api/gdaldriver_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdaldriver_cpp.rst rename to doc/source/api/gdaldriver_cpp.rst diff --git a/gdal/doc/source/api/gdalextendeddatatype_cpp.rst b/doc/source/api/gdalextendeddatatype_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdalextendeddatatype_cpp.rst rename to doc/source/api/gdalextendeddatatype_cpp.rst diff --git a/gdal/doc/source/api/gdalgroup_cpp.rst b/doc/source/api/gdalgroup_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdalgroup_cpp.rst rename to doc/source/api/gdalgroup_cpp.rst diff --git a/gdal/doc/source/api/gdalmdarray_cpp.rst b/doc/source/api/gdalmdarray_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdalmdarray_cpp.rst rename to doc/source/api/gdalmdarray_cpp.rst diff --git a/gdal/doc/source/api/gdalrasterband_cpp.rst b/doc/source/api/gdalrasterband_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdalrasterband_cpp.rst rename to doc/source/api/gdalrasterband_cpp.rst diff --git a/gdal/doc/source/api/gdalwarp_cpp.rst b/doc/source/api/gdalwarp_cpp.rst similarity index 100% rename from gdal/doc/source/api/gdalwarp_cpp.rst rename to doc/source/api/gdalwarp_cpp.rst diff --git a/gdal/doc/source/api/gnm_cpp.rst b/doc/source/api/gnm_cpp.rst similarity index 100% rename from gdal/doc/source/api/gnm_cpp.rst rename to doc/source/api/gnm_cpp.rst diff --git a/gdal/doc/source/api/index.rst b/doc/source/api/index.rst similarity index 100% rename from gdal/doc/source/api/index.rst rename to doc/source/api/index.rst diff --git a/gdal/doc/source/api/java/index.rst b/doc/source/api/java/index.rst similarity index 100% rename from gdal/doc/source/api/java/index.rst rename to doc/source/api/java/index.rst diff --git a/gdal/doc/source/api/ogr_srs_api.rst b/doc/source/api/ogr_srs_api.rst similarity index 100% rename from gdal/doc/source/api/ogr_srs_api.rst rename to doc/source/api/ogr_srs_api.rst diff --git a/gdal/doc/source/api/ogrfeature_cpp.rst b/doc/source/api/ogrfeature_cpp.rst similarity index 100% rename from gdal/doc/source/api/ogrfeature_cpp.rst rename to doc/source/api/ogrfeature_cpp.rst diff --git a/gdal/doc/source/api/ogrfeaturestyle_cpp.rst b/doc/source/api/ogrfeaturestyle_cpp.rst similarity index 100% rename from gdal/doc/source/api/ogrfeaturestyle_cpp.rst rename to doc/source/api/ogrfeaturestyle_cpp.rst diff --git a/gdal/doc/source/api/ogrgeometry_cpp.rst b/doc/source/api/ogrgeometry_cpp.rst similarity index 100% rename from gdal/doc/source/api/ogrgeometry_cpp.rst rename to doc/source/api/ogrgeometry_cpp.rst diff --git a/gdal/doc/source/api/ogrlayer_cpp.rst b/doc/source/api/ogrlayer_cpp.rst similarity index 100% rename from gdal/doc/source/api/ogrlayer_cpp.rst rename to doc/source/api/ogrlayer_cpp.rst diff --git a/gdal/doc/source/api/ogrspatialref.rst b/doc/source/api/ogrspatialref.rst similarity index 100% rename from gdal/doc/source/api/ogrspatialref.rst rename to doc/source/api/ogrspatialref.rst diff --git a/gdal/doc/source/api/python.rst b/doc/source/api/python.rst similarity index 100% rename from gdal/doc/source/api/python.rst rename to doc/source/api/python.rst diff --git a/gdal/doc/source/api/python_api_ref.rst b/doc/source/api/python_api_ref.rst similarity index 100% rename from gdal/doc/source/api/python_api_ref.rst rename to doc/source/api/python_api_ref.rst diff --git a/gdal/doc/source/api/python_gotchas.rst b/doc/source/api/python_gotchas.rst similarity index 100% rename from gdal/doc/source/api/python_gotchas.rst rename to doc/source/api/python_gotchas.rst diff --git a/gdal/doc/source/api/python_samples.rst b/doc/source/api/python_samples.rst similarity index 100% rename from gdal/doc/source/api/python_samples.rst rename to doc/source/api/python_samples.rst diff --git a/gdal/doc/source/api/raster_c_api.rst b/doc/source/api/raster_c_api.rst similarity index 100% rename from gdal/doc/source/api/raster_c_api.rst rename to doc/source/api/raster_c_api.rst diff --git a/gdal/doc/source/api/vector_c_api.rst b/doc/source/api/vector_c_api.rst similarity index 100% rename from gdal/doc/source/api/vector_c_api.rst rename to doc/source/api/vector_c_api.rst diff --git a/gdal/doc/source/build_configoptions_index.py b/doc/source/build_configoptions_index.py similarity index 100% rename from gdal/doc/source/build_configoptions_index.py rename to doc/source/build_configoptions_index.py diff --git a/gdal/doc/source/build_driver_summary.py b/doc/source/build_driver_summary.py similarity index 100% rename from gdal/doc/source/build_driver_summary.py rename to doc/source/build_driver_summary.py diff --git a/gdal/doc/source/community/code_of_conduct.rst b/doc/source/community/code_of_conduct.rst similarity index 100% rename from gdal/doc/source/community/code_of_conduct.rst rename to doc/source/community/code_of_conduct.rst diff --git a/gdal/doc/source/community/index.rst b/doc/source/community/index.rst similarity index 100% rename from gdal/doc/source/community/index.rst rename to doc/source/community/index.rst diff --git a/gdal/doc/source/community/service_providers.rst b/doc/source/community/service_providers.rst similarity index 100% rename from gdal/doc/source/community/service_providers.rst rename to doc/source/community/service_providers.rst diff --git a/gdal/doc/source/conf.py b/doc/source/conf.py similarity index 100% rename from gdal/doc/source/conf.py rename to doc/source/conf.py diff --git a/gdal/doc/source/contributing/developer.rst b/doc/source/contributing/developer.rst similarity index 100% rename from gdal/doc/source/contributing/developer.rst rename to doc/source/contributing/developer.rst diff --git a/gdal/doc/source/contributing/example.txt b/doc/source/contributing/example.txt similarity index 100% rename from gdal/doc/source/contributing/example.txt rename to doc/source/contributing/example.txt diff --git a/gdal/doc/source/contributing/index.rst b/doc/source/contributing/index.rst similarity index 100% rename from gdal/doc/source/contributing/index.rst rename to doc/source/contributing/index.rst diff --git a/gdal/doc/source/contributing/rst_style.rst b/doc/source/contributing/rst_style.rst similarity index 100% rename from gdal/doc/source/contributing/rst_style.rst rename to doc/source/contributing/rst_style.rst diff --git a/gdal/doc/source/development/index.rst b/doc/source/development/index.rst similarity index 100% rename from gdal/doc/source/development/index.rst rename to doc/source/development/index.rst diff --git a/gdal/doc/source/development/rfc/index.rst b/doc/source/development/rfc/index.rst similarity index 100% rename from gdal/doc/source/development/rfc/index.rst rename to doc/source/development/rfc/index.rst diff --git a/gdal/doc/source/development/rfc/rfc10_ogropen.rst b/doc/source/development/rfc/rfc10_ogropen.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc10_ogropen.rst rename to doc/source/development/rfc/rfc10_ogropen.rst diff --git a/gdal/doc/source/development/rfc/rfc11_fastidentify.rst b/doc/source/development/rfc/rfc11_fastidentify.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc11_fastidentify.rst rename to doc/source/development/rfc/rfc11_fastidentify.rst diff --git a/gdal/doc/source/development/rfc/rfc12_filemanagement.rst b/doc/source/development/rfc/rfc12_filemanagement.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc12_filemanagement.rst rename to doc/source/development/rfc/rfc12_filemanagement.rst diff --git a/gdal/doc/source/development/rfc/rfc13_createfeatures.rst b/doc/source/development/rfc/rfc13_createfeatures.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc13_createfeatures.rst rename to doc/source/development/rfc/rfc13_createfeatures.rst diff --git a/gdal/doc/source/development/rfc/rfc14_imagestructure.rst b/doc/source/development/rfc/rfc14_imagestructure.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc14_imagestructure.rst rename to doc/source/development/rfc/rfc14_imagestructure.rst diff --git a/gdal/doc/source/development/rfc/rfc15_nodatabitmask.rst b/doc/source/development/rfc/rfc15_nodatabitmask.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc15_nodatabitmask.rst rename to doc/source/development/rfc/rfc15_nodatabitmask.rst diff --git a/gdal/doc/source/development/rfc/rfc16_ogr_reentrancy.rst b/doc/source/development/rfc/rfc16_ogr_reentrancy.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc16_ogr_reentrancy.rst rename to doc/source/development/rfc/rfc16_ogr_reentrancy.rst diff --git a/gdal/doc/source/development/rfc/rfc17_python_namespaces.rst b/doc/source/development/rfc/rfc17_python_namespaces.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc17_python_namespaces.rst rename to doc/source/development/rfc/rfc17_python_namespaces.rst diff --git a/gdal/doc/source/development/rfc/rfc18_ogr_styles_c_api.rst b/doc/source/development/rfc/rfc18_ogr_styles_c_api.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc18_ogr_styles_c_api.rst rename to doc/source/development/rfc/rfc18_ogr_styles_c_api.rst diff --git a/gdal/doc/source/development/rfc/rfc19_safememalloc.rst b/doc/source/development/rfc/rfc19_safememalloc.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc19_safememalloc.rst rename to doc/source/development/rfc/rfc19_safememalloc.rst diff --git a/gdal/doc/source/development/rfc/rfc1_pmc.rst b/doc/source/development/rfc/rfc1_pmc.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc1_pmc.rst rename to doc/source/development/rfc/rfc1_pmc.rst diff --git a/gdal/doc/source/development/rfc/rfc20_srs_axes.rst b/doc/source/development/rfc/rfc20_srs_axes.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc20_srs_axes.rst rename to doc/source/development/rfc/rfc20_srs_axes.rst diff --git a/gdal/doc/source/development/rfc/rfc21_ogrsqlcast.rst b/doc/source/development/rfc/rfc21_ogrsqlcast.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc21_ogrsqlcast.rst rename to doc/source/development/rfc/rfc21_ogrsqlcast.rst diff --git a/gdal/doc/source/development/rfc/rfc22_rpc.rst b/doc/source/development/rfc/rfc22_rpc.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc22_rpc.rst rename to doc/source/development/rfc/rfc22_rpc.rst diff --git a/gdal/doc/source/development/rfc/rfc23_ogr_unicode.rst b/doc/source/development/rfc/rfc23_ogr_unicode.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc23_ogr_unicode.rst rename to doc/source/development/rfc/rfc23_ogr_unicode.rst diff --git a/gdal/doc/source/development/rfc/rfc24_progressive_data_support.rst b/doc/source/development/rfc/rfc24_progressive_data_support.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc24_progressive_data_support.rst rename to doc/source/development/rfc/rfc24_progressive_data_support.rst diff --git a/gdal/doc/source/development/rfc/rfc25_fast_open.rst b/doc/source/development/rfc/rfc25_fast_open.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc25_fast_open.rst rename to doc/source/development/rfc/rfc25_fast_open.rst diff --git a/gdal/doc/source/development/rfc/rfc26_blockcache.rst b/doc/source/development/rfc/rfc26_blockcache.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc26_blockcache.rst rename to doc/source/development/rfc/rfc26_blockcache.rst diff --git a/gdal/doc/source/development/rfc/rfc27_supportdata.rst b/doc/source/development/rfc/rfc27_supportdata.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc27_supportdata.rst rename to doc/source/development/rfc/rfc27_supportdata.rst diff --git a/gdal/doc/source/development/rfc/rfc28_sqlfunc.rst b/doc/source/development/rfc/rfc28_sqlfunc.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc28_sqlfunc.rst rename to doc/source/development/rfc/rfc28_sqlfunc.rst diff --git a/gdal/doc/source/development/rfc/rfc29_desired_fields.rst b/doc/source/development/rfc/rfc29_desired_fields.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc29_desired_fields.rst rename to doc/source/development/rfc/rfc29_desired_fields.rst diff --git a/gdal/doc/source/development/rfc/rfc2_svn.rst b/doc/source/development/rfc/rfc2_svn.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc2_svn.rst rename to doc/source/development/rfc/rfc2_svn.rst diff --git a/gdal/doc/source/development/rfc/rfc30_utf8_filenames.rst b/doc/source/development/rfc/rfc30_utf8_filenames.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc30_utf8_filenames.rst rename to doc/source/development/rfc/rfc30_utf8_filenames.rst diff --git a/gdal/doc/source/development/rfc/rfc31_ogr_64.rst b/doc/source/development/rfc/rfc31_ogr_64.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc31_ogr_64.rst rename to doc/source/development/rfc/rfc31_ogr_64.rst diff --git a/gdal/doc/source/development/rfc/rfc32_gdallocationinfo.rst b/doc/source/development/rfc/rfc32_gdallocationinfo.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc32_gdallocationinfo.rst rename to doc/source/development/rfc/rfc32_gdallocationinfo.rst diff --git a/gdal/doc/source/development/rfc/rfc33_gtiff_pixelispoint.rst b/doc/source/development/rfc/rfc33_gtiff_pixelispoint.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc33_gtiff_pixelispoint.rst rename to doc/source/development/rfc/rfc33_gtiff_pixelispoint.rst diff --git a/gdal/doc/source/development/rfc/rfc34_license_policy.rst b/doc/source/development/rfc/rfc34_license_policy.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc34_license_policy.rst rename to doc/source/development/rfc/rfc34_license_policy.rst diff --git a/gdal/doc/source/development/rfc/rfc35_deletereorderalterfielddefn.rst b/doc/source/development/rfc/rfc35_deletereorderalterfielddefn.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc35_deletereorderalterfielddefn.rst rename to doc/source/development/rfc/rfc35_deletereorderalterfielddefn.rst diff --git a/gdal/doc/source/development/rfc/rfc36_open_by_drivername.rst b/doc/source/development/rfc/rfc36_open_by_drivername.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc36_open_by_drivername.rst rename to doc/source/development/rfc/rfc36_open_by_drivername.rst diff --git a/gdal/doc/source/development/rfc/rfc37_cplerror_userdata.rst b/doc/source/development/rfc/rfc37_cplerror_userdata.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc37_cplerror_userdata.rst rename to doc/source/development/rfc/rfc37_cplerror_userdata.rst diff --git a/gdal/doc/source/development/rfc/rfc38_ogr_faster_open.rst b/doc/source/development/rfc/rfc38_ogr_faster_open.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc38_ogr_faster_open.rst rename to doc/source/development/rfc/rfc38_ogr_faster_open.rst diff --git a/gdal/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst b/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst rename to doc/source/development/rfc/rfc39_ogr_layer_algebra.rst diff --git a/gdal/doc/source/development/rfc/rfc3_commiters.rst b/doc/source/development/rfc/rfc3_commiters.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc3_commiters.rst rename to doc/source/development/rfc/rfc3_commiters.rst diff --git a/gdal/doc/source/development/rfc/rfc40_enhanced_rat_support.rst b/doc/source/development/rfc/rfc40_enhanced_rat_support.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc40_enhanced_rat_support.rst rename to doc/source/development/rfc/rfc40_enhanced_rat_support.rst diff --git a/gdal/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst b/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst rename to doc/source/development/rfc/rfc41_multiple_geometry_fields.rst diff --git a/gdal/doc/source/development/rfc/rfc42_find_laundered_fields.rst b/doc/source/development/rfc/rfc42_find_laundered_fields.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc42_find_laundered_fields.rst rename to doc/source/development/rfc/rfc42_find_laundered_fields.rst diff --git a/gdal/doc/source/development/rfc/rfc43_getmetadatadomainlist.rst b/doc/source/development/rfc/rfc43_getmetadatadomainlist.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc43_getmetadatadomainlist.rst rename to doc/source/development/rfc/rfc43_getmetadatadomainlist.rst diff --git a/gdal/doc/source/development/rfc/rfc44_gdalinfoxml.rst b/doc/source/development/rfc/rfc44_gdalinfoxml.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc44_gdalinfoxml.rst rename to doc/source/development/rfc/rfc44_gdalinfoxml.rst diff --git a/gdal/doc/source/development/rfc/rfc45_virtualmem.rst b/doc/source/development/rfc/rfc45_virtualmem.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc45_virtualmem.rst rename to doc/source/development/rfc/rfc45_virtualmem.rst diff --git a/gdal/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst b/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst rename to doc/source/development/rfc/rfc46_gdal_ogr_unification.rst diff --git a/gdal/doc/source/development/rfc/rfc47_dataset_caching.rst b/doc/source/development/rfc/rfc47_dataset_caching.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc47_dataset_caching.rst rename to doc/source/development/rfc/rfc47_dataset_caching.rst diff --git a/gdal/doc/source/development/rfc/rfc48_geographical_networks_support.rst b/doc/source/development/rfc/rfc48_geographical_networks_support.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc48_geographical_networks_support.rst rename to doc/source/development/rfc/rfc48_geographical_networks_support.rst diff --git a/gdal/doc/source/development/rfc/rfc49_curve_geometries.rst b/doc/source/development/rfc/rfc49_curve_geometries.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc49_curve_geometries.rst rename to doc/source/development/rfc/rfc49_curve_geometries.rst diff --git a/gdal/doc/source/development/rfc/rfc4_geolocate.rst b/doc/source/development/rfc/rfc4_geolocate.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc4_geolocate.rst rename to doc/source/development/rfc/rfc4_geolocate.rst diff --git a/gdal/doc/source/development/rfc/rfc50_ogr_field_subtype.rst b/doc/source/development/rfc/rfc50_ogr_field_subtype.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc50_ogr_field_subtype.rst rename to doc/source/development/rfc/rfc50_ogr_field_subtype.rst diff --git a/gdal/doc/source/development/rfc/rfc51_rasterio_resampling_progress.rst b/doc/source/development/rfc/rfc51_rasterio_resampling_progress.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc51_rasterio_resampling_progress.rst rename to doc/source/development/rfc/rfc51_rasterio_resampling_progress.rst diff --git a/gdal/doc/source/development/rfc/rfc52_strict_sql_quoting.rst b/doc/source/development/rfc/rfc52_strict_sql_quoting.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc52_strict_sql_quoting.rst rename to doc/source/development/rfc/rfc52_strict_sql_quoting.rst diff --git a/gdal/doc/source/development/rfc/rfc53_ogr_notnull_default.rst b/doc/source/development/rfc/rfc53_ogr_notnull_default.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc53_ogr_notnull_default.rst rename to doc/source/development/rfc/rfc53_ogr_notnull_default.rst diff --git a/gdal/doc/source/development/rfc/rfc54_dataset_transactions.rst b/doc/source/development/rfc/rfc54_dataset_transactions.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc54_dataset_transactions.rst rename to doc/source/development/rfc/rfc54_dataset_transactions.rst diff --git a/gdal/doc/source/development/rfc/rfc55_refined_setfeature_deletefeature_semantics.rst b/doc/source/development/rfc/rfc55_refined_setfeature_deletefeature_semantics.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc55_refined_setfeature_deletefeature_semantics.rst rename to doc/source/development/rfc/rfc55_refined_setfeature_deletefeature_semantics.rst diff --git a/gdal/doc/source/development/rfc/rfc56_millisecond_precision.rst b/doc/source/development/rfc/rfc56_millisecond_precision.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc56_millisecond_precision.rst rename to doc/source/development/rfc/rfc56_millisecond_precision.rst diff --git a/gdal/doc/source/development/rfc/rfc57_histogram_64bit_count.rst b/doc/source/development/rfc/rfc57_histogram_64bit_count.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc57_histogram_64bit_count.rst rename to doc/source/development/rfc/rfc57_histogram_64bit_count.rst diff --git a/gdal/doc/source/development/rfc/rfc58_removing_dataset_nodata_value.rst b/doc/source/development/rfc/rfc58_removing_dataset_nodata_value.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc58_removing_dataset_nodata_value.rst rename to doc/source/development/rfc/rfc58_removing_dataset_nodata_value.rst diff --git a/gdal/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst b/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst rename to doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst diff --git a/gdal/doc/source/development/rfc/rfc59_utilities_as_a_library.rst b/doc/source/development/rfc/rfc59_utilities_as_a_library.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc59_utilities_as_a_library.rst rename to doc/source/development/rfc/rfc59_utilities_as_a_library.rst diff --git a/gdal/doc/source/development/rfc/rfc5_unicode.rst b/doc/source/development/rfc/rfc5_unicode.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc5_unicode.rst rename to doc/source/development/rfc/rfc5_unicode.rst diff --git a/gdal/doc/source/development/rfc/rfc60_improved_roundtripping_in_ogr.rst b/doc/source/development/rfc/rfc60_improved_roundtripping_in_ogr.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc60_improved_roundtripping_in_ogr.rst rename to doc/source/development/rfc/rfc60_improved_roundtripping_in_ogr.rst diff --git a/gdal/doc/source/development/rfc/rfc61_support_for_measured_geometries.rst b/doc/source/development/rfc/rfc61_support_for_measured_geometries.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc61_support_for_measured_geometries.rst rename to doc/source/development/rfc/rfc61_support_for_measured_geometries.rst diff --git a/gdal/doc/source/development/rfc/rfc62_raster_algebra.rst b/doc/source/development/rfc/rfc62_raster_algebra.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc62_raster_algebra.rst rename to doc/source/development/rfc/rfc62_raster_algebra.rst diff --git a/gdal/doc/source/development/rfc/rfc63_sparse_datasets_improvements.rst b/doc/source/development/rfc/rfc63_sparse_datasets_improvements.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc63_sparse_datasets_improvements.rst rename to doc/source/development/rfc/rfc63_sparse_datasets_improvements.rst diff --git a/gdal/doc/source/development/rfc/rfc64_triangle_polyhedralsurface_tin.rst b/doc/source/development/rfc/rfc64_triangle_polyhedralsurface_tin.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc64_triangle_polyhedralsurface_tin.rst rename to doc/source/development/rfc/rfc64_triangle_polyhedralsurface_tin.rst diff --git a/gdal/doc/source/development/rfc/rfc65_rfc7946_geojson.rst b/doc/source/development/rfc/rfc65_rfc7946_geojson.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc65_rfc7946_geojson.rst rename to doc/source/development/rfc/rfc65_rfc7946_geojson.rst diff --git a/gdal/doc/source/development/rfc/rfc66_randomlayerreadwrite.rst b/doc/source/development/rfc/rfc66_randomlayerreadwrite.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc66_randomlayerreadwrite.rst rename to doc/source/development/rfc/rfc66_randomlayerreadwrite.rst diff --git a/gdal/doc/source/development/rfc/rfc67_nullfieldvalues.rst b/doc/source/development/rfc/rfc67_nullfieldvalues.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc67_nullfieldvalues.rst rename to doc/source/development/rfc/rfc67_nullfieldvalues.rst diff --git a/gdal/doc/source/development/rfc/rfc68_cplusplus11.rst b/doc/source/development/rfc/rfc68_cplusplus11.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc68_cplusplus11.rst rename to doc/source/development/rfc/rfc68_cplusplus11.rst diff --git a/gdal/doc/source/development/rfc/rfc69_cplusplus_formatting.rst b/doc/source/development/rfc/rfc69_cplusplus_formatting.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc69_cplusplus_formatting.rst rename to doc/source/development/rfc/rfc69_cplusplus_formatting.rst diff --git a/gdal/doc/source/development/rfc/rfc6_sqlgeom.rst b/doc/source/development/rfc/rfc6_sqlgeom.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc6_sqlgeom.rst rename to doc/source/development/rfc/rfc6_sqlgeom.rst diff --git a/gdal/doc/source/development/rfc/rfc70_output_format_guess.rst b/doc/source/development/rfc/rfc70_output_format_guess.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc70_output_format_guess.rst rename to doc/source/development/rfc/rfc70_output_format_guess.rst diff --git a/gdal/doc/source/development/rfc/rfc71_github_migration.rst b/doc/source/development/rfc/rfc71_github_migration.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc71_github_migration.rst rename to doc/source/development/rfc/rfc71_github_migration.rst diff --git a/gdal/doc/source/development/rfc/rfc72_pytest.rst b/doc/source/development/rfc/rfc72_pytest.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc72_pytest.rst rename to doc/source/development/rfc/rfc72_pytest.rst diff --git a/gdal/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst b/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst rename to doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst diff --git a/gdal/doc/source/development/rfc/rfc74_sphinx.rst b/doc/source/development/rfc/rfc74_sphinx.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc74_sphinx.rst rename to doc/source/development/rfc/rfc74_sphinx.rst diff --git a/gdal/doc/source/development/rfc/rfc75_multidimensional_arrays.rst b/doc/source/development/rfc/rfc75_multidimensional_arrays.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc75_multidimensional_arrays.rst rename to doc/source/development/rfc/rfc75_multidimensional_arrays.rst diff --git a/gdal/doc/source/development/rfc/rfc76_ogrpythondrivers.rst b/doc/source/development/rfc/rfc76_ogrpythondrivers.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc76_ogrpythondrivers.rst rename to doc/source/development/rfc/rfc76_ogrpythondrivers.rst diff --git a/gdal/doc/source/development/rfc/rfc77_drop_python2_support.rst b/doc/source/development/rfc/rfc77_drop_python2_support.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc77_drop_python2_support.rst rename to doc/source/development/rfc/rfc77_drop_python2_support.rst diff --git a/gdal/doc/source/development/rfc/rfc78_gdal_utils_package.rst b/doc/source/development/rfc/rfc78_gdal_utils_package.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc78_gdal_utils_package.rst rename to doc/source/development/rfc/rfc78_gdal_utils_package.rst diff --git a/gdal/doc/source/development/rfc/rfc79_listing_service_providers.rst b/doc/source/development/rfc/rfc79_listing_service_providers.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc79_listing_service_providers.rst rename to doc/source/development/rfc/rfc79_listing_service_providers.rst diff --git a/gdal/doc/source/development/rfc/rfc7_vsilapi.rst b/doc/source/development/rfc/rfc7_vsilapi.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc7_vsilapi.rst rename to doc/source/development/rfc/rfc7_vsilapi.rst diff --git a/gdal/doc/source/development/rfc/rfc80_numfocus_relationship.rst b/doc/source/development/rfc/rfc80_numfocus_relationship.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc80_numfocus_relationship.rst rename to doc/source/development/rfc/rfc80_numfocus_relationship.rst diff --git a/gdal/doc/source/development/rfc/rfc81_coordinate_epoch.rst b/doc/source/development/rfc/rfc81_coordinate_epoch.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc81_coordinate_epoch.rst rename to doc/source/development/rfc/rfc81_coordinate_epoch.rst diff --git a/gdal/doc/source/development/rfc/rfc83_use_of_project_sponsorship.rst b/doc/source/development/rfc/rfc83_use_of_project_sponsorship.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc83_use_of_project_sponsorship.rst rename to doc/source/development/rfc/rfc83_use_of_project_sponsorship.rst diff --git a/gdal/doc/source/development/rfc/rfc84_cmake.rst b/doc/source/development/rfc/rfc84_cmake.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc84_cmake.rst rename to doc/source/development/rfc/rfc84_cmake.rst diff --git a/gdal/doc/source/development/rfc/rfc8_devguide.rst b/doc/source/development/rfc/rfc8_devguide.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc8_devguide.rst rename to doc/source/development/rfc/rfc8_devguide.rst diff --git a/gdal/doc/source/development/rfc/rfc9_maintainer.rst b/doc/source/development/rfc/rfc9_maintainer.rst similarity index 100% rename from gdal/doc/source/development/rfc/rfc9_maintainer.rst rename to doc/source/development/rfc/rfc9_maintainer.rst diff --git a/gdal/doc/source/download.rst b/doc/source/download.rst similarity index 100% rename from gdal/doc/source/download.rst rename to doc/source/download.rst diff --git a/gdal/doc/source/drivers/raster/Idrisi.rst b/doc/source/drivers/raster/Idrisi.rst similarity index 100% rename from gdal/doc/source/drivers/raster/Idrisi.rst rename to doc/source/drivers/raster/Idrisi.rst diff --git a/gdal/doc/source/drivers/raster/aaigrid.rst b/doc/source/drivers/raster/aaigrid.rst similarity index 100% rename from gdal/doc/source/drivers/raster/aaigrid.rst rename to doc/source/drivers/raster/aaigrid.rst diff --git a/gdal/doc/source/drivers/raster/ace2.rst b/doc/source/drivers/raster/ace2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ace2.rst rename to doc/source/drivers/raster/ace2.rst diff --git a/gdal/doc/source/drivers/raster/adrg.rst b/doc/source/drivers/raster/adrg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/adrg.rst rename to doc/source/drivers/raster/adrg.rst diff --git a/gdal/doc/source/drivers/raster/aig.rst b/doc/source/drivers/raster/aig.rst similarity index 100% rename from gdal/doc/source/drivers/raster/aig.rst rename to doc/source/drivers/raster/aig.rst diff --git a/gdal/doc/source/drivers/raster/airsar.rst b/doc/source/drivers/raster/airsar.rst similarity index 100% rename from gdal/doc/source/drivers/raster/airsar.rst rename to doc/source/drivers/raster/airsar.rst diff --git a/gdal/doc/source/drivers/raster/arcinfo_grid_format.rst b/doc/source/drivers/raster/arcinfo_grid_format.rst similarity index 100% rename from gdal/doc/source/drivers/raster/arcinfo_grid_format.rst rename to doc/source/drivers/raster/arcinfo_grid_format.rst diff --git a/gdal/doc/source/drivers/raster/arg.rst b/doc/source/drivers/raster/arg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/arg.rst rename to doc/source/drivers/raster/arg.rst diff --git a/gdal/doc/source/drivers/raster/bag.rst b/doc/source/drivers/raster/bag.rst similarity index 100% rename from gdal/doc/source/drivers/raster/bag.rst rename to doc/source/drivers/raster/bag.rst diff --git a/gdal/doc/source/drivers/raster/blx.rst b/doc/source/drivers/raster/blx.rst similarity index 100% rename from gdal/doc/source/drivers/raster/blx.rst rename to doc/source/drivers/raster/blx.rst diff --git a/gdal/doc/source/drivers/raster/bmp.rst b/doc/source/drivers/raster/bmp.rst similarity index 100% rename from gdal/doc/source/drivers/raster/bmp.rst rename to doc/source/drivers/raster/bmp.rst diff --git a/gdal/doc/source/drivers/raster/bsb.rst b/doc/source/drivers/raster/bsb.rst similarity index 100% rename from gdal/doc/source/drivers/raster/bsb.rst rename to doc/source/drivers/raster/bsb.rst diff --git a/gdal/doc/source/drivers/raster/bt.rst b/doc/source/drivers/raster/bt.rst similarity index 100% rename from gdal/doc/source/drivers/raster/bt.rst rename to doc/source/drivers/raster/bt.rst diff --git a/gdal/doc/source/drivers/raster/byn.rst b/doc/source/drivers/raster/byn.rst similarity index 100% rename from gdal/doc/source/drivers/raster/byn.rst rename to doc/source/drivers/raster/byn.rst diff --git a/gdal/doc/source/drivers/raster/cad.rst b/doc/source/drivers/raster/cad.rst similarity index 100% rename from gdal/doc/source/drivers/raster/cad.rst rename to doc/source/drivers/raster/cad.rst diff --git a/gdal/doc/source/drivers/raster/cals.rst b/doc/source/drivers/raster/cals.rst similarity index 100% rename from gdal/doc/source/drivers/raster/cals.rst rename to doc/source/drivers/raster/cals.rst diff --git a/gdal/doc/source/drivers/raster/ceos.rst b/doc/source/drivers/raster/ceos.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ceos.rst rename to doc/source/drivers/raster/ceos.rst diff --git a/gdal/doc/source/drivers/raster/coasp.rst b/doc/source/drivers/raster/coasp.rst similarity index 100% rename from gdal/doc/source/drivers/raster/coasp.rst rename to doc/source/drivers/raster/coasp.rst diff --git a/gdal/doc/source/drivers/raster/cog.rst b/doc/source/drivers/raster/cog.rst similarity index 100% rename from gdal/doc/source/drivers/raster/cog.rst rename to doc/source/drivers/raster/cog.rst diff --git a/gdal/doc/source/drivers/raster/cosar.rst b/doc/source/drivers/raster/cosar.rst similarity index 100% rename from gdal/doc/source/drivers/raster/cosar.rst rename to doc/source/drivers/raster/cosar.rst diff --git a/gdal/doc/source/drivers/raster/cpg.rst b/doc/source/drivers/raster/cpg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/cpg.rst rename to doc/source/drivers/raster/cpg.rst diff --git a/gdal/doc/source/drivers/raster/ctable2.rst b/doc/source/drivers/raster/ctable2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ctable2.rst rename to doc/source/drivers/raster/ctable2.rst diff --git a/gdal/doc/source/drivers/raster/ctg.rst b/doc/source/drivers/raster/ctg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ctg.rst rename to doc/source/drivers/raster/ctg.rst diff --git a/gdal/doc/source/drivers/raster/daas.rst b/doc/source/drivers/raster/daas.rst similarity index 100% rename from gdal/doc/source/drivers/raster/daas.rst rename to doc/source/drivers/raster/daas.rst diff --git a/gdal/doc/source/drivers/raster/db2.rst b/doc/source/drivers/raster/db2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/db2.rst rename to doc/source/drivers/raster/db2.rst diff --git a/gdal/doc/source/drivers/raster/dds.rst b/doc/source/drivers/raster/dds.rst similarity index 100% rename from gdal/doc/source/drivers/raster/dds.rst rename to doc/source/drivers/raster/dds.rst diff --git a/gdal/doc/source/drivers/raster/derived.rst b/doc/source/drivers/raster/derived.rst similarity index 100% rename from gdal/doc/source/drivers/raster/derived.rst rename to doc/source/drivers/raster/derived.rst diff --git a/gdal/doc/source/drivers/raster/dimap.rst b/doc/source/drivers/raster/dimap.rst similarity index 100% rename from gdal/doc/source/drivers/raster/dimap.rst rename to doc/source/drivers/raster/dimap.rst diff --git a/gdal/doc/source/drivers/raster/dipex.rst b/doc/source/drivers/raster/dipex.rst similarity index 100% rename from gdal/doc/source/drivers/raster/dipex.rst rename to doc/source/drivers/raster/dipex.rst diff --git a/gdal/doc/source/drivers/raster/dods.rst b/doc/source/drivers/raster/dods.rst similarity index 100% rename from gdal/doc/source/drivers/raster/dods.rst rename to doc/source/drivers/raster/dods.rst diff --git a/gdal/doc/source/drivers/raster/doq1.rst b/doc/source/drivers/raster/doq1.rst similarity index 100% rename from gdal/doc/source/drivers/raster/doq1.rst rename to doc/source/drivers/raster/doq1.rst diff --git a/gdal/doc/source/drivers/raster/doq2.rst b/doc/source/drivers/raster/doq2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/doq2.rst rename to doc/source/drivers/raster/doq2.rst diff --git a/gdal/doc/source/drivers/raster/dted.rst b/doc/source/drivers/raster/dted.rst similarity index 100% rename from gdal/doc/source/drivers/raster/dted.rst rename to doc/source/drivers/raster/dted.rst diff --git a/gdal/doc/source/drivers/raster/ecrgtoc.rst b/doc/source/drivers/raster/ecrgtoc.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ecrgtoc.rst rename to doc/source/drivers/raster/ecrgtoc.rst diff --git a/gdal/doc/source/drivers/raster/ecw.rst b/doc/source/drivers/raster/ecw.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ecw.rst rename to doc/source/drivers/raster/ecw.rst diff --git a/gdal/doc/source/drivers/raster/eedai.rst b/doc/source/drivers/raster/eedai.rst similarity index 100% rename from gdal/doc/source/drivers/raster/eedai.rst rename to doc/source/drivers/raster/eedai.rst diff --git a/gdal/doc/source/drivers/raster/ehdr.rst b/doc/source/drivers/raster/ehdr.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ehdr.rst rename to doc/source/drivers/raster/ehdr.rst diff --git a/gdal/doc/source/drivers/raster/eir.rst b/doc/source/drivers/raster/eir.rst similarity index 100% rename from gdal/doc/source/drivers/raster/eir.rst rename to doc/source/drivers/raster/eir.rst diff --git a/gdal/doc/source/drivers/raster/elas.rst b/doc/source/drivers/raster/elas.rst similarity index 100% rename from gdal/doc/source/drivers/raster/elas.rst rename to doc/source/drivers/raster/elas.rst diff --git a/gdal/doc/source/drivers/raster/envi.rst b/doc/source/drivers/raster/envi.rst similarity index 100% rename from gdal/doc/source/drivers/raster/envi.rst rename to doc/source/drivers/raster/envi.rst diff --git a/gdal/doc/source/drivers/raster/ers.rst b/doc/source/drivers/raster/ers.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ers.rst rename to doc/source/drivers/raster/ers.rst diff --git a/gdal/doc/source/drivers/raster/esat.rst b/doc/source/drivers/raster/esat.rst similarity index 100% rename from gdal/doc/source/drivers/raster/esat.rst rename to doc/source/drivers/raster/esat.rst diff --git a/gdal/doc/source/drivers/raster/esric.rst b/doc/source/drivers/raster/esric.rst similarity index 100% rename from gdal/doc/source/drivers/raster/esric.rst rename to doc/source/drivers/raster/esric.rst diff --git a/gdal/doc/source/drivers/raster/exr.rst b/doc/source/drivers/raster/exr.rst similarity index 100% rename from gdal/doc/source/drivers/raster/exr.rst rename to doc/source/drivers/raster/exr.rst diff --git a/gdal/doc/source/drivers/raster/fast.rst b/doc/source/drivers/raster/fast.rst similarity index 100% rename from gdal/doc/source/drivers/raster/fast.rst rename to doc/source/drivers/raster/fast.rst diff --git a/gdal/doc/source/drivers/raster/fit.rst b/doc/source/drivers/raster/fit.rst similarity index 100% rename from gdal/doc/source/drivers/raster/fit.rst rename to doc/source/drivers/raster/fit.rst diff --git a/gdal/doc/source/drivers/raster/fits.rst b/doc/source/drivers/raster/fits.rst similarity index 100% rename from gdal/doc/source/drivers/raster/fits.rst rename to doc/source/drivers/raster/fits.rst diff --git a/gdal/doc/source/drivers/raster/fujibas.rst b/doc/source/drivers/raster/fujibas.rst similarity index 100% rename from gdal/doc/source/drivers/raster/fujibas.rst rename to doc/source/drivers/raster/fujibas.rst diff --git a/gdal/doc/source/drivers/raster/genbin.rst b/doc/source/drivers/raster/genbin.rst similarity index 100% rename from gdal/doc/source/drivers/raster/genbin.rst rename to doc/source/drivers/raster/genbin.rst diff --git a/gdal/doc/source/drivers/raster/georaster.rst b/doc/source/drivers/raster/georaster.rst similarity index 100% rename from gdal/doc/source/drivers/raster/georaster.rst rename to doc/source/drivers/raster/georaster.rst diff --git a/gdal/doc/source/drivers/raster/gff.rst b/doc/source/drivers/raster/gff.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gff.rst rename to doc/source/drivers/raster/gff.rst diff --git a/gdal/doc/source/drivers/raster/gif.rst b/doc/source/drivers/raster/gif.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gif.rst rename to doc/source/drivers/raster/gif.rst diff --git a/gdal/doc/source/drivers/raster/gmt.rst b/doc/source/drivers/raster/gmt.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gmt.rst rename to doc/source/drivers/raster/gmt.rst diff --git a/gdal/doc/source/drivers/raster/gpkg.rst b/doc/source/drivers/raster/gpkg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gpkg.rst rename to doc/source/drivers/raster/gpkg.rst diff --git a/gdal/doc/source/drivers/raster/grass.rst b/doc/source/drivers/raster/grass.rst similarity index 100% rename from gdal/doc/source/drivers/raster/grass.rst rename to doc/source/drivers/raster/grass.rst diff --git a/gdal/doc/source/drivers/raster/grassasciigrid.rst b/doc/source/drivers/raster/grassasciigrid.rst similarity index 100% rename from gdal/doc/source/drivers/raster/grassasciigrid.rst rename to doc/source/drivers/raster/grassasciigrid.rst diff --git a/gdal/doc/source/drivers/raster/grib.rst b/doc/source/drivers/raster/grib.rst similarity index 100% rename from gdal/doc/source/drivers/raster/grib.rst rename to doc/source/drivers/raster/grib.rst diff --git a/gdal/doc/source/drivers/raster/gs7bg.rst b/doc/source/drivers/raster/gs7bg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gs7bg.rst rename to doc/source/drivers/raster/gs7bg.rst diff --git a/gdal/doc/source/drivers/raster/gsag.rst b/doc/source/drivers/raster/gsag.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gsag.rst rename to doc/source/drivers/raster/gsag.rst diff --git a/gdal/doc/source/drivers/raster/gsbg.rst b/doc/source/drivers/raster/gsbg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gsbg.rst rename to doc/source/drivers/raster/gsbg.rst diff --git a/gdal/doc/source/drivers/raster/gsc.rst b/doc/source/drivers/raster/gsc.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gsc.rst rename to doc/source/drivers/raster/gsc.rst diff --git a/gdal/doc/source/drivers/raster/gta.rst b/doc/source/drivers/raster/gta.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gta.rst rename to doc/source/drivers/raster/gta.rst diff --git a/gdal/doc/source/drivers/raster/gtiff.rst b/doc/source/drivers/raster/gtiff.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gtiff.rst rename to doc/source/drivers/raster/gtiff.rst diff --git a/gdal/doc/source/drivers/raster/gxf.rst b/doc/source/drivers/raster/gxf.rst similarity index 100% rename from gdal/doc/source/drivers/raster/gxf.rst rename to doc/source/drivers/raster/gxf.rst diff --git a/gdal/doc/source/drivers/raster/hdf4.rst b/doc/source/drivers/raster/hdf4.rst similarity index 100% rename from gdal/doc/source/drivers/raster/hdf4.rst rename to doc/source/drivers/raster/hdf4.rst diff --git a/gdal/doc/source/drivers/raster/hdf5.rst b/doc/source/drivers/raster/hdf5.rst similarity index 100% rename from gdal/doc/source/drivers/raster/hdf5.rst rename to doc/source/drivers/raster/hdf5.rst diff --git a/gdal/doc/source/drivers/raster/heif.rst b/doc/source/drivers/raster/heif.rst similarity index 100% rename from gdal/doc/source/drivers/raster/heif.rst rename to doc/source/drivers/raster/heif.rst diff --git a/gdal/doc/source/drivers/raster/hf2.rst b/doc/source/drivers/raster/hf2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/hf2.rst rename to doc/source/drivers/raster/hf2.rst diff --git a/gdal/doc/source/drivers/raster/hfa.rst b/doc/source/drivers/raster/hfa.rst similarity index 100% rename from gdal/doc/source/drivers/raster/hfa.rst rename to doc/source/drivers/raster/hfa.rst diff --git a/gdal/doc/source/drivers/raster/ida.rst b/doc/source/drivers/raster/ida.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ida.rst rename to doc/source/drivers/raster/ida.rst diff --git a/gdal/doc/source/drivers/raster/ilwis.rst b/doc/source/drivers/raster/ilwis.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ilwis.rst rename to doc/source/drivers/raster/ilwis.rst diff --git a/gdal/doc/source/drivers/raster/index.rst b/doc/source/drivers/raster/index.rst similarity index 100% rename from gdal/doc/source/drivers/raster/index.rst rename to doc/source/drivers/raster/index.rst diff --git a/gdal/doc/source/drivers/raster/intergraphraster.rst b/doc/source/drivers/raster/intergraphraster.rst similarity index 100% rename from gdal/doc/source/drivers/raster/intergraphraster.rst rename to doc/source/drivers/raster/intergraphraster.rst diff --git a/gdal/doc/source/drivers/raster/iris.rst b/doc/source/drivers/raster/iris.rst similarity index 100% rename from gdal/doc/source/drivers/raster/iris.rst rename to doc/source/drivers/raster/iris.rst diff --git a/gdal/doc/source/drivers/raster/isce.rst b/doc/source/drivers/raster/isce.rst similarity index 100% rename from gdal/doc/source/drivers/raster/isce.rst rename to doc/source/drivers/raster/isce.rst diff --git a/gdal/doc/source/drivers/raster/isg.rst b/doc/source/drivers/raster/isg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/isg.rst rename to doc/source/drivers/raster/isg.rst diff --git a/gdal/doc/source/drivers/raster/isis2.rst b/doc/source/drivers/raster/isis2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/isis2.rst rename to doc/source/drivers/raster/isis2.rst diff --git a/gdal/doc/source/drivers/raster/isis3.rst b/doc/source/drivers/raster/isis3.rst similarity index 100% rename from gdal/doc/source/drivers/raster/isis3.rst rename to doc/source/drivers/raster/isis3.rst diff --git a/gdal/doc/source/drivers/raster/jdem.rst b/doc/source/drivers/raster/jdem.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jdem.rst rename to doc/source/drivers/raster/jdem.rst diff --git a/gdal/doc/source/drivers/raster/jp2ecw.rst b/doc/source/drivers/raster/jp2ecw.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jp2ecw.rst rename to doc/source/drivers/raster/jp2ecw.rst diff --git a/gdal/doc/source/drivers/raster/jp2kak.rst b/doc/source/drivers/raster/jp2kak.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jp2kak.rst rename to doc/source/drivers/raster/jp2kak.rst diff --git a/gdal/doc/source/drivers/raster/jp2lura.rst b/doc/source/drivers/raster/jp2lura.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jp2lura.rst rename to doc/source/drivers/raster/jp2lura.rst diff --git a/gdal/doc/source/drivers/raster/jp2mrsid.rst b/doc/source/drivers/raster/jp2mrsid.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jp2mrsid.rst rename to doc/source/drivers/raster/jp2mrsid.rst diff --git a/gdal/doc/source/drivers/raster/jp2openjpeg.rst b/doc/source/drivers/raster/jp2openjpeg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jp2openjpeg.rst rename to doc/source/drivers/raster/jp2openjpeg.rst diff --git a/gdal/doc/source/drivers/raster/jpeg.rst b/doc/source/drivers/raster/jpeg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jpeg.rst rename to doc/source/drivers/raster/jpeg.rst diff --git a/gdal/doc/source/drivers/raster/jpeg2000.rst b/doc/source/drivers/raster/jpeg2000.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jpeg2000.rst rename to doc/source/drivers/raster/jpeg2000.rst diff --git a/gdal/doc/source/drivers/raster/jpegls.rst b/doc/source/drivers/raster/jpegls.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jpegls.rst rename to doc/source/drivers/raster/jpegls.rst diff --git a/gdal/doc/source/drivers/raster/jpipkak.rst b/doc/source/drivers/raster/jpipkak.rst similarity index 100% rename from gdal/doc/source/drivers/raster/jpipkak.rst rename to doc/source/drivers/raster/jpipkak.rst diff --git a/gdal/doc/source/drivers/raster/kea.rst b/doc/source/drivers/raster/kea.rst similarity index 100% rename from gdal/doc/source/drivers/raster/kea.rst rename to doc/source/drivers/raster/kea.rst diff --git a/gdal/doc/source/drivers/raster/kmlsuperoverlay.rst b/doc/source/drivers/raster/kmlsuperoverlay.rst similarity index 100% rename from gdal/doc/source/drivers/raster/kmlsuperoverlay.rst rename to doc/source/drivers/raster/kmlsuperoverlay.rst diff --git a/gdal/doc/source/drivers/raster/kro.rst b/doc/source/drivers/raster/kro.rst similarity index 100% rename from gdal/doc/source/drivers/raster/kro.rst rename to doc/source/drivers/raster/kro.rst diff --git a/gdal/doc/source/drivers/raster/l1b.rst b/doc/source/drivers/raster/l1b.rst similarity index 100% rename from gdal/doc/source/drivers/raster/l1b.rst rename to doc/source/drivers/raster/l1b.rst diff --git a/gdal/doc/source/drivers/raster/lan.rst b/doc/source/drivers/raster/lan.rst similarity index 100% rename from gdal/doc/source/drivers/raster/lan.rst rename to doc/source/drivers/raster/lan.rst diff --git a/gdal/doc/source/drivers/raster/lcp.rst b/doc/source/drivers/raster/lcp.rst similarity index 100% rename from gdal/doc/source/drivers/raster/lcp.rst rename to doc/source/drivers/raster/lcp.rst diff --git a/gdal/doc/source/drivers/raster/leveller.rst b/doc/source/drivers/raster/leveller.rst similarity index 100% rename from gdal/doc/source/drivers/raster/leveller.rst rename to doc/source/drivers/raster/leveller.rst diff --git a/gdal/doc/source/drivers/raster/loslas.rst b/doc/source/drivers/raster/loslas.rst similarity index 100% rename from gdal/doc/source/drivers/raster/loslas.rst rename to doc/source/drivers/raster/loslas.rst diff --git a/gdal/doc/source/drivers/raster/map.rst b/doc/source/drivers/raster/map.rst similarity index 100% rename from gdal/doc/source/drivers/raster/map.rst rename to doc/source/drivers/raster/map.rst diff --git a/gdal/doc/source/drivers/raster/marfa.rst b/doc/source/drivers/raster/marfa.rst similarity index 100% rename from gdal/doc/source/drivers/raster/marfa.rst rename to doc/source/drivers/raster/marfa.rst diff --git a/gdal/doc/source/drivers/raster/mbtiles.rst b/doc/source/drivers/raster/mbtiles.rst similarity index 100% rename from gdal/doc/source/drivers/raster/mbtiles.rst rename to doc/source/drivers/raster/mbtiles.rst diff --git a/gdal/doc/source/drivers/raster/mem.rst b/doc/source/drivers/raster/mem.rst similarity index 100% rename from gdal/doc/source/drivers/raster/mem.rst rename to doc/source/drivers/raster/mem.rst diff --git a/gdal/doc/source/drivers/raster/mff.rst b/doc/source/drivers/raster/mff.rst similarity index 100% rename from gdal/doc/source/drivers/raster/mff.rst rename to doc/source/drivers/raster/mff.rst diff --git a/gdal/doc/source/drivers/raster/mff2.rst b/doc/source/drivers/raster/mff2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/mff2.rst rename to doc/source/drivers/raster/mff2.rst diff --git a/gdal/doc/source/drivers/raster/mg4lidar.rst b/doc/source/drivers/raster/mg4lidar.rst similarity index 100% rename from gdal/doc/source/drivers/raster/mg4lidar.rst rename to doc/source/drivers/raster/mg4lidar.rst diff --git a/gdal/doc/source/drivers/raster/mg4lidar_view_point_cloud.rst b/doc/source/drivers/raster/mg4lidar_view_point_cloud.rst similarity index 100% rename from gdal/doc/source/drivers/raster/mg4lidar_view_point_cloud.rst rename to doc/source/drivers/raster/mg4lidar_view_point_cloud.rst diff --git a/gdal/doc/source/drivers/raster/mrsid.rst b/doc/source/drivers/raster/mrsid.rst similarity index 100% rename from gdal/doc/source/drivers/raster/mrsid.rst rename to doc/source/drivers/raster/mrsid.rst diff --git a/gdal/doc/source/drivers/raster/msg.rst b/doc/source/drivers/raster/msg.rst similarity index 100% rename from gdal/doc/source/drivers/raster/msg.rst rename to doc/source/drivers/raster/msg.rst diff --git a/gdal/doc/source/drivers/raster/msgn.rst b/doc/source/drivers/raster/msgn.rst similarity index 100% rename from gdal/doc/source/drivers/raster/msgn.rst rename to doc/source/drivers/raster/msgn.rst diff --git a/gdal/doc/source/drivers/raster/ndf.rst b/doc/source/drivers/raster/ndf.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ndf.rst rename to doc/source/drivers/raster/ndf.rst diff --git a/gdal/doc/source/drivers/raster/netcdf.rst b/doc/source/drivers/raster/netcdf.rst similarity index 100% rename from gdal/doc/source/drivers/raster/netcdf.rst rename to doc/source/drivers/raster/netcdf.rst diff --git a/gdal/doc/source/drivers/raster/ngsgeoid.rst b/doc/source/drivers/raster/ngsgeoid.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ngsgeoid.rst rename to doc/source/drivers/raster/ngsgeoid.rst diff --git a/gdal/doc/source/drivers/raster/ngw.rst b/doc/source/drivers/raster/ngw.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ngw.rst rename to doc/source/drivers/raster/ngw.rst diff --git a/gdal/doc/source/drivers/raster/nitf.rst b/doc/source/drivers/raster/nitf.rst similarity index 100% rename from gdal/doc/source/drivers/raster/nitf.rst rename to doc/source/drivers/raster/nitf.rst diff --git a/gdal/doc/source/drivers/raster/nitf_advanced.rst b/doc/source/drivers/raster/nitf_advanced.rst similarity index 100% rename from gdal/doc/source/drivers/raster/nitf_advanced.rst rename to doc/source/drivers/raster/nitf_advanced.rst diff --git a/gdal/doc/source/drivers/raster/ntv2.rst b/doc/source/drivers/raster/ntv2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ntv2.rst rename to doc/source/drivers/raster/ntv2.rst diff --git a/gdal/doc/source/drivers/raster/nwtgrd.rst b/doc/source/drivers/raster/nwtgrd.rst similarity index 100% rename from gdal/doc/source/drivers/raster/nwtgrd.rst rename to doc/source/drivers/raster/nwtgrd.rst diff --git a/gdal/doc/source/drivers/raster/ogcapi.rst b/doc/source/drivers/raster/ogcapi.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ogcapi.rst rename to doc/source/drivers/raster/ogcapi.rst diff --git a/gdal/doc/source/drivers/raster/ozi.rst b/doc/source/drivers/raster/ozi.rst similarity index 100% rename from gdal/doc/source/drivers/raster/ozi.rst rename to doc/source/drivers/raster/ozi.rst diff --git a/gdal/doc/source/drivers/raster/palsar.rst b/doc/source/drivers/raster/palsar.rst similarity index 100% rename from gdal/doc/source/drivers/raster/palsar.rst rename to doc/source/drivers/raster/palsar.rst diff --git a/gdal/doc/source/drivers/raster/paux.rst b/doc/source/drivers/raster/paux.rst similarity index 100% rename from gdal/doc/source/drivers/raster/paux.rst rename to doc/source/drivers/raster/paux.rst diff --git a/gdal/doc/source/drivers/raster/pcidsk.rst b/doc/source/drivers/raster/pcidsk.rst similarity index 100% rename from gdal/doc/source/drivers/raster/pcidsk.rst rename to doc/source/drivers/raster/pcidsk.rst diff --git a/gdal/doc/source/drivers/raster/pcraster.rst b/doc/source/drivers/raster/pcraster.rst similarity index 100% rename from gdal/doc/source/drivers/raster/pcraster.rst rename to doc/source/drivers/raster/pcraster.rst diff --git a/gdal/doc/source/drivers/raster/pdf.rst b/doc/source/drivers/raster/pdf.rst similarity index 100% rename from gdal/doc/source/drivers/raster/pdf.rst rename to doc/source/drivers/raster/pdf.rst diff --git a/gdal/doc/source/drivers/raster/pds.rst b/doc/source/drivers/raster/pds.rst similarity index 100% rename from gdal/doc/source/drivers/raster/pds.rst rename to doc/source/drivers/raster/pds.rst diff --git a/gdal/doc/source/drivers/raster/pds4.rst b/doc/source/drivers/raster/pds4.rst similarity index 100% rename from gdal/doc/source/drivers/raster/pds4.rst rename to doc/source/drivers/raster/pds4.rst diff --git a/gdal/doc/source/drivers/raster/plmosaic.rst b/doc/source/drivers/raster/plmosaic.rst similarity index 100% rename from gdal/doc/source/drivers/raster/plmosaic.rst rename to doc/source/drivers/raster/plmosaic.rst diff --git a/gdal/doc/source/drivers/raster/png.rst b/doc/source/drivers/raster/png.rst similarity index 100% rename from gdal/doc/source/drivers/raster/png.rst rename to doc/source/drivers/raster/png.rst diff --git a/gdal/doc/source/drivers/raster/pnm.rst b/doc/source/drivers/raster/pnm.rst similarity index 100% rename from gdal/doc/source/drivers/raster/pnm.rst rename to doc/source/drivers/raster/pnm.rst diff --git a/gdal/doc/source/drivers/raster/postgisraster.rst b/doc/source/drivers/raster/postgisraster.rst similarity index 100% rename from gdal/doc/source/drivers/raster/postgisraster.rst rename to doc/source/drivers/raster/postgisraster.rst diff --git a/gdal/doc/source/drivers/raster/prf.rst b/doc/source/drivers/raster/prf.rst similarity index 100% rename from gdal/doc/source/drivers/raster/prf.rst rename to doc/source/drivers/raster/prf.rst diff --git a/gdal/doc/source/drivers/raster/r.rst b/doc/source/drivers/raster/r.rst similarity index 100% rename from gdal/doc/source/drivers/raster/r.rst rename to doc/source/drivers/raster/r.rst diff --git a/gdal/doc/source/drivers/raster/rasdaman.rst b/doc/source/drivers/raster/rasdaman.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rasdaman.rst rename to doc/source/drivers/raster/rasdaman.rst diff --git a/gdal/doc/source/drivers/raster/rasterlite.rst b/doc/source/drivers/raster/rasterlite.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rasterlite.rst rename to doc/source/drivers/raster/rasterlite.rst diff --git a/gdal/doc/source/drivers/raster/rasterlite2.rst b/doc/source/drivers/raster/rasterlite2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rasterlite2.rst rename to doc/source/drivers/raster/rasterlite2.rst diff --git a/gdal/doc/source/drivers/raster/rda.rst b/doc/source/drivers/raster/rda.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rda.rst rename to doc/source/drivers/raster/rda.rst diff --git a/gdal/doc/source/drivers/raster/rdb.rst b/doc/source/drivers/raster/rdb.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rdb.rst rename to doc/source/drivers/raster/rdb.rst diff --git a/gdal/doc/source/drivers/raster/rik.rst b/doc/source/drivers/raster/rik.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rik.rst rename to doc/source/drivers/raster/rik.rst diff --git a/gdal/doc/source/drivers/raster/rmf.rst b/doc/source/drivers/raster/rmf.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rmf.rst rename to doc/source/drivers/raster/rmf.rst diff --git a/gdal/doc/source/drivers/raster/roi_pac.rst b/doc/source/drivers/raster/roi_pac.rst similarity index 100% rename from gdal/doc/source/drivers/raster/roi_pac.rst rename to doc/source/drivers/raster/roi_pac.rst diff --git a/gdal/doc/source/drivers/raster/rpftoc.rst b/doc/source/drivers/raster/rpftoc.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rpftoc.rst rename to doc/source/drivers/raster/rpftoc.rst diff --git a/gdal/doc/source/drivers/raster/rraster.rst b/doc/source/drivers/raster/rraster.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rraster.rst rename to doc/source/drivers/raster/rraster.rst diff --git a/gdal/doc/source/drivers/raster/rs2.rst b/doc/source/drivers/raster/rs2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/rs2.rst rename to doc/source/drivers/raster/rs2.rst diff --git a/gdal/doc/source/drivers/raster/safe.rst b/doc/source/drivers/raster/safe.rst similarity index 100% rename from gdal/doc/source/drivers/raster/safe.rst rename to doc/source/drivers/raster/safe.rst diff --git a/gdal/doc/source/drivers/raster/sar_ceos.rst b/doc/source/drivers/raster/sar_ceos.rst similarity index 100% rename from gdal/doc/source/drivers/raster/sar_ceos.rst rename to doc/source/drivers/raster/sar_ceos.rst diff --git a/gdal/doc/source/drivers/raster/sdat.rst b/doc/source/drivers/raster/sdat.rst similarity index 100% rename from gdal/doc/source/drivers/raster/sdat.rst rename to doc/source/drivers/raster/sdat.rst diff --git a/gdal/doc/source/drivers/raster/sdts.rst b/doc/source/drivers/raster/sdts.rst similarity index 100% rename from gdal/doc/source/drivers/raster/sdts.rst rename to doc/source/drivers/raster/sdts.rst diff --git a/gdal/doc/source/drivers/raster/sentinel2.rst b/doc/source/drivers/raster/sentinel2.rst similarity index 100% rename from gdal/doc/source/drivers/raster/sentinel2.rst rename to doc/source/drivers/raster/sentinel2.rst diff --git a/gdal/doc/source/drivers/raster/sgi.rst b/doc/source/drivers/raster/sgi.rst similarity index 100% rename from gdal/doc/source/drivers/raster/sgi.rst rename to doc/source/drivers/raster/sgi.rst diff --git a/gdal/doc/source/drivers/raster/sigdem.rst b/doc/source/drivers/raster/sigdem.rst similarity index 100% rename from gdal/doc/source/drivers/raster/sigdem.rst rename to doc/source/drivers/raster/sigdem.rst diff --git a/gdal/doc/source/drivers/raster/snodas.rst b/doc/source/drivers/raster/snodas.rst similarity index 100% rename from gdal/doc/source/drivers/raster/snodas.rst rename to doc/source/drivers/raster/snodas.rst diff --git a/gdal/doc/source/drivers/raster/srp.rst b/doc/source/drivers/raster/srp.rst similarity index 100% rename from gdal/doc/source/drivers/raster/srp.rst rename to doc/source/drivers/raster/srp.rst diff --git a/gdal/doc/source/drivers/raster/srtmhgt.rst b/doc/source/drivers/raster/srtmhgt.rst similarity index 100% rename from gdal/doc/source/drivers/raster/srtmhgt.rst rename to doc/source/drivers/raster/srtmhgt.rst diff --git a/gdal/doc/source/drivers/raster/stacit.rst b/doc/source/drivers/raster/stacit.rst similarity index 100% rename from gdal/doc/source/drivers/raster/stacit.rst rename to doc/source/drivers/raster/stacit.rst diff --git a/gdal/doc/source/drivers/raster/stacta.rst b/doc/source/drivers/raster/stacta.rst similarity index 100% rename from gdal/doc/source/drivers/raster/stacta.rst rename to doc/source/drivers/raster/stacta.rst diff --git a/gdal/doc/source/drivers/raster/terragen.rst b/doc/source/drivers/raster/terragen.rst similarity index 100% rename from gdal/doc/source/drivers/raster/terragen.rst rename to doc/source/drivers/raster/terragen.rst diff --git a/gdal/doc/source/drivers/raster/tga.rst b/doc/source/drivers/raster/tga.rst similarity index 100% rename from gdal/doc/source/drivers/raster/tga.rst rename to doc/source/drivers/raster/tga.rst diff --git a/gdal/doc/source/drivers/raster/til.rst b/doc/source/drivers/raster/til.rst similarity index 100% rename from gdal/doc/source/drivers/raster/til.rst rename to doc/source/drivers/raster/til.rst diff --git a/gdal/doc/source/drivers/raster/tiledb.rst b/doc/source/drivers/raster/tiledb.rst similarity index 100% rename from gdal/doc/source/drivers/raster/tiledb.rst rename to doc/source/drivers/raster/tiledb.rst diff --git a/gdal/doc/source/drivers/raster/tsx.rst b/doc/source/drivers/raster/tsx.rst similarity index 100% rename from gdal/doc/source/drivers/raster/tsx.rst rename to doc/source/drivers/raster/tsx.rst diff --git a/gdal/doc/source/drivers/raster/usgsdem.rst b/doc/source/drivers/raster/usgsdem.rst similarity index 100% rename from gdal/doc/source/drivers/raster/usgsdem.rst rename to doc/source/drivers/raster/usgsdem.rst diff --git a/gdal/doc/source/drivers/raster/vicar.rst b/doc/source/drivers/raster/vicar.rst similarity index 100% rename from gdal/doc/source/drivers/raster/vicar.rst rename to doc/source/drivers/raster/vicar.rst diff --git a/gdal/doc/source/drivers/raster/vrt.rst b/doc/source/drivers/raster/vrt.rst similarity index 100% rename from gdal/doc/source/drivers/raster/vrt.rst rename to doc/source/drivers/raster/vrt.rst diff --git a/gdal/doc/source/drivers/raster/vrt_multidimensional.rst b/doc/source/drivers/raster/vrt_multidimensional.rst similarity index 100% rename from gdal/doc/source/drivers/raster/vrt_multidimensional.rst rename to doc/source/drivers/raster/vrt_multidimensional.rst diff --git a/gdal/doc/source/drivers/raster/wcs.rst b/doc/source/drivers/raster/wcs.rst similarity index 100% rename from gdal/doc/source/drivers/raster/wcs.rst rename to doc/source/drivers/raster/wcs.rst diff --git a/gdal/doc/source/drivers/raster/webp.rst b/doc/source/drivers/raster/webp.rst similarity index 100% rename from gdal/doc/source/drivers/raster/webp.rst rename to doc/source/drivers/raster/webp.rst diff --git a/gdal/doc/source/drivers/raster/wld.rst b/doc/source/drivers/raster/wld.rst similarity index 100% rename from gdal/doc/source/drivers/raster/wld.rst rename to doc/source/drivers/raster/wld.rst diff --git a/gdal/doc/source/drivers/raster/wms.rst b/doc/source/drivers/raster/wms.rst similarity index 100% rename from gdal/doc/source/drivers/raster/wms.rst rename to doc/source/drivers/raster/wms.rst diff --git a/gdal/doc/source/drivers/raster/wmts.rst b/doc/source/drivers/raster/wmts.rst similarity index 100% rename from gdal/doc/source/drivers/raster/wmts.rst rename to doc/source/drivers/raster/wmts.rst diff --git a/gdal/doc/source/drivers/raster/xpm.rst b/doc/source/drivers/raster/xpm.rst similarity index 100% rename from gdal/doc/source/drivers/raster/xpm.rst rename to doc/source/drivers/raster/xpm.rst diff --git a/gdal/doc/source/drivers/raster/xyz.rst b/doc/source/drivers/raster/xyz.rst similarity index 100% rename from gdal/doc/source/drivers/raster/xyz.rst rename to doc/source/drivers/raster/xyz.rst diff --git a/gdal/doc/source/drivers/raster/zarr.rst b/doc/source/drivers/raster/zarr.rst similarity index 100% rename from gdal/doc/source/drivers/raster/zarr.rst rename to doc/source/drivers/raster/zarr.rst diff --git a/gdal/doc/source/drivers/raster/zmap.rst b/doc/source/drivers/raster/zmap.rst similarity index 100% rename from gdal/doc/source/drivers/raster/zmap.rst rename to doc/source/drivers/raster/zmap.rst diff --git a/gdal/doc/source/drivers/vector/amigocloud.rst b/doc/source/drivers/vector/amigocloud.rst similarity index 100% rename from gdal/doc/source/drivers/vector/amigocloud.rst rename to doc/source/drivers/vector/amigocloud.rst diff --git a/gdal/doc/source/drivers/vector/ao.rst b/doc/source/drivers/vector/ao.rst similarity index 100% rename from gdal/doc/source/drivers/vector/ao.rst rename to doc/source/drivers/vector/ao.rst diff --git a/gdal/doc/source/drivers/vector/arcgen.rst b/doc/source/drivers/vector/arcgen.rst similarity index 100% rename from gdal/doc/source/drivers/vector/arcgen.rst rename to doc/source/drivers/vector/arcgen.rst diff --git a/gdal/doc/source/drivers/vector/avcbin.rst b/doc/source/drivers/vector/avcbin.rst similarity index 100% rename from gdal/doc/source/drivers/vector/avcbin.rst rename to doc/source/drivers/vector/avcbin.rst diff --git a/gdal/doc/source/drivers/vector/avce00.rst b/doc/source/drivers/vector/avce00.rst similarity index 100% rename from gdal/doc/source/drivers/vector/avce00.rst rename to doc/source/drivers/vector/avce00.rst diff --git a/gdal/doc/source/drivers/vector/cad.rst b/doc/source/drivers/vector/cad.rst similarity index 100% rename from gdal/doc/source/drivers/vector/cad.rst rename to doc/source/drivers/vector/cad.rst diff --git a/gdal/doc/source/drivers/vector/carto.rst b/doc/source/drivers/vector/carto.rst similarity index 100% rename from gdal/doc/source/drivers/vector/carto.rst rename to doc/source/drivers/vector/carto.rst diff --git a/gdal/doc/source/drivers/vector/cloudant.rst b/doc/source/drivers/vector/cloudant.rst similarity index 100% rename from gdal/doc/source/drivers/vector/cloudant.rst rename to doc/source/drivers/vector/cloudant.rst diff --git a/gdal/doc/source/drivers/vector/couchdb.rst b/doc/source/drivers/vector/couchdb.rst similarity index 100% rename from gdal/doc/source/drivers/vector/couchdb.rst rename to doc/source/drivers/vector/couchdb.rst diff --git a/gdal/doc/source/drivers/vector/csv.rst b/doc/source/drivers/vector/csv.rst similarity index 100% rename from gdal/doc/source/drivers/vector/csv.rst rename to doc/source/drivers/vector/csv.rst diff --git a/gdal/doc/source/drivers/vector/csw.rst b/doc/source/drivers/vector/csw.rst similarity index 100% rename from gdal/doc/source/drivers/vector/csw.rst rename to doc/source/drivers/vector/csw.rst diff --git a/gdal/doc/source/drivers/vector/db2.rst b/doc/source/drivers/vector/db2.rst similarity index 100% rename from gdal/doc/source/drivers/vector/db2.rst rename to doc/source/drivers/vector/db2.rst diff --git a/gdal/doc/source/drivers/vector/dgn.rst b/doc/source/drivers/vector/dgn.rst similarity index 100% rename from gdal/doc/source/drivers/vector/dgn.rst rename to doc/source/drivers/vector/dgn.rst diff --git a/gdal/doc/source/drivers/vector/dgnv8.rst b/doc/source/drivers/vector/dgnv8.rst similarity index 100% rename from gdal/doc/source/drivers/vector/dgnv8.rst rename to doc/source/drivers/vector/dgnv8.rst diff --git a/gdal/doc/source/drivers/vector/dods.rst b/doc/source/drivers/vector/dods.rst similarity index 100% rename from gdal/doc/source/drivers/vector/dods.rst rename to doc/source/drivers/vector/dods.rst diff --git a/gdal/doc/source/drivers/vector/dwg.rst b/doc/source/drivers/vector/dwg.rst similarity index 100% rename from gdal/doc/source/drivers/vector/dwg.rst rename to doc/source/drivers/vector/dwg.rst diff --git a/gdal/doc/source/drivers/vector/dxf.rst b/doc/source/drivers/vector/dxf.rst similarity index 100% rename from gdal/doc/source/drivers/vector/dxf.rst rename to doc/source/drivers/vector/dxf.rst diff --git a/gdal/doc/source/drivers/vector/edigeo.rst b/doc/source/drivers/vector/edigeo.rst similarity index 100% rename from gdal/doc/source/drivers/vector/edigeo.rst rename to doc/source/drivers/vector/edigeo.rst diff --git a/gdal/doc/source/drivers/vector/eeda.rst b/doc/source/drivers/vector/eeda.rst similarity index 100% rename from gdal/doc/source/drivers/vector/eeda.rst rename to doc/source/drivers/vector/eeda.rst diff --git a/gdal/doc/source/drivers/vector/elasticsearch.rst b/doc/source/drivers/vector/elasticsearch.rst similarity index 100% rename from gdal/doc/source/drivers/vector/elasticsearch.rst rename to doc/source/drivers/vector/elasticsearch.rst diff --git a/gdal/doc/source/drivers/vector/esrijson.rst b/doc/source/drivers/vector/esrijson.rst similarity index 100% rename from gdal/doc/source/drivers/vector/esrijson.rst rename to doc/source/drivers/vector/esrijson.rst diff --git a/gdal/doc/source/drivers/vector/filegdb.rst b/doc/source/drivers/vector/filegdb.rst similarity index 100% rename from gdal/doc/source/drivers/vector/filegdb.rst rename to doc/source/drivers/vector/filegdb.rst diff --git a/gdal/doc/source/drivers/vector/flatgeobuf.rst b/doc/source/drivers/vector/flatgeobuf.rst similarity index 100% rename from gdal/doc/source/drivers/vector/flatgeobuf.rst rename to doc/source/drivers/vector/flatgeobuf.rst diff --git a/gdal/doc/source/drivers/vector/fme.rst b/doc/source/drivers/vector/fme.rst similarity index 100% rename from gdal/doc/source/drivers/vector/fme.rst rename to doc/source/drivers/vector/fme.rst diff --git a/gdal/doc/source/drivers/vector/geoconcept.rst b/doc/source/drivers/vector/geoconcept.rst similarity index 100% rename from gdal/doc/source/drivers/vector/geoconcept.rst rename to doc/source/drivers/vector/geoconcept.rst diff --git a/gdal/doc/source/drivers/vector/geojson.rst b/doc/source/drivers/vector/geojson.rst similarity index 100% rename from gdal/doc/source/drivers/vector/geojson.rst rename to doc/source/drivers/vector/geojson.rst diff --git a/gdal/doc/source/drivers/vector/geojsonseq.rst b/doc/source/drivers/vector/geojsonseq.rst similarity index 100% rename from gdal/doc/source/drivers/vector/geojsonseq.rst rename to doc/source/drivers/vector/geojsonseq.rst diff --git a/gdal/doc/source/drivers/vector/geomedia.rst b/doc/source/drivers/vector/geomedia.rst similarity index 100% rename from gdal/doc/source/drivers/vector/geomedia.rst rename to doc/source/drivers/vector/geomedia.rst diff --git a/gdal/doc/source/drivers/vector/geopackage_aspatial.rst b/doc/source/drivers/vector/geopackage_aspatial.rst similarity index 100% rename from gdal/doc/source/drivers/vector/geopackage_aspatial.rst rename to doc/source/drivers/vector/geopackage_aspatial.rst diff --git a/gdal/doc/source/drivers/vector/georss.rst b/doc/source/drivers/vector/georss.rst similarity index 100% rename from gdal/doc/source/drivers/vector/georss.rst rename to doc/source/drivers/vector/georss.rst diff --git a/gdal/doc/source/drivers/vector/gml.rst b/doc/source/drivers/vector/gml.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gml.rst rename to doc/source/drivers/vector/gml.rst diff --git a/gdal/doc/source/drivers/vector/gmlas.rst b/doc/source/drivers/vector/gmlas.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gmlas.rst rename to doc/source/drivers/vector/gmlas.rst diff --git a/gdal/doc/source/drivers/vector/gmlas_mapping_examples.rst b/doc/source/drivers/vector/gmlas_mapping_examples.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gmlas_mapping_examples.rst rename to doc/source/drivers/vector/gmlas_mapping_examples.rst diff --git a/gdal/doc/source/drivers/vector/gmlas_metadata_layers.rst b/doc/source/drivers/vector/gmlas_metadata_layers.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gmlas_metadata_layers.rst rename to doc/source/drivers/vector/gmlas_metadata_layers.rst diff --git a/gdal/doc/source/drivers/vector/gmt.rst b/doc/source/drivers/vector/gmt.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gmt.rst rename to doc/source/drivers/vector/gmt.rst diff --git a/gdal/doc/source/drivers/vector/gpkg.rst b/doc/source/drivers/vector/gpkg.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gpkg.rst rename to doc/source/drivers/vector/gpkg.rst diff --git a/gdal/doc/source/drivers/vector/gpsbabel.rst b/doc/source/drivers/vector/gpsbabel.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gpsbabel.rst rename to doc/source/drivers/vector/gpsbabel.rst diff --git a/gdal/doc/source/drivers/vector/gpx.rst b/doc/source/drivers/vector/gpx.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gpx.rst rename to doc/source/drivers/vector/gpx.rst diff --git a/gdal/doc/source/drivers/vector/grass.rst b/doc/source/drivers/vector/grass.rst similarity index 100% rename from gdal/doc/source/drivers/vector/grass.rst rename to doc/source/drivers/vector/grass.rst diff --git a/gdal/doc/source/drivers/vector/gtm.rst b/doc/source/drivers/vector/gtm.rst similarity index 100% rename from gdal/doc/source/drivers/vector/gtm.rst rename to doc/source/drivers/vector/gtm.rst diff --git a/gdal/doc/source/drivers/vector/idb.rst b/doc/source/drivers/vector/idb.rst similarity index 100% rename from gdal/doc/source/drivers/vector/idb.rst rename to doc/source/drivers/vector/idb.rst diff --git a/gdal/doc/source/drivers/vector/idrisi.rst b/doc/source/drivers/vector/idrisi.rst similarity index 100% rename from gdal/doc/source/drivers/vector/idrisi.rst rename to doc/source/drivers/vector/idrisi.rst diff --git a/gdal/doc/source/drivers/vector/ili.rst b/doc/source/drivers/vector/ili.rst similarity index 100% rename from gdal/doc/source/drivers/vector/ili.rst rename to doc/source/drivers/vector/ili.rst diff --git a/gdal/doc/source/drivers/vector/index.rst b/doc/source/drivers/vector/index.rst similarity index 100% rename from gdal/doc/source/drivers/vector/index.rst rename to doc/source/drivers/vector/index.rst diff --git a/gdal/doc/source/drivers/vector/ingres.rst b/doc/source/drivers/vector/ingres.rst similarity index 100% rename from gdal/doc/source/drivers/vector/ingres.rst rename to doc/source/drivers/vector/ingres.rst diff --git a/gdal/doc/source/drivers/vector/jml.rst b/doc/source/drivers/vector/jml.rst similarity index 100% rename from gdal/doc/source/drivers/vector/jml.rst rename to doc/source/drivers/vector/jml.rst diff --git a/gdal/doc/source/drivers/vector/kml.rst b/doc/source/drivers/vector/kml.rst similarity index 100% rename from gdal/doc/source/drivers/vector/kml.rst rename to doc/source/drivers/vector/kml.rst diff --git a/gdal/doc/source/drivers/vector/libkml.rst b/doc/source/drivers/vector/libkml.rst similarity index 100% rename from gdal/doc/source/drivers/vector/libkml.rst rename to doc/source/drivers/vector/libkml.rst diff --git a/gdal/doc/source/drivers/vector/lvbag.rst b/doc/source/drivers/vector/lvbag.rst similarity index 100% rename from gdal/doc/source/drivers/vector/lvbag.rst rename to doc/source/drivers/vector/lvbag.rst diff --git a/gdal/doc/source/drivers/vector/mapml.rst b/doc/source/drivers/vector/mapml.rst similarity index 100% rename from gdal/doc/source/drivers/vector/mapml.rst rename to doc/source/drivers/vector/mapml.rst diff --git a/gdal/doc/source/drivers/vector/mdb.rst b/doc/source/drivers/vector/mdb.rst similarity index 100% rename from gdal/doc/source/drivers/vector/mdb.rst rename to doc/source/drivers/vector/mdb.rst diff --git a/gdal/doc/source/drivers/vector/memory.rst b/doc/source/drivers/vector/memory.rst similarity index 100% rename from gdal/doc/source/drivers/vector/memory.rst rename to doc/source/drivers/vector/memory.rst diff --git a/gdal/doc/source/drivers/vector/mitab.rst b/doc/source/drivers/vector/mitab.rst similarity index 100% rename from gdal/doc/source/drivers/vector/mitab.rst rename to doc/source/drivers/vector/mitab.rst diff --git a/gdal/doc/source/drivers/vector/mongodb.rst b/doc/source/drivers/vector/mongodb.rst similarity index 100% rename from gdal/doc/source/drivers/vector/mongodb.rst rename to doc/source/drivers/vector/mongodb.rst diff --git a/gdal/doc/source/drivers/vector/mongodbv3.rst b/doc/source/drivers/vector/mongodbv3.rst similarity index 100% rename from gdal/doc/source/drivers/vector/mongodbv3.rst rename to doc/source/drivers/vector/mongodbv3.rst diff --git a/gdal/doc/source/drivers/vector/mssqlspatial.rst b/doc/source/drivers/vector/mssqlspatial.rst similarity index 100% rename from gdal/doc/source/drivers/vector/mssqlspatial.rst rename to doc/source/drivers/vector/mssqlspatial.rst diff --git a/gdal/doc/source/drivers/vector/mvt.rst b/doc/source/drivers/vector/mvt.rst similarity index 100% rename from gdal/doc/source/drivers/vector/mvt.rst rename to doc/source/drivers/vector/mvt.rst diff --git a/gdal/doc/source/drivers/vector/mysql.rst b/doc/source/drivers/vector/mysql.rst similarity index 100% rename from gdal/doc/source/drivers/vector/mysql.rst rename to doc/source/drivers/vector/mysql.rst diff --git a/gdal/doc/source/drivers/vector/nas.rst b/doc/source/drivers/vector/nas.rst similarity index 100% rename from gdal/doc/source/drivers/vector/nas.rst rename to doc/source/drivers/vector/nas.rst diff --git a/gdal/doc/source/drivers/vector/netcdf.rst b/doc/source/drivers/vector/netcdf.rst similarity index 100% rename from gdal/doc/source/drivers/vector/netcdf.rst rename to doc/source/drivers/vector/netcdf.rst diff --git a/gdal/doc/source/drivers/vector/ngw.rst b/doc/source/drivers/vector/ngw.rst similarity index 100% rename from gdal/doc/source/drivers/vector/ngw.rst rename to doc/source/drivers/vector/ngw.rst diff --git a/gdal/doc/source/drivers/vector/ntf.rst b/doc/source/drivers/vector/ntf.rst similarity index 100% rename from gdal/doc/source/drivers/vector/ntf.rst rename to doc/source/drivers/vector/ntf.rst diff --git a/gdal/doc/source/drivers/vector/oapif.rst b/doc/source/drivers/vector/oapif.rst similarity index 100% rename from gdal/doc/source/drivers/vector/oapif.rst rename to doc/source/drivers/vector/oapif.rst diff --git a/gdal/doc/source/drivers/vector/oci.rst b/doc/source/drivers/vector/oci.rst similarity index 100% rename from gdal/doc/source/drivers/vector/oci.rst rename to doc/source/drivers/vector/oci.rst diff --git a/gdal/doc/source/drivers/vector/oda.rst b/doc/source/drivers/vector/oda.rst similarity index 100% rename from gdal/doc/source/drivers/vector/oda.rst rename to doc/source/drivers/vector/oda.rst diff --git a/gdal/doc/source/drivers/vector/odbc.rst b/doc/source/drivers/vector/odbc.rst similarity index 100% rename from gdal/doc/source/drivers/vector/odbc.rst rename to doc/source/drivers/vector/odbc.rst diff --git a/gdal/doc/source/drivers/vector/ods.rst b/doc/source/drivers/vector/ods.rst similarity index 100% rename from gdal/doc/source/drivers/vector/ods.rst rename to doc/source/drivers/vector/ods.rst diff --git a/gdal/doc/source/drivers/vector/ogdi.rst b/doc/source/drivers/vector/ogdi.rst similarity index 100% rename from gdal/doc/source/drivers/vector/ogdi.rst rename to doc/source/drivers/vector/ogdi.rst diff --git a/gdal/doc/source/drivers/vector/openfilegdb.rst b/doc/source/drivers/vector/openfilegdb.rst similarity index 100% rename from gdal/doc/source/drivers/vector/openfilegdb.rst rename to doc/source/drivers/vector/openfilegdb.rst diff --git a/gdal/doc/source/drivers/vector/osm.rst b/doc/source/drivers/vector/osm.rst similarity index 100% rename from gdal/doc/source/drivers/vector/osm.rst rename to doc/source/drivers/vector/osm.rst diff --git a/gdal/doc/source/drivers/vector/pdf.rst b/doc/source/drivers/vector/pdf.rst similarity index 100% rename from gdal/doc/source/drivers/vector/pdf.rst rename to doc/source/drivers/vector/pdf.rst diff --git a/gdal/doc/source/drivers/vector/pds.rst b/doc/source/drivers/vector/pds.rst similarity index 100% rename from gdal/doc/source/drivers/vector/pds.rst rename to doc/source/drivers/vector/pds.rst diff --git a/gdal/doc/source/drivers/vector/pg.rst b/doc/source/drivers/vector/pg.rst similarity index 100% rename from gdal/doc/source/drivers/vector/pg.rst rename to doc/source/drivers/vector/pg.rst diff --git a/gdal/doc/source/drivers/vector/pg_advanced.rst b/doc/source/drivers/vector/pg_advanced.rst similarity index 100% rename from gdal/doc/source/drivers/vector/pg_advanced.rst rename to doc/source/drivers/vector/pg_advanced.rst diff --git a/gdal/doc/source/drivers/vector/pgdump.rst b/doc/source/drivers/vector/pgdump.rst similarity index 100% rename from gdal/doc/source/drivers/vector/pgdump.rst rename to doc/source/drivers/vector/pgdump.rst diff --git a/gdal/doc/source/drivers/vector/pgeo.rst b/doc/source/drivers/vector/pgeo.rst similarity index 100% rename from gdal/doc/source/drivers/vector/pgeo.rst rename to doc/source/drivers/vector/pgeo.rst diff --git a/gdal/doc/source/drivers/vector/plscenes.rst b/doc/source/drivers/vector/plscenes.rst similarity index 100% rename from gdal/doc/source/drivers/vector/plscenes.rst rename to doc/source/drivers/vector/plscenes.rst diff --git a/gdal/doc/source/drivers/vector/plscenes_data_v1.rst b/doc/source/drivers/vector/plscenes_data_v1.rst similarity index 100% rename from gdal/doc/source/drivers/vector/plscenes_data_v1.rst rename to doc/source/drivers/vector/plscenes_data_v1.rst diff --git a/gdal/doc/source/drivers/vector/s57.rst b/doc/source/drivers/vector/s57.rst similarity index 100% rename from gdal/doc/source/drivers/vector/s57.rst rename to doc/source/drivers/vector/s57.rst diff --git a/gdal/doc/source/drivers/vector/sdts.rst b/doc/source/drivers/vector/sdts.rst similarity index 100% rename from gdal/doc/source/drivers/vector/sdts.rst rename to doc/source/drivers/vector/sdts.rst diff --git a/gdal/doc/source/drivers/vector/selafin.rst b/doc/source/drivers/vector/selafin.rst similarity index 100% rename from gdal/doc/source/drivers/vector/selafin.rst rename to doc/source/drivers/vector/selafin.rst diff --git a/gdal/doc/source/drivers/vector/shapefile.rst b/doc/source/drivers/vector/shapefile.rst similarity index 100% rename from gdal/doc/source/drivers/vector/shapefile.rst rename to doc/source/drivers/vector/shapefile.rst diff --git a/gdal/doc/source/drivers/vector/sosi.rst b/doc/source/drivers/vector/sosi.rst similarity index 100% rename from gdal/doc/source/drivers/vector/sosi.rst rename to doc/source/drivers/vector/sosi.rst diff --git a/gdal/doc/source/drivers/vector/sqlite.rst b/doc/source/drivers/vector/sqlite.rst similarity index 100% rename from gdal/doc/source/drivers/vector/sqlite.rst rename to doc/source/drivers/vector/sqlite.rst diff --git a/gdal/doc/source/drivers/vector/svg.rst b/doc/source/drivers/vector/svg.rst similarity index 100% rename from gdal/doc/source/drivers/vector/svg.rst rename to doc/source/drivers/vector/svg.rst diff --git a/gdal/doc/source/drivers/vector/sxf.rst b/doc/source/drivers/vector/sxf.rst similarity index 100% rename from gdal/doc/source/drivers/vector/sxf.rst rename to doc/source/drivers/vector/sxf.rst diff --git a/gdal/doc/source/drivers/vector/tiger.rst b/doc/source/drivers/vector/tiger.rst similarity index 100% rename from gdal/doc/source/drivers/vector/tiger.rst rename to doc/source/drivers/vector/tiger.rst diff --git a/gdal/doc/source/drivers/vector/topojson.rst b/doc/source/drivers/vector/topojson.rst similarity index 100% rename from gdal/doc/source/drivers/vector/topojson.rst rename to doc/source/drivers/vector/topojson.rst diff --git a/gdal/doc/source/drivers/vector/vdv.rst b/doc/source/drivers/vector/vdv.rst similarity index 100% rename from gdal/doc/source/drivers/vector/vdv.rst rename to doc/source/drivers/vector/vdv.rst diff --git a/gdal/doc/source/drivers/vector/vfk.rst b/doc/source/drivers/vector/vfk.rst similarity index 100% rename from gdal/doc/source/drivers/vector/vfk.rst rename to doc/source/drivers/vector/vfk.rst diff --git a/gdal/doc/source/drivers/vector/vrt.rst b/doc/source/drivers/vector/vrt.rst similarity index 100% rename from gdal/doc/source/drivers/vector/vrt.rst rename to doc/source/drivers/vector/vrt.rst diff --git a/gdal/doc/source/drivers/vector/walk.rst b/doc/source/drivers/vector/walk.rst similarity index 100% rename from gdal/doc/source/drivers/vector/walk.rst rename to doc/source/drivers/vector/walk.rst diff --git a/gdal/doc/source/drivers/vector/wasp.rst b/doc/source/drivers/vector/wasp.rst similarity index 100% rename from gdal/doc/source/drivers/vector/wasp.rst rename to doc/source/drivers/vector/wasp.rst diff --git a/gdal/doc/source/drivers/vector/wfs.rst b/doc/source/drivers/vector/wfs.rst similarity index 100% rename from gdal/doc/source/drivers/vector/wfs.rst rename to doc/source/drivers/vector/wfs.rst diff --git a/gdal/doc/source/drivers/vector/xls.rst b/doc/source/drivers/vector/xls.rst similarity index 100% rename from gdal/doc/source/drivers/vector/xls.rst rename to doc/source/drivers/vector/xls.rst diff --git a/gdal/doc/source/drivers/vector/xlsx.rst b/doc/source/drivers/vector/xlsx.rst similarity index 100% rename from gdal/doc/source/drivers/vector/xlsx.rst rename to doc/source/drivers/vector/xlsx.rst diff --git a/gdal/doc/source/faq.rst b/doc/source/faq.rst similarity index 100% rename from gdal/doc/source/faq.rst rename to doc/source/faq.rst diff --git a/gdal/doc/source/gdal_rtd/LICENSE b/doc/source/gdal_rtd/LICENSE similarity index 100% rename from gdal/doc/source/gdal_rtd/LICENSE rename to doc/source/gdal_rtd/LICENSE diff --git a/gdal/doc/source/gdal_rtd/README.md b/doc/source/gdal_rtd/README.md similarity index 100% rename from gdal/doc/source/gdal_rtd/README.md rename to doc/source/gdal_rtd/README.md diff --git a/gdal/doc/source/gdal_rtd/breadcrumbs.html b/doc/source/gdal_rtd/breadcrumbs.html similarity index 100% rename from gdal/doc/source/gdal_rtd/breadcrumbs.html rename to doc/source/gdal_rtd/breadcrumbs.html diff --git a/gdal/doc/source/gdal_rtd/footer.html b/doc/source/gdal_rtd/footer.html similarity index 100% rename from gdal/doc/source/gdal_rtd/footer.html rename to doc/source/gdal_rtd/footer.html diff --git a/gdal/doc/source/gdal_rtd/searchbox.html b/doc/source/gdal_rtd/searchbox.html similarity index 100% rename from gdal/doc/source/gdal_rtd/searchbox.html rename to doc/source/gdal_rtd/searchbox.html diff --git a/gdal/doc/source/gdal_rtd/static/css/gdal.css b/doc/source/gdal_rtd/static/css/gdal.css similarity index 100% rename from gdal/doc/source/gdal_rtd/static/css/gdal.css rename to doc/source/gdal_rtd/static/css/gdal.css diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.eot b/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.eot similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.eot rename to doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.eot diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.svg b/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.svg similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.svg rename to doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.svg diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.ttf b/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.ttf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.ttf rename to doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.ttf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.woff b/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.woff similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.woff rename to doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.woff diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.woff2 b/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.woff2 similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.woff2 rename to doc/source/gdal_rtd/static/fonts/miriamlibre-bold-webfont.woff2 diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.eot b/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.eot similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.eot rename to doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.eot diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.svg b/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.svg similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.svg rename to doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.svg diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.ttf b/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.ttf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.ttf rename to doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.ttf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.woff b/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.woff similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.woff rename to doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.woff diff --git a/gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.woff2 b/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.woff2 similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.woff2 rename to doc/source/gdal_rtd/static/fonts/miriamlibre-regular-webfont.woff2 diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.eot b/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.eot similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.eot rename to doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.eot diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.otf b/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.otf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.otf rename to doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.otf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.svg b/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.svg similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.svg rename to doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.svg diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.ttf b/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.ttf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.ttf rename to doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.ttf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.woff b/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.woff similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.woff rename to doc/source/gdal_rtd/static/fonts/proximanova-light-webfont.woff diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.eot b/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.eot similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.eot rename to doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.eot diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.otf b/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.otf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.otf rename to doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.otf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.svg b/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.svg similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.svg rename to doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.svg diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.ttf b/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.ttf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.ttf rename to doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.ttf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.woff b/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.woff similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.woff rename to doc/source/gdal_rtd/static/fonts/proximanova-sbold-webfont.woff diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.eot b/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.eot similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.eot rename to doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.eot diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.svg b/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.svg similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.svg rename to doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.svg diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.ttf b/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.ttf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.ttf rename to doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.ttf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.woff b/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.woff similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.woff rename to doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.woff diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.woff2 b/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.woff2 similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.woff2 rename to doc/source/gdal_rtd/static/fonts/sintony-bold-webfont.woff2 diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.eot b/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.eot similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.eot rename to doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.eot diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.svg b/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.svg similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.svg rename to doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.svg diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.ttf b/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.ttf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.ttf rename to doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.ttf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.woff b/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.woff similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.woff rename to doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.woff diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.woff2 b/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.woff2 similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.woff2 rename to doc/source/gdal_rtd/static/fonts/sintony-regular-webfont.woff2 diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.eot b/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.eot similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.eot rename to doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.eot diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.svg b/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.svg similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.svg rename to doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.svg diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.ttf b/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.ttf similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.ttf rename to doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.ttf diff --git a/gdal/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.woff b/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.woff similarity index 100% rename from gdal/doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.woff rename to doc/source/gdal_rtd/static/fonts/sourcecodepro-regular-webfont.woff diff --git a/gdal/doc/source/gdal_rtd/static/img/osgeo-emblem-24x24.png b/doc/source/gdal_rtd/static/img/osgeo-emblem-24x24.png similarity index 100% rename from gdal/doc/source/gdal_rtd/static/img/osgeo-emblem-24x24.png rename to doc/source/gdal_rtd/static/img/osgeo-emblem-24x24.png diff --git a/gdal/doc/source/gdal_rtd/theme.conf b/doc/source/gdal_rtd/theme.conf similarity index 100% rename from gdal/doc/source/gdal_rtd/theme.conf rename to doc/source/gdal_rtd/theme.conf diff --git a/gdal/doc/source/gdal_rtd/versions.html b/doc/source/gdal_rtd/versions.html similarity index 100% rename from gdal/doc/source/gdal_rtd/versions.html rename to doc/source/gdal_rtd/versions.html diff --git a/gdal/doc/source/index.rst b/doc/source/index.rst similarity index 100% rename from gdal/doc/source/index.rst rename to doc/source/index.rst diff --git a/gdal/doc/source/index_pdf.rst b/doc/source/index_pdf.rst similarity index 100% rename from gdal/doc/source/index_pdf.rst rename to doc/source/index_pdf.rst diff --git a/gdal/doc/source/license.rst b/doc/source/license.rst similarity index 100% rename from gdal/doc/source/license.rst rename to doc/source/license.rst diff --git a/gdal/doc/source/programs/gdal-config.rst b/doc/source/programs/gdal-config.rst similarity index 100% rename from gdal/doc/source/programs/gdal-config.rst rename to doc/source/programs/gdal-config.rst diff --git a/gdal/doc/source/programs/gdal2tiles.rst b/doc/source/programs/gdal2tiles.rst similarity index 100% rename from gdal/doc/source/programs/gdal2tiles.rst rename to doc/source/programs/gdal2tiles.rst diff --git a/gdal/doc/source/programs/gdal2xyz.rst b/doc/source/programs/gdal2xyz.rst similarity index 100% rename from gdal/doc/source/programs/gdal2xyz.rst rename to doc/source/programs/gdal2xyz.rst diff --git a/gdal/doc/source/programs/gdal_calc.rst b/doc/source/programs/gdal_calc.rst similarity index 100% rename from gdal/doc/source/programs/gdal_calc.rst rename to doc/source/programs/gdal_calc.rst diff --git a/gdal/doc/source/programs/gdal_contour.rst b/doc/source/programs/gdal_contour.rst similarity index 100% rename from gdal/doc/source/programs/gdal_contour.rst rename to doc/source/programs/gdal_contour.rst diff --git a/gdal/doc/source/programs/gdal_create.rst b/doc/source/programs/gdal_create.rst similarity index 100% rename from gdal/doc/source/programs/gdal_create.rst rename to doc/source/programs/gdal_create.rst diff --git a/gdal/doc/source/programs/gdal_edit.rst b/doc/source/programs/gdal_edit.rst similarity index 100% rename from gdal/doc/source/programs/gdal_edit.rst rename to doc/source/programs/gdal_edit.rst diff --git a/gdal/doc/source/programs/gdal_fillnodata.rst b/doc/source/programs/gdal_fillnodata.rst similarity index 100% rename from gdal/doc/source/programs/gdal_fillnodata.rst rename to doc/source/programs/gdal_fillnodata.rst diff --git a/gdal/doc/source/programs/gdal_grid.rst b/doc/source/programs/gdal_grid.rst similarity index 100% rename from gdal/doc/source/programs/gdal_grid.rst rename to doc/source/programs/gdal_grid.rst diff --git a/gdal/doc/source/programs/gdal_merge.rst b/doc/source/programs/gdal_merge.rst similarity index 100% rename from gdal/doc/source/programs/gdal_merge.rst rename to doc/source/programs/gdal_merge.rst diff --git a/gdal/doc/source/programs/gdal_pansharpen.rst b/doc/source/programs/gdal_pansharpen.rst similarity index 100% rename from gdal/doc/source/programs/gdal_pansharpen.rst rename to doc/source/programs/gdal_pansharpen.rst diff --git a/gdal/doc/source/programs/gdal_polygonize.rst b/doc/source/programs/gdal_polygonize.rst similarity index 100% rename from gdal/doc/source/programs/gdal_polygonize.rst rename to doc/source/programs/gdal_polygonize.rst diff --git a/gdal/doc/source/programs/gdal_proximity.rst b/doc/source/programs/gdal_proximity.rst similarity index 100% rename from gdal/doc/source/programs/gdal_proximity.rst rename to doc/source/programs/gdal_proximity.rst diff --git a/gdal/doc/source/programs/gdal_rasterize.rst b/doc/source/programs/gdal_rasterize.rst similarity index 100% rename from gdal/doc/source/programs/gdal_rasterize.rst rename to doc/source/programs/gdal_rasterize.rst diff --git a/gdal/doc/source/programs/gdal_retile.rst b/doc/source/programs/gdal_retile.rst similarity index 100% rename from gdal/doc/source/programs/gdal_retile.rst rename to doc/source/programs/gdal_retile.rst diff --git a/gdal/doc/source/programs/gdal_sieve.rst b/doc/source/programs/gdal_sieve.rst similarity index 100% rename from gdal/doc/source/programs/gdal_sieve.rst rename to doc/source/programs/gdal_sieve.rst diff --git a/gdal/doc/source/programs/gdal_translate.rst b/doc/source/programs/gdal_translate.rst similarity index 100% rename from gdal/doc/source/programs/gdal_translate.rst rename to doc/source/programs/gdal_translate.rst diff --git a/gdal/doc/source/programs/gdal_viewshed.rst b/doc/source/programs/gdal_viewshed.rst similarity index 100% rename from gdal/doc/source/programs/gdal_viewshed.rst rename to doc/source/programs/gdal_viewshed.rst diff --git a/gdal/doc/source/programs/gdaladdo.rst b/doc/source/programs/gdaladdo.rst similarity index 100% rename from gdal/doc/source/programs/gdaladdo.rst rename to doc/source/programs/gdaladdo.rst diff --git a/gdal/doc/source/programs/gdalattachpct.rst b/doc/source/programs/gdalattachpct.rst similarity index 100% rename from gdal/doc/source/programs/gdalattachpct.rst rename to doc/source/programs/gdalattachpct.rst diff --git a/gdal/doc/source/programs/gdalbuildvrt.rst b/doc/source/programs/gdalbuildvrt.rst similarity index 100% rename from gdal/doc/source/programs/gdalbuildvrt.rst rename to doc/source/programs/gdalbuildvrt.rst diff --git a/gdal/doc/source/programs/gdalcompare.rst b/doc/source/programs/gdalcompare.rst similarity index 100% rename from gdal/doc/source/programs/gdalcompare.rst rename to doc/source/programs/gdalcompare.rst diff --git a/gdal/doc/source/programs/gdaldem.rst b/doc/source/programs/gdaldem.rst similarity index 100% rename from gdal/doc/source/programs/gdaldem.rst rename to doc/source/programs/gdaldem.rst diff --git a/gdal/doc/source/programs/gdalinfo.rst b/doc/source/programs/gdalinfo.rst similarity index 100% rename from gdal/doc/source/programs/gdalinfo.rst rename to doc/source/programs/gdalinfo.rst diff --git a/gdal/doc/source/programs/gdallocationinfo.rst b/doc/source/programs/gdallocationinfo.rst similarity index 100% rename from gdal/doc/source/programs/gdallocationinfo.rst rename to doc/source/programs/gdallocationinfo.rst diff --git a/gdal/doc/source/programs/gdalmanage.rst b/doc/source/programs/gdalmanage.rst similarity index 100% rename from gdal/doc/source/programs/gdalmanage.rst rename to doc/source/programs/gdalmanage.rst diff --git a/gdal/doc/source/programs/gdalmdiminfo.rst b/doc/source/programs/gdalmdiminfo.rst similarity index 100% rename from gdal/doc/source/programs/gdalmdiminfo.rst rename to doc/source/programs/gdalmdiminfo.rst diff --git a/gdal/doc/source/programs/gdalmdimtranslate.rst b/doc/source/programs/gdalmdimtranslate.rst similarity index 100% rename from gdal/doc/source/programs/gdalmdimtranslate.rst rename to doc/source/programs/gdalmdimtranslate.rst diff --git a/gdal/doc/source/programs/gdalmove.rst b/doc/source/programs/gdalmove.rst similarity index 100% rename from gdal/doc/source/programs/gdalmove.rst rename to doc/source/programs/gdalmove.rst diff --git a/gdal/doc/source/programs/gdalsrsinfo.rst b/doc/source/programs/gdalsrsinfo.rst similarity index 100% rename from gdal/doc/source/programs/gdalsrsinfo.rst rename to doc/source/programs/gdalsrsinfo.rst diff --git a/gdal/doc/source/programs/gdaltindex.rst b/doc/source/programs/gdaltindex.rst similarity index 100% rename from gdal/doc/source/programs/gdaltindex.rst rename to doc/source/programs/gdaltindex.rst diff --git a/gdal/doc/source/programs/gdaltransform.rst b/doc/source/programs/gdaltransform.rst similarity index 100% rename from gdal/doc/source/programs/gdaltransform.rst rename to doc/source/programs/gdaltransform.rst diff --git a/gdal/doc/source/programs/gdalwarp.rst b/doc/source/programs/gdalwarp.rst similarity index 100% rename from gdal/doc/source/programs/gdalwarp.rst rename to doc/source/programs/gdalwarp.rst diff --git a/gdal/doc/source/programs/gnmanalyse.rst b/doc/source/programs/gnmanalyse.rst similarity index 100% rename from gdal/doc/source/programs/gnmanalyse.rst rename to doc/source/programs/gnmanalyse.rst diff --git a/gdal/doc/source/programs/gnmmanage.rst b/doc/source/programs/gnmmanage.rst similarity index 100% rename from gdal/doc/source/programs/gnmmanage.rst rename to doc/source/programs/gnmmanage.rst diff --git a/gdal/doc/source/programs/index.rst b/doc/source/programs/index.rst similarity index 100% rename from gdal/doc/source/programs/index.rst rename to doc/source/programs/index.rst diff --git a/gdal/doc/source/programs/nearblack.rst b/doc/source/programs/nearblack.rst similarity index 100% rename from gdal/doc/source/programs/nearblack.rst rename to doc/source/programs/nearblack.rst diff --git a/gdal/doc/source/programs/ogr2ogr.rst b/doc/source/programs/ogr2ogr.rst similarity index 100% rename from gdal/doc/source/programs/ogr2ogr.rst rename to doc/source/programs/ogr2ogr.rst diff --git a/gdal/doc/source/programs/ogrinfo.rst b/doc/source/programs/ogrinfo.rst similarity index 100% rename from gdal/doc/source/programs/ogrinfo.rst rename to doc/source/programs/ogrinfo.rst diff --git a/gdal/doc/source/programs/ogrlineref.rst b/doc/source/programs/ogrlineref.rst similarity index 100% rename from gdal/doc/source/programs/ogrlineref.rst rename to doc/source/programs/ogrlineref.rst diff --git a/gdal/doc/source/programs/ogrmerge.rst b/doc/source/programs/ogrmerge.rst similarity index 100% rename from gdal/doc/source/programs/ogrmerge.rst rename to doc/source/programs/ogrmerge.rst diff --git a/gdal/doc/source/programs/ogrtindex.rst b/doc/source/programs/ogrtindex.rst similarity index 100% rename from gdal/doc/source/programs/ogrtindex.rst rename to doc/source/programs/ogrtindex.rst diff --git a/gdal/doc/source/programs/options/co.rst b/doc/source/programs/options/co.rst similarity index 100% rename from gdal/doc/source/programs/options/co.rst rename to doc/source/programs/options/co.rst diff --git a/gdal/doc/source/programs/options/if.rst b/doc/source/programs/options/if.rst similarity index 100% rename from gdal/doc/source/programs/options/if.rst rename to doc/source/programs/options/if.rst diff --git a/gdal/doc/source/programs/options/of.rst b/doc/source/programs/options/of.rst similarity index 100% rename from gdal/doc/source/programs/options/of.rst rename to doc/source/programs/options/of.rst diff --git a/gdal/doc/source/programs/options/ot.rst b/doc/source/programs/options/ot.rst similarity index 100% rename from gdal/doc/source/programs/options/ot.rst rename to doc/source/programs/options/ot.rst diff --git a/gdal/doc/source/programs/options/srs_def.rst b/doc/source/programs/options/srs_def.rst similarity index 100% rename from gdal/doc/source/programs/options/srs_def.rst rename to doc/source/programs/options/srs_def.rst diff --git a/gdal/doc/source/programs/options/srs_def_gdalwarp.rst b/doc/source/programs/options/srs_def_gdalwarp.rst similarity index 100% rename from gdal/doc/source/programs/options/srs_def_gdalwarp.rst rename to doc/source/programs/options/srs_def_gdalwarp.rst diff --git a/gdal/doc/source/programs/pct2rgb.rst b/doc/source/programs/pct2rgb.rst similarity index 100% rename from gdal/doc/source/programs/pct2rgb.rst rename to doc/source/programs/pct2rgb.rst diff --git a/gdal/doc/source/programs/raster_common_options.rst b/doc/source/programs/raster_common_options.rst similarity index 100% rename from gdal/doc/source/programs/raster_common_options.rst rename to doc/source/programs/raster_common_options.rst diff --git a/gdal/doc/source/programs/rgb2pct.rst b/doc/source/programs/rgb2pct.rst similarity index 100% rename from gdal/doc/source/programs/rgb2pct.rst rename to doc/source/programs/rgb2pct.rst diff --git a/gdal/doc/source/programs/vector_common_options.rst b/doc/source/programs/vector_common_options.rst similarity index 100% rename from gdal/doc/source/programs/vector_common_options.rst rename to doc/source/programs/vector_common_options.rst diff --git a/gdal/doc/source/software_using_gdal.rst b/doc/source/software_using_gdal.rst similarity index 100% rename from gdal/doc/source/software_using_gdal.rst rename to doc/source/software_using_gdal.rst diff --git a/gdal/doc/source/sponsors/Sustainable GDAL Sponsorship Prospectus.pdf b/doc/source/sponsors/Sustainable GDAL Sponsorship Prospectus.pdf similarity index 100% rename from gdal/doc/source/sponsors/Sustainable GDAL Sponsorship Prospectus.pdf rename to doc/source/sponsors/Sustainable GDAL Sponsorship Prospectus.pdf diff --git a/gdal/doc/source/sponsors/faq.rst b/doc/source/sponsors/faq.rst similarity index 100% rename from gdal/doc/source/sponsors/faq.rst rename to doc/source/sponsors/faq.rst diff --git a/gdal/doc/source/sponsors/index.rst b/doc/source/sponsors/index.rst similarity index 100% rename from gdal/doc/source/sponsors/index.rst rename to doc/source/sponsors/index.rst diff --git a/gdal/doc/source/substitutions.rst b/doc/source/substitutions.rst similarity index 100% rename from gdal/doc/source/substitutions.rst rename to doc/source/substitutions.rst diff --git a/gdal/doc/source/tutorials/gdal_grid_tut.rst b/doc/source/tutorials/gdal_grid_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/gdal_grid_tut.rst rename to doc/source/tutorials/gdal_grid_tut.rst diff --git a/gdal/doc/source/tutorials/geotransforms_tut.rst b/doc/source/tutorials/geotransforms_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/geotransforms_tut.rst rename to doc/source/tutorials/geotransforms_tut.rst diff --git a/gdal/doc/source/tutorials/gnm_api_tut.rst b/doc/source/tutorials/gnm_api_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/gnm_api_tut.rst rename to doc/source/tutorials/gnm_api_tut.rst diff --git a/gdal/doc/source/tutorials/index.rst b/doc/source/tutorials/index.rst similarity index 100% rename from gdal/doc/source/tutorials/index.rst rename to doc/source/tutorials/index.rst diff --git a/gdal/doc/source/tutorials/multidimensional_api_tut.rst b/doc/source/tutorials/multidimensional_api_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/multidimensional_api_tut.rst rename to doc/source/tutorials/multidimensional_api_tut.rst diff --git a/gdal/doc/source/tutorials/osr_api_tut.rst b/doc/source/tutorials/osr_api_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/osr_api_tut.rst rename to doc/source/tutorials/osr_api_tut.rst diff --git a/gdal/doc/source/tutorials/raster_api_tut.rst b/doc/source/tutorials/raster_api_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/raster_api_tut.rst rename to doc/source/tutorials/raster_api_tut.rst diff --git a/gdal/doc/source/tutorials/raster_driver_tut.rst b/doc/source/tutorials/raster_driver_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/raster_driver_tut.rst rename to doc/source/tutorials/raster_driver_tut.rst diff --git a/gdal/doc/source/tutorials/vector_api_tut.rst b/doc/source/tutorials/vector_api_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/vector_api_tut.rst rename to doc/source/tutorials/vector_api_tut.rst diff --git a/gdal/doc/source/tutorials/vector_driver_tut.rst b/doc/source/tutorials/vector_driver_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/vector_driver_tut.rst rename to doc/source/tutorials/vector_driver_tut.rst diff --git a/gdal/doc/source/tutorials/vector_python_driver.rst b/doc/source/tutorials/vector_python_driver.rst similarity index 100% rename from gdal/doc/source/tutorials/vector_python_driver.rst rename to doc/source/tutorials/vector_python_driver.rst diff --git a/gdal/doc/source/tutorials/warp_tut.rst b/doc/source/tutorials/warp_tut.rst similarity index 100% rename from gdal/doc/source/tutorials/warp_tut.rst rename to doc/source/tutorials/warp_tut.rst diff --git a/gdal/doc/source/tutorials/wktproblems.rst b/doc/source/tutorials/wktproblems.rst similarity index 100% rename from gdal/doc/source/tutorials/wktproblems.rst rename to doc/source/tutorials/wktproblems.rst diff --git a/gdal/doc/source/user/configoptions.rst b/doc/source/user/configoptions.rst similarity index 100% rename from gdal/doc/source/user/configoptions.rst rename to doc/source/user/configoptions.rst diff --git a/gdal/doc/source/user/coordinate_epoch.rst b/doc/source/user/coordinate_epoch.rst similarity index 100% rename from gdal/doc/source/user/coordinate_epoch.rst rename to doc/source/user/coordinate_epoch.rst diff --git a/gdal/doc/source/user/gnm_data_model.rst b/doc/source/user/gnm_data_model.rst similarity index 100% rename from gdal/doc/source/user/gnm_data_model.rst rename to doc/source/user/gnm_data_model.rst diff --git a/gdal/doc/source/user/index.rst b/doc/source/user/index.rst similarity index 100% rename from gdal/doc/source/user/index.rst rename to doc/source/user/index.rst diff --git a/gdal/doc/source/user/multidim_raster_data_model.rst b/doc/source/user/multidim_raster_data_model.rst similarity index 100% rename from gdal/doc/source/user/multidim_raster_data_model.rst rename to doc/source/user/multidim_raster_data_model.rst diff --git a/gdal/doc/source/user/ogr_feature_style.rst b/doc/source/user/ogr_feature_style.rst similarity index 100% rename from gdal/doc/source/user/ogr_feature_style.rst rename to doc/source/user/ogr_feature_style.rst diff --git a/gdal/doc/source/user/ogr_sql_dialect.rst b/doc/source/user/ogr_sql_dialect.rst similarity index 100% rename from gdal/doc/source/user/ogr_sql_dialect.rst rename to doc/source/user/ogr_sql_dialect.rst diff --git a/gdal/doc/source/user/ogr_sql_sqlite_dialect.rst b/doc/source/user/ogr_sql_sqlite_dialect.rst similarity index 100% rename from gdal/doc/source/user/ogr_sql_sqlite_dialect.rst rename to doc/source/user/ogr_sql_sqlite_dialect.rst diff --git a/gdal/doc/source/user/raster_data_model.rst b/doc/source/user/raster_data_model.rst similarity index 100% rename from gdal/doc/source/user/raster_data_model.rst rename to doc/source/user/raster_data_model.rst diff --git a/gdal/doc/source/user/sql_sqlite_dialect.rst b/doc/source/user/sql_sqlite_dialect.rst similarity index 100% rename from gdal/doc/source/user/sql_sqlite_dialect.rst rename to doc/source/user/sql_sqlite_dialect.rst diff --git a/gdal/doc/source/user/vector_data_model.rst b/doc/source/user/vector_data_model.rst similarity index 100% rename from gdal/doc/source/user/vector_data_model.rst rename to doc/source/user/vector_data_model.rst diff --git a/gdal/doc/source/user/virtual_file_systems.rst b/doc/source/user/virtual_file_systems.rst similarity index 100% rename from gdal/doc/source/user/virtual_file_systems.rst rename to doc/source/user/virtual_file_systems.rst diff --git a/gdal/docker/README.md b/docker/README.md similarity index 100% rename from gdal/docker/README.md rename to docker/README.md diff --git a/gdal/docker/alpine-normal/Dockerfile b/docker/alpine-normal/Dockerfile similarity index 99% rename from gdal/docker/alpine-normal/Dockerfile rename to docker/alpine-normal/Dockerfile index 3e5e7cb54273..fd0c2157adca 100644 --- a/gdal/docker/alpine-normal/Dockerfile +++ b/docker/alpine-normal/Dockerfile @@ -272,7 +272,7 @@ RUN if test "${GDAL_VERSION}" = "master"; then \ && mkdir gdal \ && wget -q https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz -O - \ | tar xz -C gdal --strip-components=1 \ - && cd gdal/gdal \ + && cd gdal \ && if test "${RSYNC_REMOTE}" != ""; then \ echo "Downloading cache..."; \ rsync -ra ${RSYNC_REMOTE}/gdal/$(uname -m)/ $HOME/; \ @@ -309,7 +309,7 @@ RUN if test "${GDAL_VERSION}" = "master"; then \ unset CC; \ unset CXX; \ fi \ - && cd ../.. \ + && cd .. \ && rm -rf gdal \ && mkdir -p /build_gdal_python/usr/lib \ && mkdir -p /build_gdal_python/usr/bin \ diff --git a/gdal/docker/alpine-normal/build.sh b/docker/alpine-normal/build.sh similarity index 100% rename from gdal/docker/alpine-normal/build.sh rename to docker/alpine-normal/build.sh diff --git a/gdal/docker/alpine-small/Dockerfile b/docker/alpine-small/Dockerfile similarity index 99% rename from gdal/docker/alpine-small/Dockerfile rename to docker/alpine-small/Dockerfile index 38d12334f993..a626aa1fe49c 100644 --- a/gdal/docker/alpine-small/Dockerfile +++ b/docker/alpine-small/Dockerfile @@ -118,7 +118,7 @@ RUN if test "${GDAL_VERSION}" = "master"; then \ && mkdir gdal \ && wget -q https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz -O - \ | tar xz -C gdal --strip-components=1 \ - && cd gdal/gdal \ + && cd gdal \ && ./autogen.sh \ && ./configure --prefix=/usr --sysconfdir=/etc --without-libtool \ --with-hide-internal-symbols \ @@ -137,7 +137,7 @@ RUN if test "${GDAL_VERSION}" = "master"; then \ unset CC; \ unset CXX; \ fi \ - && cd ../.. \ + && cd .. \ && rm -rf gdal \ && mkdir -p /build_gdal_version_changing/usr/include \ && mv /build/usr/lib /build_gdal_version_changing/usr \ diff --git a/gdal/docker/alpine-small/build.sh b/docker/alpine-small/build.sh similarity index 100% rename from gdal/docker/alpine-small/build.sh rename to docker/alpine-small/build.sh diff --git a/gdal/docker/build-all.sh b/docker/build-all.sh similarity index 100% rename from gdal/docker/build-all.sh rename to docker/build-all.sh diff --git a/gdal/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile similarity index 100% rename from gdal/docker/ubuntu-full/Dockerfile rename to docker/ubuntu-full/Dockerfile diff --git a/gdal/docker/ubuntu-full/bh-gdal.sh b/docker/ubuntu-full/bh-gdal.sh similarity index 99% rename from gdal/docker/ubuntu-full/bh-gdal.sh rename to docker/ubuntu-full/bh-gdal.sh index 53eb6702ab07..ae76fbadca20 100755 --- a/gdal/docker/ubuntu-full/bh-gdal.sh +++ b/docker/ubuntu-full/bh-gdal.sh @@ -19,7 +19,7 @@ wget -q "https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz" \ ( - cd gdal/gdal + cd gdal ./autogen.sh diff --git a/gdal/docker/ubuntu-full/bh-proj.sh b/docker/ubuntu-full/bh-proj.sh similarity index 100% rename from gdal/docker/ubuntu-full/bh-proj.sh rename to docker/ubuntu-full/bh-proj.sh diff --git a/gdal/docker/ubuntu-full/bh-set-envvars.sh b/docker/ubuntu-full/bh-set-envvars.sh similarity index 100% rename from gdal/docker/ubuntu-full/bh-set-envvars.sh rename to docker/ubuntu-full/bh-set-envvars.sh diff --git a/gdal/docker/ubuntu-full/build.sh b/docker/ubuntu-full/build.sh similarity index 100% rename from gdal/docker/ubuntu-full/build.sh rename to docker/ubuntu-full/build.sh diff --git a/gdal/docker/ubuntu-full/mdbtools-lexer.patch b/docker/ubuntu-full/mdbtools-lexer.patch similarity index 100% rename from gdal/docker/ubuntu-full/mdbtools-lexer.patch rename to docker/ubuntu-full/mdbtools-lexer.patch diff --git a/gdal/docker/ubuntu-full/tiledb-5cad65f4c.patch b/docker/ubuntu-full/tiledb-5cad65f4c.patch similarity index 100% rename from gdal/docker/ubuntu-full/tiledb-5cad65f4c.patch rename to docker/ubuntu-full/tiledb-5cad65f4c.patch diff --git a/gdal/docker/ubuntu-small/Dockerfile b/docker/ubuntu-small/Dockerfile similarity index 99% rename from gdal/docker/ubuntu-small/Dockerfile rename to docker/ubuntu-small/Dockerfile index 2018519bc8ff..9dcd29f4b11d 100644 --- a/gdal/docker/ubuntu-small/Dockerfile +++ b/docker/ubuntu-small/Dockerfile @@ -150,7 +150,7 @@ RUN . /buildscripts/bh-set-envvars.sh \ && mkdir gdal \ && wget -q https://github.com/${GDAL_REPOSITORY}/archive/${GDAL_VERSION}.tar.gz -O - \ | tar xz -C gdal --strip-components=1 \ - && cd gdal/gdal \ + && cd gdal \ && ./autogen.sh \ && if test "${RSYNC_REMOTE}" != ""; then \ echo "Downloading cache..."; \ @@ -184,7 +184,7 @@ RUN . /buildscripts/bh-set-envvars.sh \ unset CC; \ unset CXX; \ fi \ - && cd ../.. \ + && cd .. \ && rm -rf gdal \ && mkdir -p /build_gdal_python/usr/lib \ && mkdir -p /build_gdal_python/usr/bin \ diff --git a/gdal/docker/ubuntu-small/bh-set-envvars.sh b/docker/ubuntu-small/bh-set-envvars.sh similarity index 100% rename from gdal/docker/ubuntu-small/bh-set-envvars.sh rename to docker/ubuntu-small/bh-set-envvars.sh diff --git a/gdal/docker/ubuntu-small/build.sh b/docker/ubuntu-small/build.sh similarity index 100% rename from gdal/docker/ubuntu-small/build.sh rename to docker/ubuntu-small/build.sh diff --git a/gdal/docker/util.sh b/docker/util.sh similarity index 100% rename from gdal/docker/util.sh rename to docker/util.sh diff --git a/gdal/doxygen_index.md b/doxygen_index.md similarity index 100% rename from gdal/doxygen_index.md rename to doxygen_index.md diff --git a/gdal/examples/pydrivers/ogr_CityJSON.py b/examples/pydrivers/ogr_CityJSON.py similarity index 100% rename from gdal/examples/pydrivers/ogr_CityJSON.py rename to examples/pydrivers/ogr_CityJSON.py diff --git a/gdal/examples/pydrivers/ogr_DUMMY.py b/examples/pydrivers/ogr_DUMMY.py similarity index 100% rename from gdal/examples/pydrivers/ogr_DUMMY.py rename to examples/pydrivers/ogr_DUMMY.py diff --git a/gdal/examples/pydrivers/ogr_PASSTHROUGH.py b/examples/pydrivers/ogr_PASSTHROUGH.py similarity index 100% rename from gdal/examples/pydrivers/ogr_PASSTHROUGH.py rename to examples/pydrivers/ogr_PASSTHROUGH.py diff --git a/gdal/frmts/CMakeLists.txt b/frmts/CMakeLists.txt similarity index 100% rename from gdal/frmts/CMakeLists.txt rename to frmts/CMakeLists.txt diff --git a/gdal/frmts/GNUmakefile b/frmts/GNUmakefile similarity index 100% rename from gdal/frmts/GNUmakefile rename to frmts/GNUmakefile diff --git a/gdal/frmts/aaigrid/CMakeLists.txt b/frmts/aaigrid/CMakeLists.txt similarity index 100% rename from gdal/frmts/aaigrid/CMakeLists.txt rename to frmts/aaigrid/CMakeLists.txt diff --git a/gdal/frmts/aaigrid/GNUmakefile b/frmts/aaigrid/GNUmakefile similarity index 100% rename from gdal/frmts/aaigrid/GNUmakefile rename to frmts/aaigrid/GNUmakefile diff --git a/gdal/frmts/aaigrid/aaigriddataset.cpp b/frmts/aaigrid/aaigriddataset.cpp similarity index 100% rename from gdal/frmts/aaigrid/aaigriddataset.cpp rename to frmts/aaigrid/aaigriddataset.cpp diff --git a/gdal/frmts/aaigrid/aaigriddataset.h b/frmts/aaigrid/aaigriddataset.h similarity index 100% rename from gdal/frmts/aaigrid/aaigriddataset.h rename to frmts/aaigrid/aaigriddataset.h diff --git a/gdal/frmts/aaigrid/makefile.vc b/frmts/aaigrid/makefile.vc similarity index 100% rename from gdal/frmts/aaigrid/makefile.vc rename to frmts/aaigrid/makefile.vc diff --git a/gdal/frmts/adrg/CMakeLists.txt b/frmts/adrg/CMakeLists.txt similarity index 100% rename from gdal/frmts/adrg/CMakeLists.txt rename to frmts/adrg/CMakeLists.txt diff --git a/gdal/frmts/adrg/GNUmakefile b/frmts/adrg/GNUmakefile similarity index 100% rename from gdal/frmts/adrg/GNUmakefile rename to frmts/adrg/GNUmakefile diff --git a/gdal/frmts/adrg/adrgdataset.cpp b/frmts/adrg/adrgdataset.cpp similarity index 100% rename from gdal/frmts/adrg/adrgdataset.cpp rename to frmts/adrg/adrgdataset.cpp diff --git a/gdal/frmts/adrg/makefile.vc b/frmts/adrg/makefile.vc similarity index 100% rename from gdal/frmts/adrg/makefile.vc rename to frmts/adrg/makefile.vc diff --git a/gdal/frmts/adrg/srpdataset.cpp b/frmts/adrg/srpdataset.cpp similarity index 100% rename from gdal/frmts/adrg/srpdataset.cpp rename to frmts/adrg/srpdataset.cpp diff --git a/gdal/frmts/aigrid/CMakeLists.txt b/frmts/aigrid/CMakeLists.txt similarity index 100% rename from gdal/frmts/aigrid/CMakeLists.txt rename to frmts/aigrid/CMakeLists.txt diff --git a/gdal/frmts/aigrid/GNUmakefile b/frmts/aigrid/GNUmakefile similarity index 100% rename from gdal/frmts/aigrid/GNUmakefile rename to frmts/aigrid/GNUmakefile diff --git a/gdal/frmts/aigrid/Makefile.dist b/frmts/aigrid/Makefile.dist similarity index 100% rename from gdal/frmts/aigrid/Makefile.dist rename to frmts/aigrid/Makefile.dist diff --git a/gdal/frmts/aigrid/aigccitt.c b/frmts/aigrid/aigccitt.c similarity index 100% rename from gdal/frmts/aigrid/aigccitt.c rename to frmts/aigrid/aigccitt.c diff --git a/gdal/frmts/aigrid/aigdataset.cpp b/frmts/aigrid/aigdataset.cpp similarity index 100% rename from gdal/frmts/aigrid/aigdataset.cpp rename to frmts/aigrid/aigdataset.cpp diff --git a/gdal/frmts/aigrid/aigopen.c b/frmts/aigrid/aigopen.c similarity index 100% rename from gdal/frmts/aigrid/aigopen.c rename to frmts/aigrid/aigopen.c diff --git a/gdal/frmts/aigrid/aigrid.h b/frmts/aigrid/aigrid.h similarity index 100% rename from gdal/frmts/aigrid/aigrid.h rename to frmts/aigrid/aigrid.h diff --git a/gdal/frmts/aigrid/aitest.c b/frmts/aigrid/aitest.c similarity index 100% rename from gdal/frmts/aigrid/aitest.c rename to frmts/aigrid/aitest.c diff --git a/gdal/frmts/aigrid/gridlib.c b/frmts/aigrid/gridlib.c similarity index 100% rename from gdal/frmts/aigrid/gridlib.c rename to frmts/aigrid/gridlib.c diff --git a/gdal/frmts/aigrid/makefile.vc b/frmts/aigrid/makefile.vc similarity index 100% rename from gdal/frmts/aigrid/makefile.vc rename to frmts/aigrid/makefile.vc diff --git a/gdal/frmts/airsar/CMakeLists.txt b/frmts/airsar/CMakeLists.txt similarity index 100% rename from gdal/frmts/airsar/CMakeLists.txt rename to frmts/airsar/CMakeLists.txt diff --git a/gdal/frmts/airsar/GNUmakefile b/frmts/airsar/GNUmakefile similarity index 100% rename from gdal/frmts/airsar/GNUmakefile rename to frmts/airsar/GNUmakefile diff --git a/gdal/frmts/airsar/airsardataset.cpp b/frmts/airsar/airsardataset.cpp similarity index 100% rename from gdal/frmts/airsar/airsardataset.cpp rename to frmts/airsar/airsardataset.cpp diff --git a/gdal/frmts/airsar/makefile.vc b/frmts/airsar/makefile.vc similarity index 100% rename from gdal/frmts/airsar/makefile.vc rename to frmts/airsar/makefile.vc diff --git a/gdal/frmts/arg/CMakeLists.txt b/frmts/arg/CMakeLists.txt similarity index 100% rename from gdal/frmts/arg/CMakeLists.txt rename to frmts/arg/CMakeLists.txt diff --git a/gdal/frmts/arg/GNUmakefile b/frmts/arg/GNUmakefile similarity index 100% rename from gdal/frmts/arg/GNUmakefile rename to frmts/arg/GNUmakefile diff --git a/gdal/frmts/arg/argdataset.cpp b/frmts/arg/argdataset.cpp similarity index 100% rename from gdal/frmts/arg/argdataset.cpp rename to frmts/arg/argdataset.cpp diff --git a/gdal/frmts/arg/makefile.vc b/frmts/arg/makefile.vc similarity index 100% rename from gdal/frmts/arg/makefile.vc rename to frmts/arg/makefile.vc diff --git a/gdal/frmts/blx/CMakeLists.txt b/frmts/blx/CMakeLists.txt similarity index 100% rename from gdal/frmts/blx/CMakeLists.txt rename to frmts/blx/CMakeLists.txt diff --git a/gdal/frmts/blx/GNUmakefile b/frmts/blx/GNUmakefile similarity index 100% rename from gdal/frmts/blx/GNUmakefile rename to frmts/blx/GNUmakefile diff --git a/gdal/frmts/blx/blx.c b/frmts/blx/blx.c similarity index 100% rename from gdal/frmts/blx/blx.c rename to frmts/blx/blx.c diff --git a/gdal/frmts/blx/blx.h b/frmts/blx/blx.h similarity index 100% rename from gdal/frmts/blx/blx.h rename to frmts/blx/blx.h diff --git a/gdal/frmts/blx/blxdataset.cpp b/frmts/blx/blxdataset.cpp similarity index 100% rename from gdal/frmts/blx/blxdataset.cpp rename to frmts/blx/blxdataset.cpp diff --git a/gdal/frmts/blx/makefile.vc b/frmts/blx/makefile.vc similarity index 100% rename from gdal/frmts/blx/makefile.vc rename to frmts/blx/makefile.vc diff --git a/gdal/frmts/bmp/CMakeLists.txt b/frmts/bmp/CMakeLists.txt similarity index 100% rename from gdal/frmts/bmp/CMakeLists.txt rename to frmts/bmp/CMakeLists.txt diff --git a/gdal/frmts/bmp/GNUmakefile b/frmts/bmp/GNUmakefile similarity index 100% rename from gdal/frmts/bmp/GNUmakefile rename to frmts/bmp/GNUmakefile diff --git a/gdal/frmts/bmp/bmpdataset.cpp b/frmts/bmp/bmpdataset.cpp similarity index 100% rename from gdal/frmts/bmp/bmpdataset.cpp rename to frmts/bmp/bmpdataset.cpp diff --git a/gdal/frmts/bmp/makefile.vc b/frmts/bmp/makefile.vc similarity index 100% rename from gdal/frmts/bmp/makefile.vc rename to frmts/bmp/makefile.vc diff --git a/gdal/frmts/bsb/CMakeLists.txt b/frmts/bsb/CMakeLists.txt similarity index 100% rename from gdal/frmts/bsb/CMakeLists.txt rename to frmts/bsb/CMakeLists.txt diff --git a/gdal/frmts/bsb/GNUmakefile b/frmts/bsb/GNUmakefile similarity index 100% rename from gdal/frmts/bsb/GNUmakefile rename to frmts/bsb/GNUmakefile diff --git a/gdal/frmts/bsb/Makefile.dist b/frmts/bsb/Makefile.dist similarity index 100% rename from gdal/frmts/bsb/Makefile.dist rename to frmts/bsb/Makefile.dist diff --git a/gdal/frmts/bsb/README.dist b/frmts/bsb/README.dist similarity index 100% rename from gdal/frmts/bsb/README.dist rename to frmts/bsb/README.dist diff --git a/gdal/frmts/bsb/bsb2raw.c b/frmts/bsb/bsb2raw.c similarity index 100% rename from gdal/frmts/bsb/bsb2raw.c rename to frmts/bsb/bsb2raw.c diff --git a/gdal/frmts/bsb/bsb_read.c b/frmts/bsb/bsb_read.c similarity index 100% rename from gdal/frmts/bsb/bsb_read.c rename to frmts/bsb/bsb_read.c diff --git a/gdal/frmts/bsb/bsb_read.h b/frmts/bsb/bsb_read.h similarity index 100% rename from gdal/frmts/bsb/bsb_read.h rename to frmts/bsb/bsb_read.h diff --git a/gdal/frmts/bsb/bsbdataset.cpp b/frmts/bsb/bsbdataset.cpp similarity index 100% rename from gdal/frmts/bsb/bsbdataset.cpp rename to frmts/bsb/bsbdataset.cpp diff --git a/gdal/frmts/bsb/makefile.vc b/frmts/bsb/makefile.vc similarity index 100% rename from gdal/frmts/bsb/makefile.vc rename to frmts/bsb/makefile.vc diff --git a/gdal/frmts/cals/CMakeLists.txt b/frmts/cals/CMakeLists.txt similarity index 100% rename from gdal/frmts/cals/CMakeLists.txt rename to frmts/cals/CMakeLists.txt diff --git a/gdal/frmts/cals/GNUmakefile b/frmts/cals/GNUmakefile similarity index 100% rename from gdal/frmts/cals/GNUmakefile rename to frmts/cals/GNUmakefile diff --git a/gdal/frmts/cals/calsdataset.cpp b/frmts/cals/calsdataset.cpp similarity index 100% rename from gdal/frmts/cals/calsdataset.cpp rename to frmts/cals/calsdataset.cpp diff --git a/gdal/frmts/cals/makefile.vc b/frmts/cals/makefile.vc similarity index 100% rename from gdal/frmts/cals/makefile.vc rename to frmts/cals/makefile.vc diff --git a/gdal/frmts/ceos/CMakeLists.txt b/frmts/ceos/CMakeLists.txt similarity index 100% rename from gdal/frmts/ceos/CMakeLists.txt rename to frmts/ceos/CMakeLists.txt diff --git a/gdal/frmts/ceos/GNUmakefile b/frmts/ceos/GNUmakefile similarity index 100% rename from gdal/frmts/ceos/GNUmakefile rename to frmts/ceos/GNUmakefile diff --git a/gdal/frmts/ceos/ceosdataset.cpp b/frmts/ceos/ceosdataset.cpp similarity index 100% rename from gdal/frmts/ceos/ceosdataset.cpp rename to frmts/ceos/ceosdataset.cpp diff --git a/gdal/frmts/ceos/ceosopen.c b/frmts/ceos/ceosopen.c similarity index 100% rename from gdal/frmts/ceos/ceosopen.c rename to frmts/ceos/ceosopen.c diff --git a/gdal/frmts/ceos/ceosopen.h b/frmts/ceos/ceosopen.h similarity index 100% rename from gdal/frmts/ceos/ceosopen.h rename to frmts/ceos/ceosopen.h diff --git a/gdal/frmts/ceos/ceostest.c b/frmts/ceos/ceostest.c similarity index 100% rename from gdal/frmts/ceos/ceostest.c rename to frmts/ceos/ceostest.c diff --git a/gdal/frmts/ceos/makefile.vc b/frmts/ceos/makefile.vc similarity index 100% rename from gdal/frmts/ceos/makefile.vc rename to frmts/ceos/makefile.vc diff --git a/gdal/frmts/ceos2/CMakeLists.txt b/frmts/ceos2/CMakeLists.txt similarity index 100% rename from gdal/frmts/ceos2/CMakeLists.txt rename to frmts/ceos2/CMakeLists.txt diff --git a/gdal/frmts/ceos2/GNUmakefile b/frmts/ceos2/GNUmakefile similarity index 100% rename from gdal/frmts/ceos2/GNUmakefile rename to frmts/ceos2/GNUmakefile diff --git a/gdal/frmts/ceos2/ceos.c b/frmts/ceos2/ceos.c similarity index 100% rename from gdal/frmts/ceos2/ceos.c rename to frmts/ceos2/ceos.c diff --git a/gdal/frmts/ceos2/ceos.h b/frmts/ceos2/ceos.h similarity index 100% rename from gdal/frmts/ceos2/ceos.h rename to frmts/ceos2/ceos.h diff --git a/gdal/frmts/ceos2/ceosrecipe.c b/frmts/ceos2/ceosrecipe.c similarity index 100% rename from gdal/frmts/ceos2/ceosrecipe.c rename to frmts/ceos2/ceosrecipe.c diff --git a/gdal/frmts/ceos2/ceossar.c b/frmts/ceos2/ceossar.c similarity index 100% rename from gdal/frmts/ceos2/ceossar.c rename to frmts/ceos2/ceossar.c diff --git a/gdal/frmts/ceos2/link.c b/frmts/ceos2/link.c similarity index 100% rename from gdal/frmts/ceos2/link.c rename to frmts/ceos2/link.c diff --git a/gdal/frmts/ceos2/makefile.vc b/frmts/ceos2/makefile.vc similarity index 100% rename from gdal/frmts/ceos2/makefile.vc rename to frmts/ceos2/makefile.vc diff --git a/gdal/frmts/ceos2/sar_ceosdataset.cpp b/frmts/ceos2/sar_ceosdataset.cpp similarity index 100% rename from gdal/frmts/ceos2/sar_ceosdataset.cpp rename to frmts/ceos2/sar_ceosdataset.cpp diff --git a/gdal/frmts/coasp/CMakeLists.txt b/frmts/coasp/CMakeLists.txt similarity index 100% rename from gdal/frmts/coasp/CMakeLists.txt rename to frmts/coasp/CMakeLists.txt diff --git a/gdal/frmts/coasp/GNUmakefile b/frmts/coasp/GNUmakefile similarity index 100% rename from gdal/frmts/coasp/GNUmakefile rename to frmts/coasp/GNUmakefile diff --git a/gdal/frmts/coasp/coasp_dataset.cpp b/frmts/coasp/coasp_dataset.cpp similarity index 100% rename from gdal/frmts/coasp/coasp_dataset.cpp rename to frmts/coasp/coasp_dataset.cpp diff --git a/gdal/frmts/coasp/makefile.vc b/frmts/coasp/makefile.vc similarity index 100% rename from gdal/frmts/coasp/makefile.vc rename to frmts/coasp/makefile.vc diff --git a/gdal/frmts/cosar/CMakeLists.txt b/frmts/cosar/CMakeLists.txt similarity index 100% rename from gdal/frmts/cosar/CMakeLists.txt rename to frmts/cosar/CMakeLists.txt diff --git a/gdal/frmts/cosar/GNUmakefile b/frmts/cosar/GNUmakefile similarity index 100% rename from gdal/frmts/cosar/GNUmakefile rename to frmts/cosar/GNUmakefile diff --git a/gdal/frmts/cosar/cosar_dataset.cpp b/frmts/cosar/cosar_dataset.cpp similarity index 100% rename from gdal/frmts/cosar/cosar_dataset.cpp rename to frmts/cosar/cosar_dataset.cpp diff --git a/gdal/frmts/cosar/makefile.vc b/frmts/cosar/makefile.vc similarity index 100% rename from gdal/frmts/cosar/makefile.vc rename to frmts/cosar/makefile.vc diff --git a/gdal/frmts/ctg/CMakeLists.txt b/frmts/ctg/CMakeLists.txt similarity index 100% rename from gdal/frmts/ctg/CMakeLists.txt rename to frmts/ctg/CMakeLists.txt diff --git a/gdal/frmts/ctg/GNUmakefile b/frmts/ctg/GNUmakefile similarity index 100% rename from gdal/frmts/ctg/GNUmakefile rename to frmts/ctg/GNUmakefile diff --git a/gdal/frmts/ctg/ctgdataset.cpp b/frmts/ctg/ctgdataset.cpp similarity index 100% rename from gdal/frmts/ctg/ctgdataset.cpp rename to frmts/ctg/ctgdataset.cpp diff --git a/gdal/frmts/ctg/makefile.vc b/frmts/ctg/makefile.vc similarity index 100% rename from gdal/frmts/ctg/makefile.vc rename to frmts/ctg/makefile.vc diff --git a/gdal/frmts/daas/CMakeLists.txt b/frmts/daas/CMakeLists.txt similarity index 100% rename from gdal/frmts/daas/CMakeLists.txt rename to frmts/daas/CMakeLists.txt diff --git a/gdal/frmts/daas/GNUmakefile b/frmts/daas/GNUmakefile similarity index 100% rename from gdal/frmts/daas/GNUmakefile rename to frmts/daas/GNUmakefile diff --git a/gdal/frmts/daas/daasdataset.cpp b/frmts/daas/daasdataset.cpp similarity index 100% rename from gdal/frmts/daas/daasdataset.cpp rename to frmts/daas/daasdataset.cpp diff --git a/gdal/frmts/daas/makefile.vc b/frmts/daas/makefile.vc similarity index 100% rename from gdal/frmts/daas/makefile.vc rename to frmts/daas/makefile.vc diff --git a/gdal/frmts/dds/CMakeLists.txt b/frmts/dds/CMakeLists.txt similarity index 100% rename from gdal/frmts/dds/CMakeLists.txt rename to frmts/dds/CMakeLists.txt diff --git a/gdal/frmts/dds/GNUmakefile b/frmts/dds/GNUmakefile similarity index 100% rename from gdal/frmts/dds/GNUmakefile rename to frmts/dds/GNUmakefile diff --git a/gdal/frmts/dds/crunch_headers.h b/frmts/dds/crunch_headers.h similarity index 100% rename from gdal/frmts/dds/crunch_headers.h rename to frmts/dds/crunch_headers.h diff --git a/gdal/frmts/dds/ddsdataset.cpp b/frmts/dds/ddsdataset.cpp similarity index 100% rename from gdal/frmts/dds/ddsdataset.cpp rename to frmts/dds/ddsdataset.cpp diff --git a/gdal/frmts/dds/makefile.vc b/frmts/dds/makefile.vc similarity index 100% rename from gdal/frmts/dds/makefile.vc rename to frmts/dds/makefile.vc diff --git a/gdal/frmts/derived/CMakeLists.txt b/frmts/derived/CMakeLists.txt similarity index 100% rename from gdal/frmts/derived/CMakeLists.txt rename to frmts/derived/CMakeLists.txt diff --git a/gdal/frmts/derived/GNUmakefile b/frmts/derived/GNUmakefile similarity index 100% rename from gdal/frmts/derived/GNUmakefile rename to frmts/derived/GNUmakefile diff --git a/gdal/frmts/derived/deriveddataset.cpp b/frmts/derived/deriveddataset.cpp similarity index 100% rename from gdal/frmts/derived/deriveddataset.cpp rename to frmts/derived/deriveddataset.cpp diff --git a/gdal/frmts/derived/derivedlist.c b/frmts/derived/derivedlist.c similarity index 100% rename from gdal/frmts/derived/derivedlist.c rename to frmts/derived/derivedlist.c diff --git a/gdal/frmts/derived/derivedlist.h b/frmts/derived/derivedlist.h similarity index 100% rename from gdal/frmts/derived/derivedlist.h rename to frmts/derived/derivedlist.h diff --git a/gdal/frmts/derived/makefile.vc b/frmts/derived/makefile.vc similarity index 100% rename from gdal/frmts/derived/makefile.vc rename to frmts/derived/makefile.vc diff --git a/gdal/frmts/dimap/CMakeLists.txt b/frmts/dimap/CMakeLists.txt similarity index 100% rename from gdal/frmts/dimap/CMakeLists.txt rename to frmts/dimap/CMakeLists.txt diff --git a/gdal/frmts/dimap/GNUmakefile b/frmts/dimap/GNUmakefile similarity index 100% rename from gdal/frmts/dimap/GNUmakefile rename to frmts/dimap/GNUmakefile diff --git a/gdal/frmts/dimap/dimapdataset.cpp b/frmts/dimap/dimapdataset.cpp similarity index 100% rename from gdal/frmts/dimap/dimapdataset.cpp rename to frmts/dimap/dimapdataset.cpp diff --git a/gdal/frmts/dimap/makefile.vc b/frmts/dimap/makefile.vc similarity index 100% rename from gdal/frmts/dimap/makefile.vc rename to frmts/dimap/makefile.vc diff --git a/gdal/frmts/dods/CMakeLists.txt b/frmts/dods/CMakeLists.txt similarity index 100% rename from gdal/frmts/dods/CMakeLists.txt rename to frmts/dods/CMakeLists.txt diff --git a/gdal/frmts/dods/GNUmakefile b/frmts/dods/GNUmakefile similarity index 100% rename from gdal/frmts/dods/GNUmakefile rename to frmts/dods/GNUmakefile diff --git a/gdal/frmts/dods/dodsdataset2.cpp b/frmts/dods/dodsdataset2.cpp similarity index 100% rename from gdal/frmts/dods/dodsdataset2.cpp rename to frmts/dods/dodsdataset2.cpp diff --git a/gdal/frmts/dods/libdap_headers.h b/frmts/dods/libdap_headers.h similarity index 100% rename from gdal/frmts/dods/libdap_headers.h rename to frmts/dods/libdap_headers.h diff --git a/gdal/frmts/dods/makefile.vc b/frmts/dods/makefile.vc similarity index 100% rename from gdal/frmts/dods/makefile.vc rename to frmts/dods/makefile.vc diff --git a/gdal/frmts/dted/CMakeLists.txt b/frmts/dted/CMakeLists.txt similarity index 100% rename from gdal/frmts/dted/CMakeLists.txt rename to frmts/dted/CMakeLists.txt diff --git a/gdal/frmts/dted/GNUmakefile b/frmts/dted/GNUmakefile similarity index 100% rename from gdal/frmts/dted/GNUmakefile rename to frmts/dted/GNUmakefile diff --git a/gdal/frmts/dted/dted_api.c b/frmts/dted/dted_api.c similarity index 100% rename from gdal/frmts/dted/dted_api.c rename to frmts/dted/dted_api.c diff --git a/gdal/frmts/dted/dted_api.h b/frmts/dted/dted_api.h similarity index 100% rename from gdal/frmts/dted/dted_api.h rename to frmts/dted/dted_api.h diff --git a/gdal/frmts/dted/dted_create.c b/frmts/dted/dted_create.c similarity index 100% rename from gdal/frmts/dted/dted_create.c rename to frmts/dted/dted_create.c diff --git a/gdal/frmts/dted/dted_ptstream.c b/frmts/dted/dted_ptstream.c similarity index 100% rename from gdal/frmts/dted/dted_ptstream.c rename to frmts/dted/dted_ptstream.c diff --git a/gdal/frmts/dted/dted_test.c b/frmts/dted/dted_test.c similarity index 100% rename from gdal/frmts/dted/dted_test.c rename to frmts/dted/dted_test.c diff --git a/gdal/frmts/dted/dteddataset.cpp b/frmts/dted/dteddataset.cpp similarity index 100% rename from gdal/frmts/dted/dteddataset.cpp rename to frmts/dted/dteddataset.cpp diff --git a/gdal/frmts/dted/makefile.vc b/frmts/dted/makefile.vc similarity index 100% rename from gdal/frmts/dted/makefile.vc rename to frmts/dted/makefile.vc diff --git a/gdal/frmts/ecw/CMakeLists.txt b/frmts/ecw/CMakeLists.txt similarity index 100% rename from gdal/frmts/ecw/CMakeLists.txt rename to frmts/ecw/CMakeLists.txt diff --git a/gdal/frmts/ecw/GNUmakefile b/frmts/ecw/GNUmakefile similarity index 100% rename from gdal/frmts/ecw/GNUmakefile rename to frmts/ecw/GNUmakefile diff --git a/gdal/frmts/ecw/ecwasyncreader.cpp b/frmts/ecw/ecwasyncreader.cpp similarity index 100% rename from gdal/frmts/ecw/ecwasyncreader.cpp rename to frmts/ecw/ecwasyncreader.cpp diff --git a/gdal/frmts/ecw/ecwcreatecopy.cpp b/frmts/ecw/ecwcreatecopy.cpp similarity index 100% rename from gdal/frmts/ecw/ecwcreatecopy.cpp rename to frmts/ecw/ecwcreatecopy.cpp diff --git a/gdal/frmts/ecw/ecwdataset.cpp b/frmts/ecw/ecwdataset.cpp similarity index 100% rename from gdal/frmts/ecw/ecwdataset.cpp rename to frmts/ecw/ecwdataset.cpp diff --git a/gdal/frmts/ecw/ecwsdk_headers.h b/frmts/ecw/ecwsdk_headers.h similarity index 100% rename from gdal/frmts/ecw/ecwsdk_headers.h rename to frmts/ecw/ecwsdk_headers.h diff --git a/gdal/frmts/ecw/gdal_ecw.h b/frmts/ecw/gdal_ecw.h similarity index 100% rename from gdal/frmts/ecw/gdal_ecw.h rename to frmts/ecw/gdal_ecw.h diff --git a/gdal/frmts/ecw/jp2userbox.cpp b/frmts/ecw/jp2userbox.cpp similarity index 100% rename from gdal/frmts/ecw/jp2userbox.cpp rename to frmts/ecw/jp2userbox.cpp diff --git a/gdal/frmts/ecw/lookup.py b/frmts/ecw/lookup.py similarity index 100% rename from gdal/frmts/ecw/lookup.py rename to frmts/ecw/lookup.py diff --git a/gdal/frmts/ecw/makefile.vc b/frmts/ecw/makefile.vc similarity index 100% rename from gdal/frmts/ecw/makefile.vc rename to frmts/ecw/makefile.vc diff --git a/gdal/frmts/eeda/CMakeLists.txt b/frmts/eeda/CMakeLists.txt similarity index 100% rename from gdal/frmts/eeda/CMakeLists.txt rename to frmts/eeda/CMakeLists.txt diff --git a/gdal/frmts/eeda/GNUmakefile b/frmts/eeda/GNUmakefile similarity index 100% rename from gdal/frmts/eeda/GNUmakefile rename to frmts/eeda/GNUmakefile diff --git a/gdal/frmts/eeda/eeda.h b/frmts/eeda/eeda.h similarity index 100% rename from gdal/frmts/eeda/eeda.h rename to frmts/eeda/eeda.h diff --git a/gdal/frmts/eeda/eedacommon.cpp b/frmts/eeda/eedacommon.cpp similarity index 100% rename from gdal/frmts/eeda/eedacommon.cpp rename to frmts/eeda/eedacommon.cpp diff --git a/gdal/frmts/eeda/eedadataset.cpp b/frmts/eeda/eedadataset.cpp similarity index 100% rename from gdal/frmts/eeda/eedadataset.cpp rename to frmts/eeda/eedadataset.cpp diff --git a/gdal/frmts/eeda/eedaidataset.cpp b/frmts/eeda/eedaidataset.cpp similarity index 100% rename from gdal/frmts/eeda/eedaidataset.cpp rename to frmts/eeda/eedaidataset.cpp diff --git a/gdal/frmts/eeda/makefile.vc b/frmts/eeda/makefile.vc similarity index 100% rename from gdal/frmts/eeda/makefile.vc rename to frmts/eeda/makefile.vc diff --git a/gdal/frmts/elas/CMakeLists.txt b/frmts/elas/CMakeLists.txt similarity index 100% rename from gdal/frmts/elas/CMakeLists.txt rename to frmts/elas/CMakeLists.txt diff --git a/gdal/frmts/elas/GNUmakefile b/frmts/elas/GNUmakefile similarity index 100% rename from gdal/frmts/elas/GNUmakefile rename to frmts/elas/GNUmakefile diff --git a/gdal/frmts/elas/elasdataset.cpp b/frmts/elas/elasdataset.cpp similarity index 100% rename from gdal/frmts/elas/elasdataset.cpp rename to frmts/elas/elasdataset.cpp diff --git a/gdal/frmts/elas/makefile.vc b/frmts/elas/makefile.vc similarity index 100% rename from gdal/frmts/elas/makefile.vc rename to frmts/elas/makefile.vc diff --git a/gdal/frmts/envisat/CMakeLists.txt b/frmts/envisat/CMakeLists.txt similarity index 100% rename from gdal/frmts/envisat/CMakeLists.txt rename to frmts/envisat/CMakeLists.txt diff --git a/gdal/frmts/envisat/EnvisatFile.c b/frmts/envisat/EnvisatFile.c similarity index 100% rename from gdal/frmts/envisat/EnvisatFile.c rename to frmts/envisat/EnvisatFile.c diff --git a/gdal/frmts/envisat/EnvisatFile.h b/frmts/envisat/EnvisatFile.h similarity index 100% rename from gdal/frmts/envisat/EnvisatFile.h rename to frmts/envisat/EnvisatFile.h diff --git a/gdal/frmts/envisat/GNUmakefile b/frmts/envisat/GNUmakefile similarity index 100% rename from gdal/frmts/envisat/GNUmakefile rename to frmts/envisat/GNUmakefile diff --git a/gdal/frmts/envisat/adsrange.cpp b/frmts/envisat/adsrange.cpp similarity index 100% rename from gdal/frmts/envisat/adsrange.cpp rename to frmts/envisat/adsrange.cpp diff --git a/gdal/frmts/envisat/adsrange.hpp b/frmts/envisat/adsrange.hpp similarity index 100% rename from gdal/frmts/envisat/adsrange.hpp rename to frmts/envisat/adsrange.hpp diff --git a/gdal/frmts/envisat/dumpgeo.c b/frmts/envisat/dumpgeo.c similarity index 100% rename from gdal/frmts/envisat/dumpgeo.c rename to frmts/envisat/dumpgeo.c diff --git a/gdal/frmts/envisat/envisat_dump.c b/frmts/envisat/envisat_dump.c similarity index 100% rename from gdal/frmts/envisat/envisat_dump.c rename to frmts/envisat/envisat_dump.c diff --git a/gdal/frmts/envisat/envisatdataset.cpp b/frmts/envisat/envisatdataset.cpp similarity index 100% rename from gdal/frmts/envisat/envisatdataset.cpp rename to frmts/envisat/envisatdataset.cpp diff --git a/gdal/frmts/envisat/makefile.vc b/frmts/envisat/makefile.vc similarity index 100% rename from gdal/frmts/envisat/makefile.vc rename to frmts/envisat/makefile.vc diff --git a/gdal/frmts/envisat/records.c b/frmts/envisat/records.c similarity index 100% rename from gdal/frmts/envisat/records.c rename to frmts/envisat/records.c diff --git a/gdal/frmts/envisat/records.h b/frmts/envisat/records.h similarity index 100% rename from gdal/frmts/envisat/records.h rename to frmts/envisat/records.h diff --git a/gdal/frmts/envisat/timedelta.hpp b/frmts/envisat/timedelta.hpp similarity index 100% rename from gdal/frmts/envisat/timedelta.hpp rename to frmts/envisat/timedelta.hpp diff --git a/gdal/frmts/envisat/unwrapgcps.cpp b/frmts/envisat/unwrapgcps.cpp similarity index 100% rename from gdal/frmts/envisat/unwrapgcps.cpp rename to frmts/envisat/unwrapgcps.cpp diff --git a/gdal/frmts/ers/CMakeLists.txt b/frmts/ers/CMakeLists.txt similarity index 100% rename from gdal/frmts/ers/CMakeLists.txt rename to frmts/ers/CMakeLists.txt diff --git a/gdal/frmts/ers/GNUmakefile b/frmts/ers/GNUmakefile similarity index 100% rename from gdal/frmts/ers/GNUmakefile rename to frmts/ers/GNUmakefile diff --git a/gdal/frmts/ers/ersdataset.cpp b/frmts/ers/ersdataset.cpp similarity index 100% rename from gdal/frmts/ers/ersdataset.cpp rename to frmts/ers/ersdataset.cpp diff --git a/gdal/frmts/ers/ershdrnode.cpp b/frmts/ers/ershdrnode.cpp similarity index 100% rename from gdal/frmts/ers/ershdrnode.cpp rename to frmts/ers/ershdrnode.cpp diff --git a/gdal/frmts/ers/ershdrnode.h b/frmts/ers/ershdrnode.h similarity index 100% rename from gdal/frmts/ers/ershdrnode.h rename to frmts/ers/ershdrnode.h diff --git a/gdal/frmts/ers/makefile.vc b/frmts/ers/makefile.vc similarity index 100% rename from gdal/frmts/ers/makefile.vc rename to frmts/ers/makefile.vc diff --git a/gdal/frmts/esric/CMakeLists.txt b/frmts/esric/CMakeLists.txt similarity index 100% rename from gdal/frmts/esric/CMakeLists.txt rename to frmts/esric/CMakeLists.txt diff --git a/gdal/frmts/esric/GNUmakefile b/frmts/esric/GNUmakefile similarity index 100% rename from gdal/frmts/esric/GNUmakefile rename to frmts/esric/GNUmakefile diff --git a/gdal/frmts/esric/esric_dataset.cpp b/frmts/esric/esric_dataset.cpp similarity index 100% rename from gdal/frmts/esric/esric_dataset.cpp rename to frmts/esric/esric_dataset.cpp diff --git a/gdal/frmts/esric/makefile.vc b/frmts/esric/makefile.vc similarity index 100% rename from gdal/frmts/esric/makefile.vc rename to frmts/esric/makefile.vc diff --git a/gdal/frmts/exr/CMakeLists.txt b/frmts/exr/CMakeLists.txt similarity index 100% rename from gdal/frmts/exr/CMakeLists.txt rename to frmts/exr/CMakeLists.txt diff --git a/gdal/frmts/exr/GNUmakefile b/frmts/exr/GNUmakefile similarity index 100% rename from gdal/frmts/exr/GNUmakefile rename to frmts/exr/GNUmakefile diff --git a/gdal/frmts/exr/exrdataset.cpp b/frmts/exr/exrdataset.cpp similarity index 100% rename from gdal/frmts/exr/exrdataset.cpp rename to frmts/exr/exrdataset.cpp diff --git a/gdal/frmts/exr/makefile.vc b/frmts/exr/makefile.vc similarity index 100% rename from gdal/frmts/exr/makefile.vc rename to frmts/exr/makefile.vc diff --git a/gdal/frmts/exr/openexr_headers.h b/frmts/exr/openexr_headers.h similarity index 100% rename from gdal/frmts/exr/openexr_headers.h rename to frmts/exr/openexr_headers.h diff --git a/gdal/frmts/fit/CMakeLists.txt b/frmts/fit/CMakeLists.txt similarity index 100% rename from gdal/frmts/fit/CMakeLists.txt rename to frmts/fit/CMakeLists.txt diff --git a/gdal/frmts/fit/GNUmakefile b/frmts/fit/GNUmakefile similarity index 100% rename from gdal/frmts/fit/GNUmakefile rename to frmts/fit/GNUmakefile diff --git a/gdal/frmts/fit/fit.cpp b/frmts/fit/fit.cpp similarity index 100% rename from gdal/frmts/fit/fit.cpp rename to frmts/fit/fit.cpp diff --git a/gdal/frmts/fit/fit.h b/frmts/fit/fit.h similarity index 100% rename from gdal/frmts/fit/fit.h rename to frmts/fit/fit.h diff --git a/gdal/frmts/fit/fitdataset.cpp b/frmts/fit/fitdataset.cpp similarity index 100% rename from gdal/frmts/fit/fitdataset.cpp rename to frmts/fit/fitdataset.cpp diff --git a/gdal/frmts/fit/gstEndian.h b/frmts/fit/gstEndian.h similarity index 100% rename from gdal/frmts/fit/gstEndian.h rename to frmts/fit/gstEndian.h diff --git a/gdal/frmts/fit/gstTypes.h b/frmts/fit/gstTypes.h similarity index 100% rename from gdal/frmts/fit/gstTypes.h rename to frmts/fit/gstTypes.h diff --git a/gdal/frmts/fit/makefile.vc b/frmts/fit/makefile.vc similarity index 100% rename from gdal/frmts/fit/makefile.vc rename to frmts/fit/makefile.vc diff --git a/gdal/frmts/fits/CMakeLists.txt b/frmts/fits/CMakeLists.txt similarity index 100% rename from gdal/frmts/fits/CMakeLists.txt rename to frmts/fits/CMakeLists.txt diff --git a/gdal/frmts/fits/GNUmakefile b/frmts/fits/GNUmakefile similarity index 100% rename from gdal/frmts/fits/GNUmakefile rename to frmts/fits/GNUmakefile diff --git a/gdal/frmts/fits/fitsdataset.cpp b/frmts/fits/fitsdataset.cpp similarity index 100% rename from gdal/frmts/fits/fitsdataset.cpp rename to frmts/fits/fitsdataset.cpp diff --git a/gdal/frmts/fits/makefile.vc b/frmts/fits/makefile.vc similarity index 100% rename from gdal/frmts/fits/makefile.vc rename to frmts/fits/makefile.vc diff --git a/gdal/frmts/gdalallregister.cpp b/frmts/gdalallregister.cpp similarity index 100% rename from gdal/frmts/gdalallregister.cpp rename to frmts/gdalallregister.cpp diff --git a/gdal/frmts/georaster/CMakeLists.txt b/frmts/georaster/CMakeLists.txt similarity index 100% rename from gdal/frmts/georaster/CMakeLists.txt rename to frmts/georaster/CMakeLists.txt diff --git a/gdal/frmts/georaster/GNUmakefile b/frmts/georaster/GNUmakefile similarity index 100% rename from gdal/frmts/georaster/GNUmakefile rename to frmts/georaster/GNUmakefile diff --git a/gdal/frmts/georaster/cpl_vsil_ocilob.cpp b/frmts/georaster/cpl_vsil_ocilob.cpp similarity index 100% rename from gdal/frmts/georaster/cpl_vsil_ocilob.cpp rename to frmts/georaster/cpl_vsil_ocilob.cpp diff --git a/gdal/frmts/georaster/georaster_dataset.cpp b/frmts/georaster/georaster_dataset.cpp similarity index 100% rename from gdal/frmts/georaster/georaster_dataset.cpp rename to frmts/georaster/georaster_dataset.cpp diff --git a/gdal/frmts/georaster/georaster_priv.h b/frmts/georaster/georaster_priv.h similarity index 100% rename from gdal/frmts/georaster/georaster_priv.h rename to frmts/georaster/georaster_priv.h diff --git a/gdal/frmts/georaster/georaster_rasterband.cpp b/frmts/georaster/georaster_rasterband.cpp similarity index 100% rename from gdal/frmts/georaster/georaster_rasterband.cpp rename to frmts/georaster/georaster_rasterband.cpp diff --git a/gdal/frmts/georaster/georaster_wrapper.cpp b/frmts/georaster/georaster_wrapper.cpp similarity index 100% rename from gdal/frmts/georaster/georaster_wrapper.cpp rename to frmts/georaster/georaster_wrapper.cpp diff --git a/gdal/frmts/georaster/makefile.vc b/frmts/georaster/makefile.vc similarity index 100% rename from gdal/frmts/georaster/makefile.vc rename to frmts/georaster/makefile.vc diff --git a/gdal/frmts/georaster/oci_wrapper.cpp b/frmts/georaster/oci_wrapper.cpp similarity index 100% rename from gdal/frmts/georaster/oci_wrapper.cpp rename to frmts/georaster/oci_wrapper.cpp diff --git a/gdal/frmts/georaster/oci_wrapper.h b/frmts/georaster/oci_wrapper.h similarity index 100% rename from gdal/frmts/georaster/oci_wrapper.h rename to frmts/georaster/oci_wrapper.h diff --git a/gdal/frmts/gff/CMakeLists.txt b/frmts/gff/CMakeLists.txt similarity index 100% rename from gdal/frmts/gff/CMakeLists.txt rename to frmts/gff/CMakeLists.txt diff --git a/gdal/frmts/gff/GNUmakefile b/frmts/gff/GNUmakefile similarity index 100% rename from gdal/frmts/gff/GNUmakefile rename to frmts/gff/GNUmakefile diff --git a/gdal/frmts/gff/gff_dataset.cpp b/frmts/gff/gff_dataset.cpp similarity index 100% rename from gdal/frmts/gff/gff_dataset.cpp rename to frmts/gff/gff_dataset.cpp diff --git a/gdal/frmts/gff/makefile.vc b/frmts/gff/makefile.vc similarity index 100% rename from gdal/frmts/gff/makefile.vc rename to frmts/gff/makefile.vc diff --git a/gdal/frmts/gif/CMakeLists.txt b/frmts/gif/CMakeLists.txt similarity index 100% rename from gdal/frmts/gif/CMakeLists.txt rename to frmts/gif/CMakeLists.txt diff --git a/gdal/frmts/gif/GNUmakefile b/frmts/gif/GNUmakefile similarity index 100% rename from gdal/frmts/gif/GNUmakefile rename to frmts/gif/GNUmakefile diff --git a/gdal/frmts/gif/biggifdataset.cpp b/frmts/gif/biggifdataset.cpp similarity index 100% rename from gdal/frmts/gif/biggifdataset.cpp rename to frmts/gif/biggifdataset.cpp diff --git a/gdal/frmts/gif/gifabstractdataset.cpp b/frmts/gif/gifabstractdataset.cpp similarity index 100% rename from gdal/frmts/gif/gifabstractdataset.cpp rename to frmts/gif/gifabstractdataset.cpp diff --git a/gdal/frmts/gif/gifabstractdataset.h b/frmts/gif/gifabstractdataset.h similarity index 100% rename from gdal/frmts/gif/gifabstractdataset.h rename to frmts/gif/gifabstractdataset.h diff --git a/gdal/frmts/gif/gifdataset.cpp b/frmts/gif/gifdataset.cpp similarity index 100% rename from gdal/frmts/gif/gifdataset.cpp rename to frmts/gif/gifdataset.cpp diff --git a/gdal/frmts/gif/giflib/CMakeLists.txt b/frmts/gif/giflib/CMakeLists.txt similarity index 100% rename from gdal/frmts/gif/giflib/CMakeLists.txt rename to frmts/gif/giflib/CMakeLists.txt diff --git a/gdal/frmts/gif/giflib/COPYING b/frmts/gif/giflib/COPYING similarity index 100% rename from gdal/frmts/gif/giflib/COPYING rename to frmts/gif/giflib/COPYING diff --git a/gdal/frmts/gif/giflib/README b/frmts/gif/giflib/README similarity index 100% rename from gdal/frmts/gif/giflib/README rename to frmts/gif/giflib/README diff --git a/gdal/frmts/gif/giflib/dgif_lib.c b/frmts/gif/giflib/dgif_lib.c similarity index 100% rename from gdal/frmts/gif/giflib/dgif_lib.c rename to frmts/gif/giflib/dgif_lib.c diff --git a/gdal/frmts/gif/giflib/egif_lib.c b/frmts/gif/giflib/egif_lib.c similarity index 100% rename from gdal/frmts/gif/giflib/egif_lib.c rename to frmts/gif/giflib/egif_lib.c diff --git a/gdal/frmts/gif/giflib/gif_err.c b/frmts/gif/giflib/gif_err.c similarity index 100% rename from gdal/frmts/gif/giflib/gif_err.c rename to frmts/gif/giflib/gif_err.c diff --git a/gdal/frmts/gif/giflib/gif_hash.c b/frmts/gif/giflib/gif_hash.c similarity index 100% rename from gdal/frmts/gif/giflib/gif_hash.c rename to frmts/gif/giflib/gif_hash.c diff --git a/gdal/frmts/gif/giflib/gif_hash.h b/frmts/gif/giflib/gif_hash.h similarity index 100% rename from gdal/frmts/gif/giflib/gif_hash.h rename to frmts/gif/giflib/gif_hash.h diff --git a/gdal/frmts/gif/giflib/gif_lib.h b/frmts/gif/giflib/gif_lib.h similarity index 100% rename from gdal/frmts/gif/giflib/gif_lib.h rename to frmts/gif/giflib/gif_lib.h diff --git a/gdal/frmts/gif/giflib/gif_lib_private.h b/frmts/gif/giflib/gif_lib_private.h similarity index 100% rename from gdal/frmts/gif/giflib/gif_lib_private.h rename to frmts/gif/giflib/gif_lib_private.h diff --git a/gdal/frmts/gif/giflib/gifalloc.c b/frmts/gif/giflib/gifalloc.c similarity index 100% rename from gdal/frmts/gif/giflib/gifalloc.c rename to frmts/gif/giflib/gifalloc.c diff --git a/gdal/frmts/gif/giflib/makefile.vc b/frmts/gif/giflib/makefile.vc similarity index 100% rename from gdal/frmts/gif/giflib/makefile.vc rename to frmts/gif/giflib/makefile.vc diff --git a/gdal/frmts/gif/makefile.vc b/frmts/gif/makefile.vc similarity index 100% rename from gdal/frmts/gif/makefile.vc rename to frmts/gif/makefile.vc diff --git a/gdal/frmts/grass/CMakeLists.txt b/frmts/grass/CMakeLists.txt similarity index 100% rename from gdal/frmts/grass/CMakeLists.txt rename to frmts/grass/CMakeLists.txt diff --git a/gdal/frmts/grass/GNUmakefile b/frmts/grass/GNUmakefile similarity index 100% rename from gdal/frmts/grass/GNUmakefile rename to frmts/grass/GNUmakefile diff --git a/gdal/frmts/grass/grass.cpp b/frmts/grass/grass.cpp similarity index 100% rename from gdal/frmts/grass/grass.cpp rename to frmts/grass/grass.cpp diff --git a/gdal/frmts/grass/pkg/Makefile.in b/frmts/grass/pkg/Makefile.in similarity index 100% rename from gdal/frmts/grass/pkg/Makefile.in rename to frmts/grass/pkg/Makefile.in diff --git a/gdal/frmts/grass/pkg/README b/frmts/grass/pkg/README similarity index 100% rename from gdal/frmts/grass/pkg/README rename to frmts/grass/pkg/README diff --git a/gdal/frmts/grass/pkg/aclocal.m4 b/frmts/grass/pkg/aclocal.m4 similarity index 100% rename from gdal/frmts/grass/pkg/aclocal.m4 rename to frmts/grass/pkg/aclocal.m4 diff --git a/gdal/frmts/grass/pkg/configure b/frmts/grass/pkg/configure similarity index 100% rename from gdal/frmts/grass/pkg/configure rename to frmts/grass/pkg/configure diff --git a/gdal/frmts/grass/pkg/configure.in b/frmts/grass/pkg/configure.in similarity index 100% rename from gdal/frmts/grass/pkg/configure.in rename to frmts/grass/pkg/configure.in diff --git a/gdal/frmts/grib/CMakeLists.txt b/frmts/grib/CMakeLists.txt similarity index 100% rename from gdal/frmts/grib/CMakeLists.txt rename to frmts/grib/CMakeLists.txt diff --git a/gdal/frmts/grib/GNUmakefile b/frmts/grib/GNUmakefile similarity index 100% rename from gdal/frmts/grib/GNUmakefile rename to frmts/grib/GNUmakefile diff --git a/gdal/frmts/grib/degrib/LICENSE.TXT b/frmts/grib/degrib/LICENSE.TXT similarity index 100% rename from gdal/frmts/grib/degrib/LICENSE.TXT rename to frmts/grib/degrib/LICENSE.TXT diff --git a/gdal/frmts/grib/degrib/README.TXT b/frmts/grib/degrib/README.TXT similarity index 100% rename from gdal/frmts/grib/degrib/README.TXT rename to frmts/grib/degrib/README.TXT diff --git a/gdal/frmts/grib/degrib/degrib/clock.c b/frmts/grib/degrib/degrib/clock.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/clock.c rename to frmts/grib/degrib/degrib/clock.c diff --git a/gdal/frmts/grib/degrib/degrib/clock.h b/frmts/grib/degrib/degrib/clock.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/clock.h rename to frmts/grib/degrib/degrib/clock.h diff --git a/gdal/frmts/grib/degrib/degrib/degrib1.cpp b/frmts/grib/degrib/degrib/degrib1.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/degrib1.cpp rename to frmts/grib/degrib/degrib/degrib1.cpp diff --git a/gdal/frmts/grib/degrib/degrib/degrib1.h b/frmts/grib/degrib/degrib/degrib1.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/degrib1.h rename to frmts/grib/degrib/degrib/degrib1.h diff --git a/gdal/frmts/grib/degrib/degrib/degrib2.cpp b/frmts/grib/degrib/degrib/degrib2.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/degrib2.cpp rename to frmts/grib/degrib/degrib/degrib2.cpp diff --git a/gdal/frmts/grib/degrib/degrib/degrib2.h b/frmts/grib/degrib/degrib/degrib2.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/degrib2.h rename to frmts/grib/degrib/degrib/degrib2.h diff --git a/gdal/frmts/grib/degrib/degrib/engribapi.c b/frmts/grib/degrib/degrib/engribapi.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/engribapi.c rename to frmts/grib/degrib/degrib/engribapi.c diff --git a/gdal/frmts/grib/degrib/degrib/engribapi.h b/frmts/grib/degrib/degrib/engribapi.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/engribapi.h rename to frmts/grib/degrib/degrib/engribapi.h diff --git a/gdal/frmts/grib/degrib/degrib/grib1tab.cpp b/frmts/grib/degrib/degrib/grib1tab.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/grib1tab.cpp rename to frmts/grib/degrib/degrib/grib1tab.cpp diff --git a/gdal/frmts/grib/degrib/degrib/grib2api.c b/frmts/grib/degrib/degrib/grib2api.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/grib2api.c rename to frmts/grib/degrib/degrib/grib2api.c diff --git a/gdal/frmts/grib/degrib/degrib/grib2api.h b/frmts/grib/degrib/degrib/grib2api.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/grib2api.h rename to frmts/grib/degrib/degrib/grib2api.h diff --git a/gdal/frmts/grib/degrib/degrib/hazard.c b/frmts/grib/degrib/degrib/hazard.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/hazard.c rename to frmts/grib/degrib/degrib/hazard.c diff --git a/gdal/frmts/grib/degrib/degrib/hazard.h b/frmts/grib/degrib/degrib/hazard.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/hazard.h rename to frmts/grib/degrib/degrib/hazard.h diff --git a/gdal/frmts/grib/degrib/degrib/inventory.cpp b/frmts/grib/degrib/degrib/inventory.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/inventory.cpp rename to frmts/grib/degrib/degrib/inventory.cpp diff --git a/gdal/frmts/grib/degrib/degrib/inventory.h b/frmts/grib/degrib/degrib/inventory.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/inventory.h rename to frmts/grib/degrib/degrib/inventory.h diff --git a/gdal/frmts/grib/degrib/degrib/makefile.vc b/frmts/grib/degrib/degrib/makefile.vc similarity index 100% rename from gdal/frmts/grib/degrib/degrib/makefile.vc rename to frmts/grib/degrib/degrib/makefile.vc diff --git a/gdal/frmts/grib/degrib/degrib/meta.h b/frmts/grib/degrib/degrib/meta.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/meta.h rename to frmts/grib/degrib/degrib/meta.h diff --git a/gdal/frmts/grib/degrib/degrib/metaname.cpp b/frmts/grib/degrib/degrib/metaname.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/metaname.cpp rename to frmts/grib/degrib/degrib/metaname.cpp diff --git a/gdal/frmts/grib/degrib/degrib/metaname.h b/frmts/grib/degrib/degrib/metaname.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/metaname.h rename to frmts/grib/degrib/degrib/metaname.h diff --git a/gdal/frmts/grib/degrib/degrib/metaparse.cpp b/frmts/grib/degrib/degrib/metaparse.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/metaparse.cpp rename to frmts/grib/degrib/degrib/metaparse.cpp diff --git a/gdal/frmts/grib/degrib/degrib/metaprint.cpp b/frmts/grib/degrib/degrib/metaprint.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/metaprint.cpp rename to frmts/grib/degrib/degrib/metaprint.cpp diff --git a/gdal/frmts/grib/degrib/degrib/myassert.c b/frmts/grib/degrib/degrib/myassert.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/myassert.c rename to frmts/grib/degrib/degrib/myassert.c diff --git a/gdal/frmts/grib/degrib/degrib/myassert.h b/frmts/grib/degrib/degrib/myassert.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/myassert.h rename to frmts/grib/degrib/degrib/myassert.h diff --git a/gdal/frmts/grib/degrib/degrib/myerror.c b/frmts/grib/degrib/degrib/myerror.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/myerror.c rename to frmts/grib/degrib/degrib/myerror.c diff --git a/gdal/frmts/grib/degrib/degrib/myerror.h b/frmts/grib/degrib/degrib/myerror.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/myerror.h rename to frmts/grib/degrib/degrib/myerror.h diff --git a/gdal/frmts/grib/degrib/degrib/myutil.c b/frmts/grib/degrib/degrib/myutil.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/myutil.c rename to frmts/grib/degrib/degrib/myutil.c diff --git a/gdal/frmts/grib/degrib/degrib/myutil.h b/frmts/grib/degrib/degrib/myutil.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/myutil.h rename to frmts/grib/degrib/degrib/myutil.h diff --git a/gdal/frmts/grib/degrib/degrib/scan.c b/frmts/grib/degrib/degrib/scan.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/scan.c rename to frmts/grib/degrib/degrib/scan.c diff --git a/gdal/frmts/grib/degrib/degrib/scan.h b/frmts/grib/degrib/degrib/scan.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/scan.h rename to frmts/grib/degrib/degrib/scan.h diff --git a/gdal/frmts/grib/degrib/degrib/tdlpack.cpp b/frmts/grib/degrib/degrib/tdlpack.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/tdlpack.cpp rename to frmts/grib/degrib/degrib/tdlpack.cpp diff --git a/gdal/frmts/grib/degrib/degrib/tdlpack.h b/frmts/grib/degrib/degrib/tdlpack.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/tdlpack.h rename to frmts/grib/degrib/degrib/tdlpack.h diff --git a/gdal/frmts/grib/degrib/degrib/tendian.cpp b/frmts/grib/degrib/degrib/tendian.cpp similarity index 100% rename from gdal/frmts/grib/degrib/degrib/tendian.cpp rename to frmts/grib/degrib/degrib/tendian.cpp diff --git a/gdal/frmts/grib/degrib/degrib/tendian.h b/frmts/grib/degrib/degrib/tendian.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/tendian.h rename to frmts/grib/degrib/degrib/tendian.h diff --git a/gdal/frmts/grib/degrib/degrib/type.h b/frmts/grib/degrib/degrib/type.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/type.h rename to frmts/grib/degrib/degrib/type.h diff --git a/gdal/frmts/grib/degrib/degrib/weather.c b/frmts/grib/degrib/degrib/weather.c similarity index 100% rename from gdal/frmts/grib/degrib/degrib/weather.c rename to frmts/grib/degrib/degrib/weather.c diff --git a/gdal/frmts/grib/degrib/degrib/weather.h b/frmts/grib/degrib/degrib/weather.h similarity index 100% rename from gdal/frmts/grib/degrib/degrib/weather.h rename to frmts/grib/degrib/degrib/weather.h diff --git a/gdal/frmts/grib/degrib/g2clib/README b/frmts/grib/degrib/g2clib/README similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/README rename to frmts/grib/degrib/g2clib/README diff --git a/gdal/frmts/grib/degrib/g2clib/cmplxpack.c b/frmts/grib/degrib/g2clib/cmplxpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/cmplxpack.c rename to frmts/grib/degrib/g2clib/cmplxpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/compack.c b/frmts/grib/degrib/g2clib/compack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/compack.c rename to frmts/grib/degrib/g2clib/compack.c diff --git a/gdal/frmts/grib/degrib/g2clib/comunpack.c b/frmts/grib/degrib/g2clib/comunpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/comunpack.c rename to frmts/grib/degrib/g2clib/comunpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/dec_jpeg2000.cpp b/frmts/grib/degrib/g2clib/dec_jpeg2000.cpp similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/dec_jpeg2000.cpp rename to frmts/grib/degrib/g2clib/dec_jpeg2000.cpp diff --git a/gdal/frmts/grib/degrib/g2clib/dec_png.c b/frmts/grib/degrib/g2clib/dec_png.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/dec_png.c rename to frmts/grib/degrib/g2clib/dec_png.c diff --git a/gdal/frmts/grib/degrib/g2clib/drstemplates.c b/frmts/grib/degrib/g2clib/drstemplates.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/drstemplates.c rename to frmts/grib/degrib/g2clib/drstemplates.c diff --git a/gdal/frmts/grib/degrib/g2clib/drstemplates.h b/frmts/grib/degrib/g2clib/drstemplates.h similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/drstemplates.h rename to frmts/grib/degrib/g2clib/drstemplates.h diff --git a/gdal/frmts/grib/degrib/g2clib/enc_jpeg2000.c b/frmts/grib/degrib/g2clib/enc_jpeg2000.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/enc_jpeg2000.c rename to frmts/grib/degrib/g2clib/enc_jpeg2000.c diff --git a/gdal/frmts/grib/degrib/g2clib/enc_png.c b/frmts/grib/degrib/g2clib/enc_png.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/enc_png.c rename to frmts/grib/degrib/g2clib/enc_png.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_addfield.c b/frmts/grib/degrib/g2clib/g2_addfield.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_addfield.c rename to frmts/grib/degrib/g2clib/g2_addfield.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_addgrid.c b/frmts/grib/degrib/g2clib/g2_addgrid.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_addgrid.c rename to frmts/grib/degrib/g2clib/g2_addgrid.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_addlocal.c b/frmts/grib/degrib/g2clib/g2_addlocal.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_addlocal.c rename to frmts/grib/degrib/g2clib/g2_addlocal.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_create.c b/frmts/grib/degrib/g2clib/g2_create.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_create.c rename to frmts/grib/degrib/g2clib/g2_create.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_free.c b/frmts/grib/degrib/g2clib/g2_free.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_free.c rename to frmts/grib/degrib/g2clib/g2_free.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_getfld.c b/frmts/grib/degrib/g2clib/g2_getfld.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_getfld.c rename to frmts/grib/degrib/g2clib/g2_getfld.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_gribend.c b/frmts/grib/degrib/g2clib/g2_gribend.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_gribend.c rename to frmts/grib/degrib/g2clib/g2_gribend.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_info.c b/frmts/grib/degrib/g2clib/g2_info.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_info.c rename to frmts/grib/degrib/g2clib/g2_info.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_miss.c b/frmts/grib/degrib/g2clib/g2_miss.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_miss.c rename to frmts/grib/degrib/g2clib/g2_miss.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_unpack1.c b/frmts/grib/degrib/g2clib/g2_unpack1.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_unpack1.c rename to frmts/grib/degrib/g2clib/g2_unpack1.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_unpack2.c b/frmts/grib/degrib/g2clib/g2_unpack2.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_unpack2.c rename to frmts/grib/degrib/g2clib/g2_unpack2.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_unpack3.c b/frmts/grib/degrib/g2clib/g2_unpack3.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_unpack3.c rename to frmts/grib/degrib/g2clib/g2_unpack3.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_unpack4.c b/frmts/grib/degrib/g2clib/g2_unpack4.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_unpack4.c rename to frmts/grib/degrib/g2clib/g2_unpack4.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_unpack5.c b/frmts/grib/degrib/g2clib/g2_unpack5.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_unpack5.c rename to frmts/grib/degrib/g2clib/g2_unpack5.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_unpack6.c b/frmts/grib/degrib/g2clib/g2_unpack6.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_unpack6.c rename to frmts/grib/degrib/g2clib/g2_unpack6.c diff --git a/gdal/frmts/grib/degrib/g2clib/g2_unpack7.c b/frmts/grib/degrib/g2clib/g2_unpack7.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/g2_unpack7.c rename to frmts/grib/degrib/g2clib/g2_unpack7.c diff --git a/gdal/frmts/grib/degrib/g2clib/gbits.c b/frmts/grib/degrib/g2clib/gbits.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/gbits.c rename to frmts/grib/degrib/g2clib/gbits.c diff --git a/gdal/frmts/grib/degrib/g2clib/gdal_g2clib_symbol_rename.h b/frmts/grib/degrib/g2clib/gdal_g2clib_symbol_rename.h similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/gdal_g2clib_symbol_rename.h rename to frmts/grib/degrib/g2clib/gdal_g2clib_symbol_rename.h diff --git a/gdal/frmts/grib/degrib/g2clib/getdim.c b/frmts/grib/degrib/g2clib/getdim.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/getdim.c rename to frmts/grib/degrib/g2clib/getdim.c diff --git a/gdal/frmts/grib/degrib/g2clib/getpoly.c b/frmts/grib/degrib/g2clib/getpoly.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/getpoly.c rename to frmts/grib/degrib/g2clib/getpoly.c diff --git a/gdal/frmts/grib/degrib/g2clib/grib2.h b/frmts/grib/degrib/g2clib/grib2.h similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/grib2.h rename to frmts/grib/degrib/g2clib/grib2.h diff --git a/gdal/frmts/grib/degrib/g2clib/grib2c.doc b/frmts/grib/degrib/g2clib/grib2c.doc similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/grib2c.doc rename to frmts/grib/degrib/g2clib/grib2c.doc diff --git a/gdal/frmts/grib/degrib/g2clib/gridtemplates.c b/frmts/grib/degrib/g2clib/gridtemplates.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/gridtemplates.c rename to frmts/grib/degrib/g2clib/gridtemplates.c diff --git a/gdal/frmts/grib/degrib/g2clib/gridtemplates.h b/frmts/grib/degrib/g2clib/gridtemplates.h similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/gridtemplates.h rename to frmts/grib/degrib/g2clib/gridtemplates.h diff --git a/gdal/frmts/grib/degrib/g2clib/int_power.c b/frmts/grib/degrib/g2clib/int_power.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/int_power.c rename to frmts/grib/degrib/g2clib/int_power.c diff --git a/gdal/frmts/grib/degrib/g2clib/jpcpack.c b/frmts/grib/degrib/g2clib/jpcpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/jpcpack.c rename to frmts/grib/degrib/g2clib/jpcpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/jpcunpack.c b/frmts/grib/degrib/g2clib/jpcunpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/jpcunpack.c rename to frmts/grib/degrib/g2clib/jpcunpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/makefile.vc b/frmts/grib/degrib/g2clib/makefile.vc similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/makefile.vc rename to frmts/grib/degrib/g2clib/makefile.vc diff --git a/gdal/frmts/grib/degrib/g2clib/misspack.c b/frmts/grib/degrib/g2clib/misspack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/misspack.c rename to frmts/grib/degrib/g2clib/misspack.c diff --git a/gdal/frmts/grib/degrib/g2clib/mkieee.c b/frmts/grib/degrib/g2clib/mkieee.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/mkieee.c rename to frmts/grib/degrib/g2clib/mkieee.c diff --git a/gdal/frmts/grib/degrib/g2clib/pack_gp.c b/frmts/grib/degrib/g2clib/pack_gp.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/pack_gp.c rename to frmts/grib/degrib/g2clib/pack_gp.c diff --git a/gdal/frmts/grib/degrib/g2clib/pdstemplates.c b/frmts/grib/degrib/g2clib/pdstemplates.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/pdstemplates.c rename to frmts/grib/degrib/g2clib/pdstemplates.c diff --git a/gdal/frmts/grib/degrib/g2clib/pdstemplates.h b/frmts/grib/degrib/g2clib/pdstemplates.h similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/pdstemplates.h rename to frmts/grib/degrib/g2clib/pdstemplates.h diff --git a/gdal/frmts/grib/degrib/g2clib/pngpack.c b/frmts/grib/degrib/g2clib/pngpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/pngpack.c rename to frmts/grib/degrib/g2clib/pngpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/pngunpack.c b/frmts/grib/degrib/g2clib/pngunpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/pngunpack.c rename to frmts/grib/degrib/g2clib/pngunpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/rdieee.c b/frmts/grib/degrib/g2clib/rdieee.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/rdieee.c rename to frmts/grib/degrib/g2clib/rdieee.c diff --git a/gdal/frmts/grib/degrib/g2clib/reduce.c b/frmts/grib/degrib/g2clib/reduce.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/reduce.c rename to frmts/grib/degrib/g2clib/reduce.c diff --git a/gdal/frmts/grib/degrib/g2clib/seekgb.c b/frmts/grib/degrib/g2clib/seekgb.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/seekgb.c rename to frmts/grib/degrib/g2clib/seekgb.c diff --git a/gdal/frmts/grib/degrib/g2clib/simpack.c b/frmts/grib/degrib/g2clib/simpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/simpack.c rename to frmts/grib/degrib/g2clib/simpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/simunpack.c b/frmts/grib/degrib/g2clib/simunpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/simunpack.c rename to frmts/grib/degrib/g2clib/simunpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/specpack.c b/frmts/grib/degrib/g2clib/specpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/specpack.c rename to frmts/grib/degrib/g2clib/specpack.c diff --git a/gdal/frmts/grib/degrib/g2clib/specunpack.c b/frmts/grib/degrib/g2clib/specunpack.c similarity index 100% rename from gdal/frmts/grib/degrib/g2clib/specunpack.c rename to frmts/grib/degrib/g2clib/specunpack.c diff --git a/gdal/frmts/grib/degrib/makefile.vc b/frmts/grib/degrib/makefile.vc similarity index 100% rename from gdal/frmts/grib/degrib/makefile.vc rename to frmts/grib/degrib/makefile.vc diff --git a/gdal/frmts/grib/gribcreatecopy.cpp b/frmts/grib/gribcreatecopy.cpp similarity index 100% rename from gdal/frmts/grib/gribcreatecopy.cpp rename to frmts/grib/gribcreatecopy.cpp diff --git a/gdal/frmts/grib/gribdataset.cpp b/frmts/grib/gribdataset.cpp similarity index 100% rename from gdal/frmts/grib/gribdataset.cpp rename to frmts/grib/gribdataset.cpp diff --git a/gdal/frmts/grib/gribdataset.h b/frmts/grib/gribdataset.h similarity index 100% rename from gdal/frmts/grib/gribdataset.h rename to frmts/grib/gribdataset.h diff --git a/gdal/frmts/grib/makefile.vc b/frmts/grib/makefile.vc similarity index 100% rename from gdal/frmts/grib/makefile.vc rename to frmts/grib/makefile.vc diff --git a/gdal/frmts/grib/rename_g2clib_symbols.sh b/frmts/grib/rename_g2clib_symbols.sh similarity index 100% rename from gdal/frmts/grib/rename_g2clib_symbols.sh rename to frmts/grib/rename_g2clib_symbols.sh diff --git a/gdal/frmts/gsg/CMakeLists.txt b/frmts/gsg/CMakeLists.txt similarity index 100% rename from gdal/frmts/gsg/CMakeLists.txt rename to frmts/gsg/CMakeLists.txt diff --git a/gdal/frmts/gsg/GNUmakefile b/frmts/gsg/GNUmakefile similarity index 100% rename from gdal/frmts/gsg/GNUmakefile rename to frmts/gsg/GNUmakefile diff --git a/gdal/frmts/gsg/gs7bgdataset.cpp b/frmts/gsg/gs7bgdataset.cpp similarity index 100% rename from gdal/frmts/gsg/gs7bgdataset.cpp rename to frmts/gsg/gs7bgdataset.cpp diff --git a/gdal/frmts/gsg/gsagdataset.cpp b/frmts/gsg/gsagdataset.cpp similarity index 100% rename from gdal/frmts/gsg/gsagdataset.cpp rename to frmts/gsg/gsagdataset.cpp diff --git a/gdal/frmts/gsg/gsbgdataset.cpp b/frmts/gsg/gsbgdataset.cpp similarity index 100% rename from gdal/frmts/gsg/gsbgdataset.cpp rename to frmts/gsg/gsbgdataset.cpp diff --git a/gdal/frmts/gsg/makefile.vc b/frmts/gsg/makefile.vc similarity index 100% rename from gdal/frmts/gsg/makefile.vc rename to frmts/gsg/makefile.vc diff --git a/gdal/frmts/gta/CMakeLists.txt b/frmts/gta/CMakeLists.txt similarity index 100% rename from gdal/frmts/gta/CMakeLists.txt rename to frmts/gta/CMakeLists.txt diff --git a/gdal/frmts/gta/GNUmakefile b/frmts/gta/GNUmakefile similarity index 100% rename from gdal/frmts/gta/GNUmakefile rename to frmts/gta/GNUmakefile diff --git a/gdal/frmts/gta/gta_headers.h b/frmts/gta/gta_headers.h similarity index 100% rename from gdal/frmts/gta/gta_headers.h rename to frmts/gta/gta_headers.h diff --git a/gdal/frmts/gta/gtadataset.cpp b/frmts/gta/gtadataset.cpp similarity index 100% rename from gdal/frmts/gta/gtadataset.cpp rename to frmts/gta/gtadataset.cpp diff --git a/gdal/frmts/gta/makefile.vc b/frmts/gta/makefile.vc similarity index 100% rename from gdal/frmts/gta/makefile.vc rename to frmts/gta/makefile.vc diff --git a/gdal/frmts/gtiff/CMakeLists.txt b/frmts/gtiff/CMakeLists.txt similarity index 100% rename from gdal/frmts/gtiff/CMakeLists.txt rename to frmts/gtiff/CMakeLists.txt diff --git a/gdal/frmts/gtiff/GNUmakefile b/frmts/gtiff/GNUmakefile similarity index 100% rename from gdal/frmts/gtiff/GNUmakefile rename to frmts/gtiff/GNUmakefile diff --git a/gdal/frmts/gtiff/cogdriver.cpp b/frmts/gtiff/cogdriver.cpp similarity index 100% rename from gdal/frmts/gtiff/cogdriver.cpp rename to frmts/gtiff/cogdriver.cpp diff --git a/gdal/frmts/gtiff/cogdriver.h b/frmts/gtiff/cogdriver.h similarity index 100% rename from gdal/frmts/gtiff/cogdriver.h rename to frmts/gtiff/cogdriver.h diff --git a/gdal/frmts/gtiff/generate_quant_table_md5sum.cpp b/frmts/gtiff/generate_quant_table_md5sum.cpp similarity index 100% rename from gdal/frmts/gtiff/generate_quant_table_md5sum.cpp rename to frmts/gtiff/generate_quant_table_md5sum.cpp diff --git a/gdal/frmts/gtiff/geotiff.cpp b/frmts/gtiff/geotiff.cpp similarity index 100% rename from gdal/frmts/gtiff/geotiff.cpp rename to frmts/gtiff/geotiff.cpp diff --git a/gdal/frmts/gtiff/gt_citation.cpp b/frmts/gtiff/gt_citation.cpp similarity index 100% rename from gdal/frmts/gtiff/gt_citation.cpp rename to frmts/gtiff/gt_citation.cpp diff --git a/gdal/frmts/gtiff/gt_citation.h b/frmts/gtiff/gt_citation.h similarity index 100% rename from gdal/frmts/gtiff/gt_citation.h rename to frmts/gtiff/gt_citation.h diff --git a/gdal/frmts/gtiff/gt_jpeg_copy.cpp b/frmts/gtiff/gt_jpeg_copy.cpp similarity index 100% rename from gdal/frmts/gtiff/gt_jpeg_copy.cpp rename to frmts/gtiff/gt_jpeg_copy.cpp diff --git a/gdal/frmts/gtiff/gt_jpeg_copy.h b/frmts/gtiff/gt_jpeg_copy.h similarity index 100% rename from gdal/frmts/gtiff/gt_jpeg_copy.h rename to frmts/gtiff/gt_jpeg_copy.h diff --git a/gdal/frmts/gtiff/gt_overview.cpp b/frmts/gtiff/gt_overview.cpp similarity index 100% rename from gdal/frmts/gtiff/gt_overview.cpp rename to frmts/gtiff/gt_overview.cpp diff --git a/gdal/frmts/gtiff/gt_overview.h b/frmts/gtiff/gt_overview.h similarity index 100% rename from gdal/frmts/gtiff/gt_overview.h rename to frmts/gtiff/gt_overview.h diff --git a/gdal/frmts/gtiff/gt_wkt_srs.cpp b/frmts/gtiff/gt_wkt_srs.cpp similarity index 100% rename from gdal/frmts/gtiff/gt_wkt_srs.cpp rename to frmts/gtiff/gt_wkt_srs.cpp diff --git a/gdal/frmts/gtiff/gt_wkt_srs.h b/frmts/gtiff/gt_wkt_srs.h similarity index 100% rename from gdal/frmts/gtiff/gt_wkt_srs.h rename to frmts/gtiff/gt_wkt_srs.h diff --git a/gdal/frmts/gtiff/gt_wkt_srs_for_gdal.h b/frmts/gtiff/gt_wkt_srs_for_gdal.h similarity index 100% rename from gdal/frmts/gtiff/gt_wkt_srs_for_gdal.h rename to frmts/gtiff/gt_wkt_srs_for_gdal.h diff --git a/gdal/frmts/gtiff/gt_wkt_srs_priv.h b/frmts/gtiff/gt_wkt_srs_priv.h similarity index 100% rename from gdal/frmts/gtiff/gt_wkt_srs_priv.h rename to frmts/gtiff/gt_wkt_srs_priv.h diff --git a/gdal/frmts/gtiff/gtiff.h b/frmts/gtiff/gtiff.h similarity index 100% rename from gdal/frmts/gtiff/gtiff.h rename to frmts/gtiff/gtiff.h diff --git a/gdal/frmts/gtiff/libgeotiff/CMakeLists.txt b/frmts/gtiff/libgeotiff/CMakeLists.txt similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/CMakeLists.txt rename to frmts/gtiff/libgeotiff/CMakeLists.txt diff --git a/gdal/frmts/gtiff/libgeotiff/GNUmakefile b/frmts/gtiff/libgeotiff/GNUmakefile similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/GNUmakefile rename to frmts/gtiff/libgeotiff/GNUmakefile diff --git a/gdal/frmts/gtiff/libgeotiff/cpl_serv.h b/frmts/gtiff/libgeotiff/cpl_serv.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/cpl_serv.h rename to frmts/gtiff/libgeotiff/cpl_serv.h diff --git a/gdal/frmts/gtiff/libgeotiff/dump_symbols.sh b/frmts/gtiff/libgeotiff/dump_symbols.sh similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/dump_symbols.sh rename to frmts/gtiff/libgeotiff/dump_symbols.sh diff --git a/gdal/frmts/gtiff/libgeotiff/epsg_datum.inc b/frmts/gtiff/libgeotiff/epsg_datum.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/epsg_datum.inc rename to frmts/gtiff/libgeotiff/epsg_datum.inc diff --git a/gdal/frmts/gtiff/libgeotiff/epsg_ellipse.inc b/frmts/gtiff/libgeotiff/epsg_ellipse.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/epsg_ellipse.inc rename to frmts/gtiff/libgeotiff/epsg_ellipse.inc diff --git a/gdal/frmts/gtiff/libgeotiff/epsg_gcs.inc b/frmts/gtiff/libgeotiff/epsg_gcs.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/epsg_gcs.inc rename to frmts/gtiff/libgeotiff/epsg_gcs.inc diff --git a/gdal/frmts/gtiff/libgeotiff/epsg_pcs.inc b/frmts/gtiff/libgeotiff/epsg_pcs.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/epsg_pcs.inc rename to frmts/gtiff/libgeotiff/epsg_pcs.inc diff --git a/gdal/frmts/gtiff/libgeotiff/epsg_pm.inc b/frmts/gtiff/libgeotiff/epsg_pm.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/epsg_pm.inc rename to frmts/gtiff/libgeotiff/epsg_pm.inc diff --git a/gdal/frmts/gtiff/libgeotiff/epsg_proj.inc b/frmts/gtiff/libgeotiff/epsg_proj.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/epsg_proj.inc rename to frmts/gtiff/libgeotiff/epsg_proj.inc diff --git a/gdal/frmts/gtiff/libgeotiff/epsg_units.inc b/frmts/gtiff/libgeotiff/epsg_units.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/epsg_units.inc rename to frmts/gtiff/libgeotiff/epsg_units.inc diff --git a/gdal/frmts/gtiff/libgeotiff/epsg_vertcs.inc b/frmts/gtiff/libgeotiff/epsg_vertcs.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/epsg_vertcs.inc rename to frmts/gtiff/libgeotiff/epsg_vertcs.inc diff --git a/gdal/frmts/gtiff/libgeotiff/gdal_libgeotiff_symbol_rename.h b/frmts/gtiff/libgeotiff/gdal_libgeotiff_symbol_rename.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/gdal_libgeotiff_symbol_rename.h rename to frmts/gtiff/libgeotiff/gdal_libgeotiff_symbol_rename.h diff --git a/gdal/frmts/gtiff/libgeotiff/geo_config.h b/frmts/gtiff/libgeotiff/geo_config.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_config.h rename to frmts/gtiff/libgeotiff/geo_config.h diff --git a/gdal/frmts/gtiff/libgeotiff/geo_ctrans.inc b/frmts/gtiff/libgeotiff/geo_ctrans.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_ctrans.inc rename to frmts/gtiff/libgeotiff/geo_ctrans.inc diff --git a/gdal/frmts/gtiff/libgeotiff/geo_extra.c b/frmts/gtiff/libgeotiff/geo_extra.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_extra.c rename to frmts/gtiff/libgeotiff/geo_extra.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_free.c b/frmts/gtiff/libgeotiff/geo_free.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_free.c rename to frmts/gtiff/libgeotiff/geo_free.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_get.c b/frmts/gtiff/libgeotiff/geo_get.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_get.c rename to frmts/gtiff/libgeotiff/geo_get.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_keyp.h b/frmts/gtiff/libgeotiff/geo_keyp.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_keyp.h rename to frmts/gtiff/libgeotiff/geo_keyp.h diff --git a/gdal/frmts/gtiff/libgeotiff/geo_names.c b/frmts/gtiff/libgeotiff/geo_names.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_names.c rename to frmts/gtiff/libgeotiff/geo_names.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_new.c b/frmts/gtiff/libgeotiff/geo_new.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_new.c rename to frmts/gtiff/libgeotiff/geo_new.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_normalize.c b/frmts/gtiff/libgeotiff/geo_normalize.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_normalize.c rename to frmts/gtiff/libgeotiff/geo_normalize.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_normalize.h b/frmts/gtiff/libgeotiff/geo_normalize.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_normalize.h rename to frmts/gtiff/libgeotiff/geo_normalize.h diff --git a/gdal/frmts/gtiff/libgeotiff/geo_print.c b/frmts/gtiff/libgeotiff/geo_print.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_print.c rename to frmts/gtiff/libgeotiff/geo_print.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_set.c b/frmts/gtiff/libgeotiff/geo_set.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_set.c rename to frmts/gtiff/libgeotiff/geo_set.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_simpletags.c b/frmts/gtiff/libgeotiff/geo_simpletags.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_simpletags.c rename to frmts/gtiff/libgeotiff/geo_simpletags.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_simpletags.h b/frmts/gtiff/libgeotiff/geo_simpletags.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_simpletags.h rename to frmts/gtiff/libgeotiff/geo_simpletags.h diff --git a/gdal/frmts/gtiff/libgeotiff/geo_tiffp.c b/frmts/gtiff/libgeotiff/geo_tiffp.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_tiffp.c rename to frmts/gtiff/libgeotiff/geo_tiffp.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_tiffp.h b/frmts/gtiff/libgeotiff/geo_tiffp.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_tiffp.h rename to frmts/gtiff/libgeotiff/geo_tiffp.h diff --git a/gdal/frmts/gtiff/libgeotiff/geo_trans.c b/frmts/gtiff/libgeotiff/geo_trans.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_trans.c rename to frmts/gtiff/libgeotiff/geo_trans.c diff --git a/gdal/frmts/gtiff/libgeotiff/geo_write.c b/frmts/gtiff/libgeotiff/geo_write.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geo_write.c rename to frmts/gtiff/libgeotiff/geo_write.c diff --git a/gdal/frmts/gtiff/libgeotiff/geokeys.h b/frmts/gtiff/libgeotiff/geokeys.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geokeys.h rename to frmts/gtiff/libgeotiff/geokeys.h diff --git a/gdal/frmts/gtiff/libgeotiff/geokeys.inc b/frmts/gtiff/libgeotiff/geokeys.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geokeys.inc rename to frmts/gtiff/libgeotiff/geokeys.inc diff --git a/gdal/frmts/gtiff/libgeotiff/geokeys_v1_1.inc b/frmts/gtiff/libgeotiff/geokeys_v1_1.inc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geokeys_v1_1.inc rename to frmts/gtiff/libgeotiff/geokeys_v1_1.inc diff --git a/gdal/frmts/gtiff/libgeotiff/geonames.h b/frmts/gtiff/libgeotiff/geonames.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geonames.h rename to frmts/gtiff/libgeotiff/geonames.h diff --git a/gdal/frmts/gtiff/libgeotiff/geotiff.h b/frmts/gtiff/libgeotiff/geotiff.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geotiff.h rename to frmts/gtiff/libgeotiff/geotiff.h diff --git a/gdal/frmts/gtiff/libgeotiff/geotiff_proj4.c b/frmts/gtiff/libgeotiff/geotiff_proj4.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geotiff_proj4.c rename to frmts/gtiff/libgeotiff/geotiff_proj4.c diff --git a/gdal/frmts/gtiff/libgeotiff/geotiffio.h b/frmts/gtiff/libgeotiff/geotiffio.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geotiffio.h rename to frmts/gtiff/libgeotiff/geotiffio.h diff --git a/gdal/frmts/gtiff/libgeotiff/geovalues.h b/frmts/gtiff/libgeotiff/geovalues.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/geovalues.h rename to frmts/gtiff/libgeotiff/geovalues.h diff --git a/gdal/frmts/gtiff/libgeotiff/makefile.vc b/frmts/gtiff/libgeotiff/makefile.vc similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/makefile.vc rename to frmts/gtiff/libgeotiff/makefile.vc diff --git a/gdal/frmts/gtiff/libgeotiff/xtiff.c b/frmts/gtiff/libgeotiff/xtiff.c similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/xtiff.c rename to frmts/gtiff/libgeotiff/xtiff.c diff --git a/gdal/frmts/gtiff/libgeotiff/xtiffio.h b/frmts/gtiff/libgeotiff/xtiffio.h similarity index 100% rename from gdal/frmts/gtiff/libgeotiff/xtiffio.h rename to frmts/gtiff/libgeotiff/xtiffio.h diff --git a/gdal/frmts/gtiff/libtiff/CMakeLists.txt b/frmts/gtiff/libtiff/CMakeLists.txt similarity index 100% rename from gdal/frmts/gtiff/libtiff/CMakeLists.txt rename to frmts/gtiff/libtiff/CMakeLists.txt diff --git a/gdal/frmts/gtiff/libtiff/GNUmakefile b/frmts/gtiff/libtiff/GNUmakefile similarity index 100% rename from gdal/frmts/gtiff/libtiff/GNUmakefile rename to frmts/gtiff/libtiff/GNUmakefile diff --git a/gdal/frmts/gtiff/libtiff/dump_symbols.sh b/frmts/gtiff/libtiff/dump_symbols.sh similarity index 100% rename from gdal/frmts/gtiff/libtiff/dump_symbols.sh rename to frmts/gtiff/libtiff/dump_symbols.sh diff --git a/gdal/frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h b/frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h rename to frmts/gtiff/libtiff/gdal_libtiff_symbol_rename.h diff --git a/gdal/frmts/gtiff/libtiff/makefile.vc b/frmts/gtiff/libtiff/makefile.vc similarity index 100% rename from gdal/frmts/gtiff/libtiff/makefile.vc rename to frmts/gtiff/libtiff/makefile.vc diff --git a/gdal/frmts/gtiff/libtiff/t4.h b/frmts/gtiff/libtiff/t4.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/t4.h rename to frmts/gtiff/libtiff/t4.h diff --git a/gdal/frmts/gtiff/libtiff/tif_aux.c b/frmts/gtiff/libtiff/tif_aux.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_aux.c rename to frmts/gtiff/libtiff/tif_aux.c diff --git a/gdal/frmts/gtiff/libtiff/tif_close.c b/frmts/gtiff/libtiff/tif_close.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_close.c rename to frmts/gtiff/libtiff/tif_close.c diff --git a/gdal/frmts/gtiff/libtiff/tif_codec.c b/frmts/gtiff/libtiff/tif_codec.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_codec.c rename to frmts/gtiff/libtiff/tif_codec.c diff --git a/gdal/frmts/gtiff/libtiff/tif_color.c b/frmts/gtiff/libtiff/tif_color.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_color.c rename to frmts/gtiff/libtiff/tif_color.c diff --git a/gdal/frmts/gtiff/libtiff/tif_compress.c b/frmts/gtiff/libtiff/tif_compress.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_compress.c rename to frmts/gtiff/libtiff/tif_compress.c diff --git a/gdal/frmts/gtiff/libtiff/tif_config.h b/frmts/gtiff/libtiff/tif_config.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_config.h rename to frmts/gtiff/libtiff/tif_config.h diff --git a/gdal/frmts/gtiff/libtiff/tif_config.h.wince b/frmts/gtiff/libtiff/tif_config.h.wince similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_config.h.wince rename to frmts/gtiff/libtiff/tif_config.h.wince diff --git a/gdal/frmts/gtiff/libtiff/tif_dir.c b/frmts/gtiff/libtiff/tif_dir.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_dir.c rename to frmts/gtiff/libtiff/tif_dir.c diff --git a/gdal/frmts/gtiff/libtiff/tif_dir.h b/frmts/gtiff/libtiff/tif_dir.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_dir.h rename to frmts/gtiff/libtiff/tif_dir.h diff --git a/gdal/frmts/gtiff/libtiff/tif_dirinfo.c b/frmts/gtiff/libtiff/tif_dirinfo.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_dirinfo.c rename to frmts/gtiff/libtiff/tif_dirinfo.c diff --git a/gdal/frmts/gtiff/libtiff/tif_dirread.c b/frmts/gtiff/libtiff/tif_dirread.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_dirread.c rename to frmts/gtiff/libtiff/tif_dirread.c diff --git a/gdal/frmts/gtiff/libtiff/tif_dirwrite.c b/frmts/gtiff/libtiff/tif_dirwrite.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_dirwrite.c rename to frmts/gtiff/libtiff/tif_dirwrite.c diff --git a/gdal/frmts/gtiff/libtiff/tif_dumpmode.c b/frmts/gtiff/libtiff/tif_dumpmode.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_dumpmode.c rename to frmts/gtiff/libtiff/tif_dumpmode.c diff --git a/gdal/frmts/gtiff/libtiff/tif_error.c b/frmts/gtiff/libtiff/tif_error.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_error.c rename to frmts/gtiff/libtiff/tif_error.c diff --git a/gdal/frmts/gtiff/libtiff/tif_extension.c b/frmts/gtiff/libtiff/tif_extension.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_extension.c rename to frmts/gtiff/libtiff/tif_extension.c diff --git a/gdal/frmts/gtiff/libtiff/tif_fax3.c b/frmts/gtiff/libtiff/tif_fax3.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_fax3.c rename to frmts/gtiff/libtiff/tif_fax3.c diff --git a/gdal/frmts/gtiff/libtiff/tif_fax3.h b/frmts/gtiff/libtiff/tif_fax3.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_fax3.h rename to frmts/gtiff/libtiff/tif_fax3.h diff --git a/gdal/frmts/gtiff/libtiff/tif_fax3sm.c b/frmts/gtiff/libtiff/tif_fax3sm.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_fax3sm.c rename to frmts/gtiff/libtiff/tif_fax3sm.c diff --git a/gdal/frmts/gtiff/libtiff/tif_flush.c b/frmts/gtiff/libtiff/tif_flush.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_flush.c rename to frmts/gtiff/libtiff/tif_flush.c diff --git a/gdal/frmts/gtiff/libtiff/tif_getimage.c b/frmts/gtiff/libtiff/tif_getimage.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_getimage.c rename to frmts/gtiff/libtiff/tif_getimage.c diff --git a/gdal/frmts/gtiff/libtiff/tif_jpeg.c b/frmts/gtiff/libtiff/tif_jpeg.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_jpeg.c rename to frmts/gtiff/libtiff/tif_jpeg.c diff --git a/gdal/frmts/gtiff/libtiff/tif_jpeg_12.c b/frmts/gtiff/libtiff/tif_jpeg_12.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_jpeg_12.c rename to frmts/gtiff/libtiff/tif_jpeg_12.c diff --git a/gdal/frmts/gtiff/libtiff/tif_lerc.c b/frmts/gtiff/libtiff/tif_lerc.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_lerc.c rename to frmts/gtiff/libtiff/tif_lerc.c diff --git a/gdal/frmts/gtiff/libtiff/tif_luv.c b/frmts/gtiff/libtiff/tif_luv.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_luv.c rename to frmts/gtiff/libtiff/tif_luv.c diff --git a/gdal/frmts/gtiff/libtiff/tif_lzma.c b/frmts/gtiff/libtiff/tif_lzma.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_lzma.c rename to frmts/gtiff/libtiff/tif_lzma.c diff --git a/gdal/frmts/gtiff/libtiff/tif_lzw.c b/frmts/gtiff/libtiff/tif_lzw.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_lzw.c rename to frmts/gtiff/libtiff/tif_lzw.c diff --git a/gdal/frmts/gtiff/libtiff/tif_next.c b/frmts/gtiff/libtiff/tif_next.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_next.c rename to frmts/gtiff/libtiff/tif_next.c diff --git a/gdal/frmts/gtiff/libtiff/tif_ojpeg.c b/frmts/gtiff/libtiff/tif_ojpeg.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_ojpeg.c rename to frmts/gtiff/libtiff/tif_ojpeg.c diff --git a/gdal/frmts/gtiff/libtiff/tif_open.c b/frmts/gtiff/libtiff/tif_open.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_open.c rename to frmts/gtiff/libtiff/tif_open.c diff --git a/gdal/frmts/gtiff/libtiff/tif_packbits.c b/frmts/gtiff/libtiff/tif_packbits.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_packbits.c rename to frmts/gtiff/libtiff/tif_packbits.c diff --git a/gdal/frmts/gtiff/libtiff/tif_pixarlog.c b/frmts/gtiff/libtiff/tif_pixarlog.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_pixarlog.c rename to frmts/gtiff/libtiff/tif_pixarlog.c diff --git a/gdal/frmts/gtiff/libtiff/tif_predict.c b/frmts/gtiff/libtiff/tif_predict.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_predict.c rename to frmts/gtiff/libtiff/tif_predict.c diff --git a/gdal/frmts/gtiff/libtiff/tif_predict.h b/frmts/gtiff/libtiff/tif_predict.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_predict.h rename to frmts/gtiff/libtiff/tif_predict.h diff --git a/gdal/frmts/gtiff/libtiff/tif_print.c b/frmts/gtiff/libtiff/tif_print.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_print.c rename to frmts/gtiff/libtiff/tif_print.c diff --git a/gdal/frmts/gtiff/libtiff/tif_read.c b/frmts/gtiff/libtiff/tif_read.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_read.c rename to frmts/gtiff/libtiff/tif_read.c diff --git a/gdal/frmts/gtiff/libtiff/tif_strip.c b/frmts/gtiff/libtiff/tif_strip.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_strip.c rename to frmts/gtiff/libtiff/tif_strip.c diff --git a/gdal/frmts/gtiff/libtiff/tif_swab.c b/frmts/gtiff/libtiff/tif_swab.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_swab.c rename to frmts/gtiff/libtiff/tif_swab.c diff --git a/gdal/frmts/gtiff/libtiff/tif_thunder.c b/frmts/gtiff/libtiff/tif_thunder.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_thunder.c rename to frmts/gtiff/libtiff/tif_thunder.c diff --git a/gdal/frmts/gtiff/libtiff/tif_tile.c b/frmts/gtiff/libtiff/tif_tile.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_tile.c rename to frmts/gtiff/libtiff/tif_tile.c diff --git a/gdal/frmts/gtiff/libtiff/tif_version.c b/frmts/gtiff/libtiff/tif_version.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_version.c rename to frmts/gtiff/libtiff/tif_version.c diff --git a/gdal/frmts/gtiff/libtiff/tif_vsi.c b/frmts/gtiff/libtiff/tif_vsi.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_vsi.c rename to frmts/gtiff/libtiff/tif_vsi.c diff --git a/gdal/frmts/gtiff/libtiff/tif_warning.c b/frmts/gtiff/libtiff/tif_warning.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_warning.c rename to frmts/gtiff/libtiff/tif_warning.c diff --git a/gdal/frmts/gtiff/libtiff/tif_webp.c b/frmts/gtiff/libtiff/tif_webp.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_webp.c rename to frmts/gtiff/libtiff/tif_webp.c diff --git a/gdal/frmts/gtiff/libtiff/tif_write.c b/frmts/gtiff/libtiff/tif_write.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_write.c rename to frmts/gtiff/libtiff/tif_write.c diff --git a/gdal/frmts/gtiff/libtiff/tif_zip.c b/frmts/gtiff/libtiff/tif_zip.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_zip.c rename to frmts/gtiff/libtiff/tif_zip.c diff --git a/gdal/frmts/gtiff/libtiff/tif_zstd.c b/frmts/gtiff/libtiff/tif_zstd.c similarity index 100% rename from gdal/frmts/gtiff/libtiff/tif_zstd.c rename to frmts/gtiff/libtiff/tif_zstd.c diff --git a/gdal/frmts/gtiff/libtiff/tiff.h b/frmts/gtiff/libtiff/tiff.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tiff.h rename to frmts/gtiff/libtiff/tiff.h diff --git a/gdal/frmts/gtiff/libtiff/tiffconf.h b/frmts/gtiff/libtiff/tiffconf.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tiffconf.h rename to frmts/gtiff/libtiff/tiffconf.h diff --git a/gdal/frmts/gtiff/libtiff/tiffio.h b/frmts/gtiff/libtiff/tiffio.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tiffio.h rename to frmts/gtiff/libtiff/tiffio.h diff --git a/gdal/frmts/gtiff/libtiff/tiffiop.h b/frmts/gtiff/libtiff/tiffiop.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tiffiop.h rename to frmts/gtiff/libtiff/tiffiop.h diff --git a/gdal/frmts/gtiff/libtiff/tiffvers.h b/frmts/gtiff/libtiff/tiffvers.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/tiffvers.h rename to frmts/gtiff/libtiff/tiffvers.h diff --git a/gdal/frmts/gtiff/libtiff/uvcode.h b/frmts/gtiff/libtiff/uvcode.h similarity index 100% rename from gdal/frmts/gtiff/libtiff/uvcode.h rename to frmts/gtiff/libtiff/uvcode.h diff --git a/gdal/frmts/gtiff/makefile.vc b/frmts/gtiff/makefile.vc similarity index 100% rename from gdal/frmts/gtiff/makefile.vc rename to frmts/gtiff/makefile.vc diff --git a/gdal/frmts/gtiff/quant_table_md5sum.h b/frmts/gtiff/quant_table_md5sum.h similarity index 100% rename from gdal/frmts/gtiff/quant_table_md5sum.h rename to frmts/gtiff/quant_table_md5sum.h diff --git a/gdal/frmts/gtiff/tif_float.c b/frmts/gtiff/tif_float.c similarity index 100% rename from gdal/frmts/gtiff/tif_float.c rename to frmts/gtiff/tif_float.c diff --git a/gdal/frmts/gtiff/tif_float.h b/frmts/gtiff/tif_float.h similarity index 100% rename from gdal/frmts/gtiff/tif_float.h rename to frmts/gtiff/tif_float.h diff --git a/gdal/frmts/gtiff/tif_jxl.c b/frmts/gtiff/tif_jxl.c similarity index 100% rename from gdal/frmts/gtiff/tif_jxl.c rename to frmts/gtiff/tif_jxl.c diff --git a/gdal/frmts/gtiff/tif_jxl.h b/frmts/gtiff/tif_jxl.h similarity index 100% rename from gdal/frmts/gtiff/tif_jxl.h rename to frmts/gtiff/tif_jxl.h diff --git a/gdal/frmts/gtiff/tifvsi.cpp b/frmts/gtiff/tifvsi.cpp similarity index 100% rename from gdal/frmts/gtiff/tifvsi.cpp rename to frmts/gtiff/tifvsi.cpp diff --git a/gdal/frmts/gtiff/tifvsi.h b/frmts/gtiff/tifvsi.h similarity index 100% rename from gdal/frmts/gtiff/tifvsi.h rename to frmts/gtiff/tifvsi.h diff --git a/gdal/frmts/gxf/CMakeLists.txt b/frmts/gxf/CMakeLists.txt similarity index 100% rename from gdal/frmts/gxf/CMakeLists.txt rename to frmts/gxf/CMakeLists.txt diff --git a/gdal/frmts/gxf/Doxyfile b/frmts/gxf/Doxyfile similarity index 100% rename from gdal/frmts/gxf/Doxyfile rename to frmts/gxf/Doxyfile diff --git a/gdal/frmts/gxf/GNUmakefile b/frmts/gxf/GNUmakefile similarity index 100% rename from gdal/frmts/gxf/GNUmakefile rename to frmts/gxf/GNUmakefile diff --git a/gdal/frmts/gxf/Makefile.in b/frmts/gxf/Makefile.in similarity index 100% rename from gdal/frmts/gxf/Makefile.in rename to frmts/gxf/Makefile.in diff --git a/gdal/frmts/gxf/README b/frmts/gxf/README similarity index 100% rename from gdal/frmts/gxf/README rename to frmts/gxf/README diff --git a/gdal/frmts/gxf/configure.in b/frmts/gxf/configure.in similarity index 100% rename from gdal/frmts/gxf/configure.in rename to frmts/gxf/configure.in diff --git a/gdal/frmts/gxf/gxf.dox b/frmts/gxf/gxf.dox similarity index 100% rename from gdal/frmts/gxf/gxf.dox rename to frmts/gxf/gxf.dox diff --git a/gdal/frmts/gxf/gxf_ogcwkt.c b/frmts/gxf/gxf_ogcwkt.c similarity index 100% rename from gdal/frmts/gxf/gxf_ogcwkt.c rename to frmts/gxf/gxf_ogcwkt.c diff --git a/gdal/frmts/gxf/gxf_proj4.c b/frmts/gxf/gxf_proj4.c similarity index 100% rename from gdal/frmts/gxf/gxf_proj4.c rename to frmts/gxf/gxf_proj4.c diff --git a/gdal/frmts/gxf/gxfdataset.cpp b/frmts/gxf/gxfdataset.cpp similarity index 100% rename from gdal/frmts/gxf/gxfdataset.cpp rename to frmts/gxf/gxfdataset.cpp diff --git a/gdal/frmts/gxf/gxfopen.c b/frmts/gxf/gxfopen.c similarity index 100% rename from gdal/frmts/gxf/gxfopen.c rename to frmts/gxf/gxfopen.c diff --git a/gdal/frmts/gxf/gxfopen.h b/frmts/gxf/gxfopen.h similarity index 100% rename from gdal/frmts/gxf/gxfopen.h rename to frmts/gxf/gxfopen.h diff --git a/gdal/frmts/gxf/makefile.vc b/frmts/gxf/makefile.vc similarity index 100% rename from gdal/frmts/gxf/makefile.vc rename to frmts/gxf/makefile.vc diff --git a/gdal/frmts/gxf/makefile.vc.dist b/frmts/gxf/makefile.vc.dist similarity index 100% rename from gdal/frmts/gxf/makefile.vc.dist rename to frmts/gxf/makefile.vc.dist diff --git a/gdal/frmts/hdf4/CMakeLists.txt b/frmts/hdf4/CMakeLists.txt similarity index 100% rename from gdal/frmts/hdf4/CMakeLists.txt rename to frmts/hdf4/CMakeLists.txt diff --git a/gdal/frmts/hdf4/GNUmakefile b/frmts/hdf4/GNUmakefile similarity index 100% rename from gdal/frmts/hdf4/GNUmakefile rename to frmts/hdf4/GNUmakefile diff --git a/gdal/frmts/hdf4/hdf-eos/EHapi.c b/frmts/hdf4/hdf-eos/EHapi.c similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/EHapi.c rename to frmts/hdf4/hdf-eos/EHapi.c diff --git a/gdal/frmts/hdf4/hdf-eos/GDapi.c b/frmts/hdf4/hdf-eos/GDapi.c similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/GDapi.c rename to frmts/hdf4/hdf-eos/GDapi.c diff --git a/gdal/frmts/hdf4/hdf-eos/GNUmakefile b/frmts/hdf4/hdf-eos/GNUmakefile similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/GNUmakefile rename to frmts/hdf4/hdf-eos/GNUmakefile diff --git a/gdal/frmts/hdf4/hdf-eos/HDFEOSVersion.h b/frmts/hdf4/hdf-eos/HDFEOSVersion.h similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/HDFEOSVersion.h rename to frmts/hdf4/hdf-eos/HDFEOSVersion.h diff --git a/gdal/frmts/hdf4/hdf-eos/HdfEosDef.h b/frmts/hdf4/hdf-eos/HdfEosDef.h similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/HdfEosDef.h rename to frmts/hdf4/hdf-eos/HdfEosDef.h diff --git a/gdal/frmts/hdf4/hdf-eos/README b/frmts/hdf4/hdf-eos/README similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/README rename to frmts/hdf4/hdf-eos/README diff --git a/gdal/frmts/hdf4/hdf-eos/SWapi.c b/frmts/hdf4/hdf-eos/SWapi.c similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/SWapi.c rename to frmts/hdf4/hdf-eos/SWapi.c diff --git a/gdal/frmts/hdf4/hdf-eos/ease.h b/frmts/hdf4/hdf-eos/ease.h similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/ease.h rename to frmts/hdf4/hdf-eos/ease.h diff --git a/gdal/frmts/hdf4/hdf-eos/gctp_wrap.c b/frmts/hdf4/hdf-eos/gctp_wrap.c similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/gctp_wrap.c rename to frmts/hdf4/hdf-eos/gctp_wrap.c diff --git a/gdal/frmts/hdf4/hdf-eos/makefile.vc b/frmts/hdf4/hdf-eos/makefile.vc similarity index 100% rename from gdal/frmts/hdf4/hdf-eos/makefile.vc rename to frmts/hdf4/hdf-eos/makefile.vc diff --git a/gdal/frmts/hdf4/hdf4compat.h b/frmts/hdf4/hdf4compat.h similarity index 100% rename from gdal/frmts/hdf4/hdf4compat.h rename to frmts/hdf4/hdf4compat.h diff --git a/gdal/frmts/hdf4/hdf4dataset.cpp b/frmts/hdf4/hdf4dataset.cpp similarity index 100% rename from gdal/frmts/hdf4/hdf4dataset.cpp rename to frmts/hdf4/hdf4dataset.cpp diff --git a/gdal/frmts/hdf4/hdf4dataset.h b/frmts/hdf4/hdf4dataset.h similarity index 100% rename from gdal/frmts/hdf4/hdf4dataset.h rename to frmts/hdf4/hdf4dataset.h diff --git a/gdal/frmts/hdf4/hdf4imagedataset.cpp b/frmts/hdf4/hdf4imagedataset.cpp similarity index 100% rename from gdal/frmts/hdf4/hdf4imagedataset.cpp rename to frmts/hdf4/hdf4imagedataset.cpp diff --git a/gdal/frmts/hdf4/hdf4multidim.cpp b/frmts/hdf4/hdf4multidim.cpp similarity index 100% rename from gdal/frmts/hdf4/hdf4multidim.cpp rename to frmts/hdf4/hdf4multidim.cpp diff --git a/gdal/frmts/hdf4/makefile.vc b/frmts/hdf4/makefile.vc similarity index 100% rename from gdal/frmts/hdf4/makefile.vc rename to frmts/hdf4/makefile.vc diff --git a/gdal/frmts/hdf5/CMakeLists.txt b/frmts/hdf5/CMakeLists.txt similarity index 100% rename from gdal/frmts/hdf5/CMakeLists.txt rename to frmts/hdf5/CMakeLists.txt diff --git a/gdal/frmts/hdf5/GNUmakefile b/frmts/hdf5/GNUmakefile similarity index 100% rename from gdal/frmts/hdf5/GNUmakefile rename to frmts/hdf5/GNUmakefile diff --git a/gdal/frmts/hdf5/bagdataset.cpp b/frmts/hdf5/bagdataset.cpp similarity index 100% rename from gdal/frmts/hdf5/bagdataset.cpp rename to frmts/hdf5/bagdataset.cpp diff --git a/gdal/frmts/hdf5/gh5_convenience.cpp b/frmts/hdf5/gh5_convenience.cpp similarity index 100% rename from gdal/frmts/hdf5/gh5_convenience.cpp rename to frmts/hdf5/gh5_convenience.cpp diff --git a/gdal/frmts/hdf5/gh5_convenience.h b/frmts/hdf5/gh5_convenience.h similarity index 100% rename from gdal/frmts/hdf5/gh5_convenience.h rename to frmts/hdf5/gh5_convenience.h diff --git a/gdal/frmts/hdf5/hdf5_api.h b/frmts/hdf5/hdf5_api.h similarity index 100% rename from gdal/frmts/hdf5/hdf5_api.h rename to frmts/hdf5/hdf5_api.h diff --git a/gdal/frmts/hdf5/hdf5dataset.cpp b/frmts/hdf5/hdf5dataset.cpp similarity index 100% rename from gdal/frmts/hdf5/hdf5dataset.cpp rename to frmts/hdf5/hdf5dataset.cpp diff --git a/gdal/frmts/hdf5/hdf5dataset.h b/frmts/hdf5/hdf5dataset.h similarity index 100% rename from gdal/frmts/hdf5/hdf5dataset.h rename to frmts/hdf5/hdf5dataset.h diff --git a/gdal/frmts/hdf5/hdf5imagedataset.cpp b/frmts/hdf5/hdf5imagedataset.cpp similarity index 100% rename from gdal/frmts/hdf5/hdf5imagedataset.cpp rename to frmts/hdf5/hdf5imagedataset.cpp diff --git a/gdal/frmts/hdf5/hdf5multidim.cpp b/frmts/hdf5/hdf5multidim.cpp similarity index 100% rename from gdal/frmts/hdf5/hdf5multidim.cpp rename to frmts/hdf5/hdf5multidim.cpp diff --git a/gdal/frmts/hdf5/hdf5vfl.h b/frmts/hdf5/hdf5vfl.h similarity index 100% rename from gdal/frmts/hdf5/hdf5vfl.h rename to frmts/hdf5/hdf5vfl.h diff --git a/gdal/frmts/hdf5/iso19115_srs.cpp b/frmts/hdf5/iso19115_srs.cpp similarity index 100% rename from gdal/frmts/hdf5/iso19115_srs.cpp rename to frmts/hdf5/iso19115_srs.cpp diff --git a/gdal/frmts/hdf5/iso19115_srs.h b/frmts/hdf5/iso19115_srs.h similarity index 100% rename from gdal/frmts/hdf5/iso19115_srs.h rename to frmts/hdf5/iso19115_srs.h diff --git a/gdal/frmts/hdf5/makefile.vc b/frmts/hdf5/makefile.vc similarity index 100% rename from gdal/frmts/hdf5/makefile.vc rename to frmts/hdf5/makefile.vc diff --git a/gdal/frmts/heif/CMakeLists.txt b/frmts/heif/CMakeLists.txt similarity index 100% rename from gdal/frmts/heif/CMakeLists.txt rename to frmts/heif/CMakeLists.txt diff --git a/gdal/frmts/heif/GNUmakefile b/frmts/heif/GNUmakefile similarity index 100% rename from gdal/frmts/heif/GNUmakefile rename to frmts/heif/GNUmakefile diff --git a/gdal/frmts/heif/heifdataset.cpp b/frmts/heif/heifdataset.cpp similarity index 100% rename from gdal/frmts/heif/heifdataset.cpp rename to frmts/heif/heifdataset.cpp diff --git a/gdal/frmts/heif/makefile.vc b/frmts/heif/makefile.vc similarity index 100% rename from gdal/frmts/heif/makefile.vc rename to frmts/heif/makefile.vc diff --git a/gdal/frmts/hf2/CMakeLists.txt b/frmts/hf2/CMakeLists.txt similarity index 100% rename from gdal/frmts/hf2/CMakeLists.txt rename to frmts/hf2/CMakeLists.txt diff --git a/gdal/frmts/hf2/GNUmakefile b/frmts/hf2/GNUmakefile similarity index 100% rename from gdal/frmts/hf2/GNUmakefile rename to frmts/hf2/GNUmakefile diff --git a/gdal/frmts/hf2/hf2dataset.cpp b/frmts/hf2/hf2dataset.cpp similarity index 100% rename from gdal/frmts/hf2/hf2dataset.cpp rename to frmts/hf2/hf2dataset.cpp diff --git a/gdal/frmts/hf2/makefile.vc b/frmts/hf2/makefile.vc similarity index 100% rename from gdal/frmts/hf2/makefile.vc rename to frmts/hf2/makefile.vc diff --git a/gdal/frmts/hfa/CMakeLists.txt b/frmts/hfa/CMakeLists.txt similarity index 100% rename from gdal/frmts/hfa/CMakeLists.txt rename to frmts/hfa/CMakeLists.txt diff --git a/gdal/frmts/hfa/GNUmakefile b/frmts/hfa/GNUmakefile similarity index 100% rename from gdal/frmts/hfa/GNUmakefile rename to frmts/hfa/GNUmakefile diff --git a/gdal/frmts/hfa/TODO_Projections.txt b/frmts/hfa/TODO_Projections.txt similarity index 100% rename from gdal/frmts/hfa/TODO_Projections.txt rename to frmts/hfa/TODO_Projections.txt diff --git a/gdal/frmts/hfa/hfa.h b/frmts/hfa/hfa.h similarity index 100% rename from gdal/frmts/hfa/hfa.h rename to frmts/hfa/hfa.h diff --git a/gdal/frmts/hfa/hfa_overviews.cpp b/frmts/hfa/hfa_overviews.cpp similarity index 100% rename from gdal/frmts/hfa/hfa_overviews.cpp rename to frmts/hfa/hfa_overviews.cpp diff --git a/gdal/frmts/hfa/hfa_p.h b/frmts/hfa/hfa_p.h similarity index 100% rename from gdal/frmts/hfa/hfa_p.h rename to frmts/hfa/hfa_p.h diff --git a/gdal/frmts/hfa/hfaband.cpp b/frmts/hfa/hfaband.cpp similarity index 100% rename from gdal/frmts/hfa/hfaband.cpp rename to frmts/hfa/hfaband.cpp diff --git a/gdal/frmts/hfa/hfacompress.cpp b/frmts/hfa/hfacompress.cpp similarity index 100% rename from gdal/frmts/hfa/hfacompress.cpp rename to frmts/hfa/hfacompress.cpp diff --git a/gdal/frmts/hfa/hfadataset.cpp b/frmts/hfa/hfadataset.cpp similarity index 100% rename from gdal/frmts/hfa/hfadataset.cpp rename to frmts/hfa/hfadataset.cpp diff --git a/gdal/frmts/hfa/hfadataset.h b/frmts/hfa/hfadataset.h similarity index 100% rename from gdal/frmts/hfa/hfadataset.h rename to frmts/hfa/hfadataset.h diff --git a/gdal/frmts/hfa/hfadictionary.cpp b/frmts/hfa/hfadictionary.cpp similarity index 100% rename from gdal/frmts/hfa/hfadictionary.cpp rename to frmts/hfa/hfadictionary.cpp diff --git a/gdal/frmts/hfa/hfaentry.cpp b/frmts/hfa/hfaentry.cpp similarity index 100% rename from gdal/frmts/hfa/hfaentry.cpp rename to frmts/hfa/hfaentry.cpp diff --git a/gdal/frmts/hfa/hfafield.cpp b/frmts/hfa/hfafield.cpp similarity index 100% rename from gdal/frmts/hfa/hfafield.cpp rename to frmts/hfa/hfafield.cpp diff --git a/gdal/frmts/hfa/hfaopen.cpp b/frmts/hfa/hfaopen.cpp similarity index 100% rename from gdal/frmts/hfa/hfaopen.cpp rename to frmts/hfa/hfaopen.cpp diff --git a/gdal/frmts/hfa/hfatest.cpp b/frmts/hfa/hfatest.cpp similarity index 100% rename from gdal/frmts/hfa/hfatest.cpp rename to frmts/hfa/hfatest.cpp diff --git a/gdal/frmts/hfa/hfatype.cpp b/frmts/hfa/hfatype.cpp similarity index 100% rename from gdal/frmts/hfa/hfatype.cpp rename to frmts/hfa/hfatype.cpp diff --git a/gdal/frmts/hfa/makefile.vc b/frmts/hfa/makefile.vc similarity index 100% rename from gdal/frmts/hfa/makefile.vc rename to frmts/hfa/makefile.vc diff --git a/gdal/frmts/idrisi/CMakeLists.txt b/frmts/idrisi/CMakeLists.txt similarity index 100% rename from gdal/frmts/idrisi/CMakeLists.txt rename to frmts/idrisi/CMakeLists.txt diff --git a/gdal/frmts/idrisi/GNUmakefile b/frmts/idrisi/GNUmakefile similarity index 100% rename from gdal/frmts/idrisi/GNUmakefile rename to frmts/idrisi/GNUmakefile diff --git a/gdal/frmts/idrisi/IdrisiDataset.cpp b/frmts/idrisi/IdrisiDataset.cpp similarity index 100% rename from gdal/frmts/idrisi/IdrisiDataset.cpp rename to frmts/idrisi/IdrisiDataset.cpp diff --git a/gdal/frmts/idrisi/idrisi.h b/frmts/idrisi/idrisi.h similarity index 100% rename from gdal/frmts/idrisi/idrisi.h rename to frmts/idrisi/idrisi.h diff --git a/gdal/frmts/idrisi/makefile.vc b/frmts/idrisi/makefile.vc similarity index 100% rename from gdal/frmts/idrisi/makefile.vc rename to frmts/idrisi/makefile.vc diff --git a/gdal/frmts/idrisi/rdc.txt b/frmts/idrisi/rdc.txt similarity index 100% rename from gdal/frmts/idrisi/rdc.txt rename to frmts/idrisi/rdc.txt diff --git a/gdal/frmts/idrisi/rst.txt b/frmts/idrisi/rst.txt similarity index 100% rename from gdal/frmts/idrisi/rst.txt rename to frmts/idrisi/rst.txt diff --git a/gdal/frmts/ilwis/CMakeLists.txt b/frmts/ilwis/CMakeLists.txt similarity index 100% rename from gdal/frmts/ilwis/CMakeLists.txt rename to frmts/ilwis/CMakeLists.txt diff --git a/gdal/frmts/ilwis/GNUmakefile b/frmts/ilwis/GNUmakefile similarity index 100% rename from gdal/frmts/ilwis/GNUmakefile rename to frmts/ilwis/GNUmakefile diff --git a/gdal/frmts/ilwis/ilwiscoordinatesystem.cpp b/frmts/ilwis/ilwiscoordinatesystem.cpp similarity index 100% rename from gdal/frmts/ilwis/ilwiscoordinatesystem.cpp rename to frmts/ilwis/ilwiscoordinatesystem.cpp diff --git a/gdal/frmts/ilwis/ilwisdataset.cpp b/frmts/ilwis/ilwisdataset.cpp similarity index 100% rename from gdal/frmts/ilwis/ilwisdataset.cpp rename to frmts/ilwis/ilwisdataset.cpp diff --git a/gdal/frmts/ilwis/ilwisdataset.h b/frmts/ilwis/ilwisdataset.h similarity index 100% rename from gdal/frmts/ilwis/ilwisdataset.h rename to frmts/ilwis/ilwisdataset.h diff --git a/gdal/frmts/ilwis/makefile.vc b/frmts/ilwis/makefile.vc similarity index 100% rename from gdal/frmts/ilwis/makefile.vc rename to frmts/ilwis/makefile.vc diff --git a/gdal/frmts/ingr/CMakeLists.txt b/frmts/ingr/CMakeLists.txt similarity index 100% rename from gdal/frmts/ingr/CMakeLists.txt rename to frmts/ingr/CMakeLists.txt diff --git a/gdal/frmts/ingr/GNUmakefile b/frmts/ingr/GNUmakefile similarity index 100% rename from gdal/frmts/ingr/GNUmakefile rename to frmts/ingr/GNUmakefile diff --git a/gdal/frmts/ingr/IngrTypes.cpp b/frmts/ingr/IngrTypes.cpp similarity index 100% rename from gdal/frmts/ingr/IngrTypes.cpp rename to frmts/ingr/IngrTypes.cpp diff --git a/gdal/frmts/ingr/IngrTypes.h b/frmts/ingr/IngrTypes.h similarity index 100% rename from gdal/frmts/ingr/IngrTypes.h rename to frmts/ingr/IngrTypes.h diff --git a/gdal/frmts/ingr/IntergraphBand.cpp b/frmts/ingr/IntergraphBand.cpp similarity index 100% rename from gdal/frmts/ingr/IntergraphBand.cpp rename to frmts/ingr/IntergraphBand.cpp diff --git a/gdal/frmts/ingr/IntergraphBand.h b/frmts/ingr/IntergraphBand.h similarity index 100% rename from gdal/frmts/ingr/IntergraphBand.h rename to frmts/ingr/IntergraphBand.h diff --git a/gdal/frmts/ingr/IntergraphDataset.cpp b/frmts/ingr/IntergraphDataset.cpp similarity index 100% rename from gdal/frmts/ingr/IntergraphDataset.cpp rename to frmts/ingr/IntergraphDataset.cpp diff --git a/gdal/frmts/ingr/IntergraphDataset.h b/frmts/ingr/IntergraphDataset.h similarity index 100% rename from gdal/frmts/ingr/IntergraphDataset.h rename to frmts/ingr/IntergraphDataset.h diff --git a/gdal/frmts/ingr/JpegHelper.cpp b/frmts/ingr/JpegHelper.cpp similarity index 100% rename from gdal/frmts/ingr/JpegHelper.cpp rename to frmts/ingr/JpegHelper.cpp diff --git a/gdal/frmts/ingr/JpegHelper.h b/frmts/ingr/JpegHelper.h similarity index 100% rename from gdal/frmts/ingr/JpegHelper.h rename to frmts/ingr/JpegHelper.h diff --git a/gdal/frmts/ingr/makefile.vc b/frmts/ingr/makefile.vc similarity index 100% rename from gdal/frmts/ingr/makefile.vc rename to frmts/ingr/makefile.vc diff --git a/gdal/frmts/iris/CMakeLists.txt b/frmts/iris/CMakeLists.txt similarity index 100% rename from gdal/frmts/iris/CMakeLists.txt rename to frmts/iris/CMakeLists.txt diff --git a/gdal/frmts/iris/GNUmakefile b/frmts/iris/GNUmakefile similarity index 100% rename from gdal/frmts/iris/GNUmakefile rename to frmts/iris/GNUmakefile diff --git a/gdal/frmts/iris/irisdataset.cpp b/frmts/iris/irisdataset.cpp similarity index 100% rename from gdal/frmts/iris/irisdataset.cpp rename to frmts/iris/irisdataset.cpp diff --git a/gdal/frmts/iris/makefile.vc b/frmts/iris/makefile.vc similarity index 100% rename from gdal/frmts/iris/makefile.vc rename to frmts/iris/makefile.vc diff --git a/gdal/frmts/iso8211/8211createfromxml.cpp b/frmts/iso8211/8211createfromxml.cpp similarity index 100% rename from gdal/frmts/iso8211/8211createfromxml.cpp rename to frmts/iso8211/8211createfromxml.cpp diff --git a/gdal/frmts/iso8211/8211dump.cpp b/frmts/iso8211/8211dump.cpp similarity index 100% rename from gdal/frmts/iso8211/8211dump.cpp rename to frmts/iso8211/8211dump.cpp diff --git a/gdal/frmts/iso8211/8211view.cpp b/frmts/iso8211/8211view.cpp similarity index 100% rename from gdal/frmts/iso8211/8211view.cpp rename to frmts/iso8211/8211view.cpp diff --git a/gdal/frmts/iso8211/CMakeLists.txt b/frmts/iso8211/CMakeLists.txt similarity index 100% rename from gdal/frmts/iso8211/CMakeLists.txt rename to frmts/iso8211/CMakeLists.txt diff --git a/gdal/frmts/iso8211/Doxyfile b/frmts/iso8211/Doxyfile similarity index 100% rename from gdal/frmts/iso8211/Doxyfile rename to frmts/iso8211/Doxyfile diff --git a/gdal/frmts/iso8211/GNUmakefile b/frmts/iso8211/GNUmakefile similarity index 100% rename from gdal/frmts/iso8211/GNUmakefile rename to frmts/iso8211/GNUmakefile diff --git a/gdal/frmts/iso8211/Makefile.in b/frmts/iso8211/Makefile.in similarity index 100% rename from gdal/frmts/iso8211/Makefile.in rename to frmts/iso8211/Makefile.in diff --git a/gdal/frmts/iso8211/aclocal.m4 b/frmts/iso8211/aclocal.m4 similarity index 100% rename from gdal/frmts/iso8211/aclocal.m4 rename to frmts/iso8211/aclocal.m4 diff --git a/gdal/frmts/iso8211/configure.in b/frmts/iso8211/configure.in similarity index 100% rename from gdal/frmts/iso8211/configure.in rename to frmts/iso8211/configure.in diff --git a/gdal/frmts/iso8211/ddffield.cpp b/frmts/iso8211/ddffield.cpp similarity index 100% rename from gdal/frmts/iso8211/ddffield.cpp rename to frmts/iso8211/ddffield.cpp diff --git a/gdal/frmts/iso8211/ddffielddefn.cpp b/frmts/iso8211/ddffielddefn.cpp similarity index 100% rename from gdal/frmts/iso8211/ddffielddefn.cpp rename to frmts/iso8211/ddffielddefn.cpp diff --git a/gdal/frmts/iso8211/ddfmodule.cpp b/frmts/iso8211/ddfmodule.cpp similarity index 100% rename from gdal/frmts/iso8211/ddfmodule.cpp rename to frmts/iso8211/ddfmodule.cpp diff --git a/gdal/frmts/iso8211/ddfrecord.cpp b/frmts/iso8211/ddfrecord.cpp similarity index 100% rename from gdal/frmts/iso8211/ddfrecord.cpp rename to frmts/iso8211/ddfrecord.cpp diff --git a/gdal/frmts/iso8211/ddfsubfielddefn.cpp b/frmts/iso8211/ddfsubfielddefn.cpp similarity index 100% rename from gdal/frmts/iso8211/ddfsubfielddefn.cpp rename to frmts/iso8211/ddfsubfielddefn.cpp diff --git a/gdal/frmts/iso8211/ddfutils.cpp b/frmts/iso8211/ddfutils.cpp similarity index 100% rename from gdal/frmts/iso8211/ddfutils.cpp rename to frmts/iso8211/ddfutils.cpp diff --git a/gdal/frmts/iso8211/intro.dox b/frmts/iso8211/intro.dox similarity index 100% rename from gdal/frmts/iso8211/intro.dox rename to frmts/iso8211/intro.dox diff --git a/gdal/frmts/iso8211/iso8211.h b/frmts/iso8211/iso8211.h similarity index 100% rename from gdal/frmts/iso8211/iso8211.h rename to frmts/iso8211/iso8211.h diff --git a/gdal/frmts/iso8211/makefile.vc b/frmts/iso8211/makefile.vc similarity index 100% rename from gdal/frmts/iso8211/makefile.vc rename to frmts/iso8211/makefile.vc diff --git a/gdal/frmts/iso8211/mkcatalog.cpp b/frmts/iso8211/mkcatalog.cpp similarity index 100% rename from gdal/frmts/iso8211/mkcatalog.cpp rename to frmts/iso8211/mkcatalog.cpp diff --git a/gdal/frmts/iso8211/teststream.out b/frmts/iso8211/teststream.out similarity index 100% rename from gdal/frmts/iso8211/teststream.out rename to frmts/iso8211/teststream.out diff --git a/gdal/frmts/iso8211/teststream.sh b/frmts/iso8211/teststream.sh similarity index 100% rename from gdal/frmts/iso8211/teststream.sh rename to frmts/iso8211/teststream.sh diff --git a/gdal/frmts/iso8211/timetest.cpp b/frmts/iso8211/timetest.cpp similarity index 100% rename from gdal/frmts/iso8211/timetest.cpp rename to frmts/iso8211/timetest.cpp diff --git a/gdal/frmts/jaxapalsar/CMakeLists.txt b/frmts/jaxapalsar/CMakeLists.txt similarity index 100% rename from gdal/frmts/jaxapalsar/CMakeLists.txt rename to frmts/jaxapalsar/CMakeLists.txt diff --git a/gdal/frmts/jaxapalsar/GNUmakefile b/frmts/jaxapalsar/GNUmakefile similarity index 100% rename from gdal/frmts/jaxapalsar/GNUmakefile rename to frmts/jaxapalsar/GNUmakefile diff --git a/gdal/frmts/jaxapalsar/jaxapalsardataset.cpp b/frmts/jaxapalsar/jaxapalsardataset.cpp similarity index 100% rename from gdal/frmts/jaxapalsar/jaxapalsardataset.cpp rename to frmts/jaxapalsar/jaxapalsardataset.cpp diff --git a/gdal/frmts/jaxapalsar/makefile.vc b/frmts/jaxapalsar/makefile.vc similarity index 100% rename from gdal/frmts/jaxapalsar/makefile.vc rename to frmts/jaxapalsar/makefile.vc diff --git a/gdal/frmts/jdem/CMakeLists.txt b/frmts/jdem/CMakeLists.txt similarity index 100% rename from gdal/frmts/jdem/CMakeLists.txt rename to frmts/jdem/CMakeLists.txt diff --git a/gdal/frmts/jdem/GNUmakefile b/frmts/jdem/GNUmakefile similarity index 100% rename from gdal/frmts/jdem/GNUmakefile rename to frmts/jdem/GNUmakefile diff --git a/gdal/frmts/jdem/jdemdataset.cpp b/frmts/jdem/jdemdataset.cpp similarity index 100% rename from gdal/frmts/jdem/jdemdataset.cpp rename to frmts/jdem/jdemdataset.cpp diff --git a/gdal/frmts/jdem/makefile.vc b/frmts/jdem/makefile.vc similarity index 100% rename from gdal/frmts/jdem/makefile.vc rename to frmts/jdem/makefile.vc diff --git a/gdal/frmts/jp2kak/CMakeLists.txt b/frmts/jp2kak/CMakeLists.txt similarity index 100% rename from gdal/frmts/jp2kak/CMakeLists.txt rename to frmts/jp2kak/CMakeLists.txt diff --git a/gdal/frmts/jp2kak/GNUmakefile b/frmts/jp2kak/GNUmakefile similarity index 100% rename from gdal/frmts/jp2kak/GNUmakefile rename to frmts/jp2kak/GNUmakefile diff --git a/gdal/frmts/jp2kak/jp2kak.lst b/frmts/jp2kak/jp2kak.lst similarity index 100% rename from gdal/frmts/jp2kak/jp2kak.lst rename to frmts/jp2kak/jp2kak.lst diff --git a/gdal/frmts/jp2kak/jp2kak_headers.h b/frmts/jp2kak/jp2kak_headers.h similarity index 100% rename from gdal/frmts/jp2kak/jp2kak_headers.h rename to frmts/jp2kak/jp2kak_headers.h diff --git a/gdal/frmts/jp2kak/jp2kakdataset.cpp b/frmts/jp2kak/jp2kakdataset.cpp similarity index 100% rename from gdal/frmts/jp2kak/jp2kakdataset.cpp rename to frmts/jp2kak/jp2kakdataset.cpp diff --git a/gdal/frmts/jp2kak/jp2kakdataset.h b/frmts/jp2kak/jp2kakdataset.h similarity index 100% rename from gdal/frmts/jp2kak/jp2kakdataset.h rename to frmts/jp2kak/jp2kakdataset.h diff --git a/gdal/frmts/jp2kak/makefile.vc b/frmts/jp2kak/makefile.vc similarity index 100% rename from gdal/frmts/jp2kak/makefile.vc rename to frmts/jp2kak/makefile.vc diff --git a/gdal/frmts/jp2kak/subfile_source.h b/frmts/jp2kak/subfile_source.h similarity index 100% rename from gdal/frmts/jp2kak/subfile_source.h rename to frmts/jp2kak/subfile_source.h diff --git a/gdal/frmts/jp2kak/vsil_target.h b/frmts/jp2kak/vsil_target.h similarity index 100% rename from gdal/frmts/jp2kak/vsil_target.h rename to frmts/jp2kak/vsil_target.h diff --git a/gdal/frmts/jp2lura/CMakeLists.txt b/frmts/jp2lura/CMakeLists.txt similarity index 100% rename from gdal/frmts/jp2lura/CMakeLists.txt rename to frmts/jp2lura/CMakeLists.txt diff --git a/gdal/frmts/jp2lura/GNUmakefile b/frmts/jp2lura/GNUmakefile similarity index 100% rename from gdal/frmts/jp2lura/GNUmakefile rename to frmts/jp2lura/GNUmakefile diff --git a/gdal/frmts/jp2lura/jp2luracallbacks.cpp b/frmts/jp2lura/jp2luracallbacks.cpp similarity index 100% rename from gdal/frmts/jp2lura/jp2luracallbacks.cpp rename to frmts/jp2lura/jp2luracallbacks.cpp diff --git a/gdal/frmts/jp2lura/jp2luracallbacks.h b/frmts/jp2lura/jp2luracallbacks.h similarity index 100% rename from gdal/frmts/jp2lura/jp2luracallbacks.h rename to frmts/jp2lura/jp2luracallbacks.h diff --git a/gdal/frmts/jp2lura/jp2luradataset.cpp b/frmts/jp2lura/jp2luradataset.cpp similarity index 100% rename from gdal/frmts/jp2lura/jp2luradataset.cpp rename to frmts/jp2lura/jp2luradataset.cpp diff --git a/gdal/frmts/jp2lura/jp2luradataset.h b/frmts/jp2lura/jp2luradataset.h similarity index 100% rename from gdal/frmts/jp2lura/jp2luradataset.h rename to frmts/jp2lura/jp2luradataset.h diff --git a/gdal/frmts/jp2lura/jp2lurarasterband.cpp b/frmts/jp2lura/jp2lurarasterband.cpp similarity index 100% rename from gdal/frmts/jp2lura/jp2lurarasterband.cpp rename to frmts/jp2lura/jp2lurarasterband.cpp diff --git a/gdal/frmts/jp2lura/jp2lurarasterband.h b/frmts/jp2lura/jp2lurarasterband.h similarity index 100% rename from gdal/frmts/jp2lura/jp2lurarasterband.h rename to frmts/jp2lura/jp2lurarasterband.h diff --git a/gdal/frmts/jp2lura/makefile.vc b/frmts/jp2lura/makefile.vc similarity index 100% rename from gdal/frmts/jp2lura/makefile.vc rename to frmts/jp2lura/makefile.vc diff --git a/gdal/frmts/jpeg/CMakeLists.txt b/frmts/jpeg/CMakeLists.txt similarity index 100% rename from gdal/frmts/jpeg/CMakeLists.txt rename to frmts/jpeg/CMakeLists.txt diff --git a/gdal/frmts/jpeg/GNUmakefile b/frmts/jpeg/GNUmakefile similarity index 100% rename from gdal/frmts/jpeg/GNUmakefile rename to frmts/jpeg/GNUmakefile diff --git a/gdal/frmts/jpeg/jpgdataset.cpp b/frmts/jpeg/jpgdataset.cpp similarity index 100% rename from gdal/frmts/jpeg/jpgdataset.cpp rename to frmts/jpeg/jpgdataset.cpp diff --git a/gdal/frmts/jpeg/jpgdataset.h b/frmts/jpeg/jpgdataset.h similarity index 100% rename from gdal/frmts/jpeg/jpgdataset.h rename to frmts/jpeg/jpgdataset.h diff --git a/gdal/frmts/jpeg/jpgdataset_12.cpp b/frmts/jpeg/jpgdataset_12.cpp similarity index 100% rename from gdal/frmts/jpeg/jpgdataset_12.cpp rename to frmts/jpeg/jpgdataset_12.cpp diff --git a/gdal/frmts/jpeg/libjpeg/CMakeLists.txt b/frmts/jpeg/libjpeg/CMakeLists.txt similarity index 100% rename from gdal/frmts/jpeg/libjpeg/CMakeLists.txt rename to frmts/jpeg/libjpeg/CMakeLists.txt diff --git a/gdal/frmts/jpeg/libjpeg/README b/frmts/jpeg/libjpeg/README similarity index 100% rename from gdal/frmts/jpeg/libjpeg/README rename to frmts/jpeg/libjpeg/README diff --git a/gdal/frmts/jpeg/libjpeg/jcapimin.c b/frmts/jpeg/libjpeg/jcapimin.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcapimin.c rename to frmts/jpeg/libjpeg/jcapimin.c diff --git a/gdal/frmts/jpeg/libjpeg/jcapistd.c b/frmts/jpeg/libjpeg/jcapistd.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcapistd.c rename to frmts/jpeg/libjpeg/jcapistd.c diff --git a/gdal/frmts/jpeg/libjpeg/jccoefct.c b/frmts/jpeg/libjpeg/jccoefct.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jccoefct.c rename to frmts/jpeg/libjpeg/jccoefct.c diff --git a/gdal/frmts/jpeg/libjpeg/jccolor.c b/frmts/jpeg/libjpeg/jccolor.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jccolor.c rename to frmts/jpeg/libjpeg/jccolor.c diff --git a/gdal/frmts/jpeg/libjpeg/jcdctmgr.c b/frmts/jpeg/libjpeg/jcdctmgr.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcdctmgr.c rename to frmts/jpeg/libjpeg/jcdctmgr.c diff --git a/gdal/frmts/jpeg/libjpeg/jchuff.c b/frmts/jpeg/libjpeg/jchuff.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jchuff.c rename to frmts/jpeg/libjpeg/jchuff.c diff --git a/gdal/frmts/jpeg/libjpeg/jchuff.h b/frmts/jpeg/libjpeg/jchuff.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jchuff.h rename to frmts/jpeg/libjpeg/jchuff.h diff --git a/gdal/frmts/jpeg/libjpeg/jcinit.c b/frmts/jpeg/libjpeg/jcinit.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcinit.c rename to frmts/jpeg/libjpeg/jcinit.c diff --git a/gdal/frmts/jpeg/libjpeg/jcmainct.c b/frmts/jpeg/libjpeg/jcmainct.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcmainct.c rename to frmts/jpeg/libjpeg/jcmainct.c diff --git a/gdal/frmts/jpeg/libjpeg/jcmarker.c b/frmts/jpeg/libjpeg/jcmarker.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcmarker.c rename to frmts/jpeg/libjpeg/jcmarker.c diff --git a/gdal/frmts/jpeg/libjpeg/jcmaster.c b/frmts/jpeg/libjpeg/jcmaster.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcmaster.c rename to frmts/jpeg/libjpeg/jcmaster.c diff --git a/gdal/frmts/jpeg/libjpeg/jcomapi.c b/frmts/jpeg/libjpeg/jcomapi.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcomapi.c rename to frmts/jpeg/libjpeg/jcomapi.c diff --git a/gdal/frmts/jpeg/libjpeg/jconfig.h b/frmts/jpeg/libjpeg/jconfig.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jconfig.h rename to frmts/jpeg/libjpeg/jconfig.h diff --git a/gdal/frmts/jpeg/libjpeg/jcparam.c b/frmts/jpeg/libjpeg/jcparam.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcparam.c rename to frmts/jpeg/libjpeg/jcparam.c diff --git a/gdal/frmts/jpeg/libjpeg/jcphuff.c b/frmts/jpeg/libjpeg/jcphuff.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcphuff.c rename to frmts/jpeg/libjpeg/jcphuff.c diff --git a/gdal/frmts/jpeg/libjpeg/jcprepct.c b/frmts/jpeg/libjpeg/jcprepct.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcprepct.c rename to frmts/jpeg/libjpeg/jcprepct.c diff --git a/gdal/frmts/jpeg/libjpeg/jcsample.c b/frmts/jpeg/libjpeg/jcsample.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jcsample.c rename to frmts/jpeg/libjpeg/jcsample.c diff --git a/gdal/frmts/jpeg/libjpeg/jctrans.c b/frmts/jpeg/libjpeg/jctrans.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jctrans.c rename to frmts/jpeg/libjpeg/jctrans.c diff --git a/gdal/frmts/jpeg/libjpeg/jdapimin.c b/frmts/jpeg/libjpeg/jdapimin.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdapimin.c rename to frmts/jpeg/libjpeg/jdapimin.c diff --git a/gdal/frmts/jpeg/libjpeg/jdapistd.c b/frmts/jpeg/libjpeg/jdapistd.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdapistd.c rename to frmts/jpeg/libjpeg/jdapistd.c diff --git a/gdal/frmts/jpeg/libjpeg/jdatadst.c b/frmts/jpeg/libjpeg/jdatadst.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdatadst.c rename to frmts/jpeg/libjpeg/jdatadst.c diff --git a/gdal/frmts/jpeg/libjpeg/jdatasrc.c b/frmts/jpeg/libjpeg/jdatasrc.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdatasrc.c rename to frmts/jpeg/libjpeg/jdatasrc.c diff --git a/gdal/frmts/jpeg/libjpeg/jdcoefct.c b/frmts/jpeg/libjpeg/jdcoefct.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdcoefct.c rename to frmts/jpeg/libjpeg/jdcoefct.c diff --git a/gdal/frmts/jpeg/libjpeg/jdcolor.c b/frmts/jpeg/libjpeg/jdcolor.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdcolor.c rename to frmts/jpeg/libjpeg/jdcolor.c diff --git a/gdal/frmts/jpeg/libjpeg/jdct.h b/frmts/jpeg/libjpeg/jdct.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdct.h rename to frmts/jpeg/libjpeg/jdct.h diff --git a/gdal/frmts/jpeg/libjpeg/jddctmgr.c b/frmts/jpeg/libjpeg/jddctmgr.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jddctmgr.c rename to frmts/jpeg/libjpeg/jddctmgr.c diff --git a/gdal/frmts/jpeg/libjpeg/jdhuff.c b/frmts/jpeg/libjpeg/jdhuff.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdhuff.c rename to frmts/jpeg/libjpeg/jdhuff.c diff --git a/gdal/frmts/jpeg/libjpeg/jdhuff.h b/frmts/jpeg/libjpeg/jdhuff.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdhuff.h rename to frmts/jpeg/libjpeg/jdhuff.h diff --git a/gdal/frmts/jpeg/libjpeg/jdinput.c b/frmts/jpeg/libjpeg/jdinput.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdinput.c rename to frmts/jpeg/libjpeg/jdinput.c diff --git a/gdal/frmts/jpeg/libjpeg/jdmainct.c b/frmts/jpeg/libjpeg/jdmainct.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdmainct.c rename to frmts/jpeg/libjpeg/jdmainct.c diff --git a/gdal/frmts/jpeg/libjpeg/jdmarker.c b/frmts/jpeg/libjpeg/jdmarker.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdmarker.c rename to frmts/jpeg/libjpeg/jdmarker.c diff --git a/gdal/frmts/jpeg/libjpeg/jdmaster.c b/frmts/jpeg/libjpeg/jdmaster.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdmaster.c rename to frmts/jpeg/libjpeg/jdmaster.c diff --git a/gdal/frmts/jpeg/libjpeg/jdmerge.c b/frmts/jpeg/libjpeg/jdmerge.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdmerge.c rename to frmts/jpeg/libjpeg/jdmerge.c diff --git a/gdal/frmts/jpeg/libjpeg/jdphuff.c b/frmts/jpeg/libjpeg/jdphuff.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdphuff.c rename to frmts/jpeg/libjpeg/jdphuff.c diff --git a/gdal/frmts/jpeg/libjpeg/jdpostct.c b/frmts/jpeg/libjpeg/jdpostct.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdpostct.c rename to frmts/jpeg/libjpeg/jdpostct.c diff --git a/gdal/frmts/jpeg/libjpeg/jdsample.c b/frmts/jpeg/libjpeg/jdsample.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdsample.c rename to frmts/jpeg/libjpeg/jdsample.c diff --git a/gdal/frmts/jpeg/libjpeg/jdtrans.c b/frmts/jpeg/libjpeg/jdtrans.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jdtrans.c rename to frmts/jpeg/libjpeg/jdtrans.c diff --git a/gdal/frmts/jpeg/libjpeg/jerror.c b/frmts/jpeg/libjpeg/jerror.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jerror.c rename to frmts/jpeg/libjpeg/jerror.c diff --git a/gdal/frmts/jpeg/libjpeg/jerror.h b/frmts/jpeg/libjpeg/jerror.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jerror.h rename to frmts/jpeg/libjpeg/jerror.h diff --git a/gdal/frmts/jpeg/libjpeg/jfdctflt.c b/frmts/jpeg/libjpeg/jfdctflt.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jfdctflt.c rename to frmts/jpeg/libjpeg/jfdctflt.c diff --git a/gdal/frmts/jpeg/libjpeg/jfdctfst.c b/frmts/jpeg/libjpeg/jfdctfst.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jfdctfst.c rename to frmts/jpeg/libjpeg/jfdctfst.c diff --git a/gdal/frmts/jpeg/libjpeg/jfdctint.c b/frmts/jpeg/libjpeg/jfdctint.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jfdctint.c rename to frmts/jpeg/libjpeg/jfdctint.c diff --git a/gdal/frmts/jpeg/libjpeg/jidctflt.c b/frmts/jpeg/libjpeg/jidctflt.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jidctflt.c rename to frmts/jpeg/libjpeg/jidctflt.c diff --git a/gdal/frmts/jpeg/libjpeg/jidctfst.c b/frmts/jpeg/libjpeg/jidctfst.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jidctfst.c rename to frmts/jpeg/libjpeg/jidctfst.c diff --git a/gdal/frmts/jpeg/libjpeg/jidctint.c b/frmts/jpeg/libjpeg/jidctint.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jidctint.c rename to frmts/jpeg/libjpeg/jidctint.c diff --git a/gdal/frmts/jpeg/libjpeg/jidctred.c b/frmts/jpeg/libjpeg/jidctred.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jidctred.c rename to frmts/jpeg/libjpeg/jidctred.c diff --git a/gdal/frmts/jpeg/libjpeg/jinclude.h b/frmts/jpeg/libjpeg/jinclude.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jinclude.h rename to frmts/jpeg/libjpeg/jinclude.h diff --git a/gdal/frmts/jpeg/libjpeg/jmemmgr.c b/frmts/jpeg/libjpeg/jmemmgr.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jmemmgr.c rename to frmts/jpeg/libjpeg/jmemmgr.c diff --git a/gdal/frmts/jpeg/libjpeg/jmemnobs.c b/frmts/jpeg/libjpeg/jmemnobs.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jmemnobs.c rename to frmts/jpeg/libjpeg/jmemnobs.c diff --git a/gdal/frmts/jpeg/libjpeg/jmemsys.h b/frmts/jpeg/libjpeg/jmemsys.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jmemsys.h rename to frmts/jpeg/libjpeg/jmemsys.h diff --git a/gdal/frmts/jpeg/libjpeg/jmorecfg.h b/frmts/jpeg/libjpeg/jmorecfg.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jmorecfg.h rename to frmts/jpeg/libjpeg/jmorecfg.h diff --git a/gdal/frmts/jpeg/libjpeg/jpegint.h b/frmts/jpeg/libjpeg/jpegint.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jpegint.h rename to frmts/jpeg/libjpeg/jpegint.h diff --git a/gdal/frmts/jpeg/libjpeg/jpeglib.h b/frmts/jpeg/libjpeg/jpeglib.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jpeglib.h rename to frmts/jpeg/libjpeg/jpeglib.h diff --git a/gdal/frmts/jpeg/libjpeg/jquant1.c b/frmts/jpeg/libjpeg/jquant1.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jquant1.c rename to frmts/jpeg/libjpeg/jquant1.c diff --git a/gdal/frmts/jpeg/libjpeg/jquant2.c b/frmts/jpeg/libjpeg/jquant2.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jquant2.c rename to frmts/jpeg/libjpeg/jquant2.c diff --git a/gdal/frmts/jpeg/libjpeg/jutils.c b/frmts/jpeg/libjpeg/jutils.c similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jutils.c rename to frmts/jpeg/libjpeg/jutils.c diff --git a/gdal/frmts/jpeg/libjpeg/jversion.h b/frmts/jpeg/libjpeg/jversion.h similarity index 100% rename from gdal/frmts/jpeg/libjpeg/jversion.h rename to frmts/jpeg/libjpeg/jversion.h diff --git a/gdal/frmts/jpeg/libjpeg/makefile.vc b/frmts/jpeg/libjpeg/makefile.vc similarity index 100% rename from gdal/frmts/jpeg/libjpeg/makefile.vc rename to frmts/jpeg/libjpeg/makefile.vc diff --git a/gdal/frmts/jpeg/libjpeg12/jmorecfg.h.12 b/frmts/jpeg/libjpeg12/jmorecfg.h.12 similarity index 100% rename from gdal/frmts/jpeg/libjpeg12/jmorecfg.h.12 rename to frmts/jpeg/libjpeg12/jmorecfg.h.12 diff --git a/gdal/frmts/jpeg/libjpeg12/makefile.vc b/frmts/jpeg/libjpeg12/makefile.vc similarity index 100% rename from gdal/frmts/jpeg/libjpeg12/makefile.vc rename to frmts/jpeg/libjpeg12/makefile.vc diff --git a/gdal/frmts/jpeg/makefile.vc b/frmts/jpeg/makefile.vc similarity index 100% rename from gdal/frmts/jpeg/makefile.vc rename to frmts/jpeg/makefile.vc diff --git a/gdal/frmts/jpeg/vsidataio.cpp b/frmts/jpeg/vsidataio.cpp similarity index 100% rename from gdal/frmts/jpeg/vsidataio.cpp rename to frmts/jpeg/vsidataio.cpp diff --git a/gdal/frmts/jpeg/vsidataio.h b/frmts/jpeg/vsidataio.h similarity index 100% rename from gdal/frmts/jpeg/vsidataio.h rename to frmts/jpeg/vsidataio.h diff --git a/gdal/frmts/jpeg/vsidataio_12.cpp b/frmts/jpeg/vsidataio_12.cpp similarity index 100% rename from gdal/frmts/jpeg/vsidataio_12.cpp rename to frmts/jpeg/vsidataio_12.cpp diff --git a/gdal/frmts/jpeg2000/CMakeLists.txt b/frmts/jpeg2000/CMakeLists.txt similarity index 100% rename from gdal/frmts/jpeg2000/CMakeLists.txt rename to frmts/jpeg2000/CMakeLists.txt diff --git a/gdal/frmts/jpeg2000/GNUmakefile b/frmts/jpeg2000/GNUmakefile similarity index 100% rename from gdal/frmts/jpeg2000/GNUmakefile rename to frmts/jpeg2000/GNUmakefile diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/frmts/jpeg2000/jpeg2000_vsil_io.cpp similarity index 100% rename from gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp rename to frmts/jpeg2000/jpeg2000_vsil_io.cpp diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.h b/frmts/jpeg2000/jpeg2000_vsil_io.h similarity index 100% rename from gdal/frmts/jpeg2000/jpeg2000_vsil_io.h rename to frmts/jpeg2000/jpeg2000_vsil_io.h diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/frmts/jpeg2000/jpeg2000dataset.cpp similarity index 100% rename from gdal/frmts/jpeg2000/jpeg2000dataset.cpp rename to frmts/jpeg2000/jpeg2000dataset.cpp diff --git a/gdal/frmts/jpeg2000/makefile.vc b/frmts/jpeg2000/makefile.vc similarity index 100% rename from gdal/frmts/jpeg2000/makefile.vc rename to frmts/jpeg2000/makefile.vc diff --git a/gdal/frmts/jpegls/CMakeLists.txt b/frmts/jpegls/CMakeLists.txt similarity index 100% rename from gdal/frmts/jpegls/CMakeLists.txt rename to frmts/jpegls/CMakeLists.txt diff --git a/gdal/frmts/jpegls/GNUmakefile b/frmts/jpegls/GNUmakefile similarity index 100% rename from gdal/frmts/jpegls/GNUmakefile rename to frmts/jpegls/GNUmakefile diff --git a/gdal/frmts/jpegls/jpegls_header.h b/frmts/jpegls/jpegls_header.h similarity index 100% rename from gdal/frmts/jpegls/jpegls_header.h rename to frmts/jpegls/jpegls_header.h diff --git a/gdal/frmts/jpegls/jpeglsdataset.cpp b/frmts/jpegls/jpeglsdataset.cpp similarity index 100% rename from gdal/frmts/jpegls/jpeglsdataset.cpp rename to frmts/jpegls/jpeglsdataset.cpp diff --git a/gdal/frmts/jpegls/makefile.vc b/frmts/jpegls/makefile.vc similarity index 100% rename from gdal/frmts/jpegls/makefile.vc rename to frmts/jpegls/makefile.vc diff --git a/gdal/frmts/jpipkak/CMakeLists.txt b/frmts/jpipkak/CMakeLists.txt similarity index 100% rename from gdal/frmts/jpipkak/CMakeLists.txt rename to frmts/jpipkak/CMakeLists.txt diff --git a/gdal/frmts/jpipkak/GNUmakefile b/frmts/jpipkak/GNUmakefile similarity index 100% rename from gdal/frmts/jpipkak/GNUmakefile rename to frmts/jpipkak/GNUmakefile diff --git a/gdal/frmts/jpipkak/components.PNG b/frmts/jpipkak/components.PNG similarity index 100% rename from gdal/frmts/jpipkak/components.PNG rename to frmts/jpipkak/components.PNG diff --git a/gdal/frmts/jpipkak/gdalsequence.PNG b/frmts/jpipkak/gdalsequence.PNG similarity index 100% rename from gdal/frmts/jpipkak/gdalsequence.PNG rename to frmts/jpipkak/gdalsequence.PNG diff --git a/gdal/frmts/jpipkak/jpipkak_headers.h b/frmts/jpipkak/jpipkak_headers.h similarity index 100% rename from gdal/frmts/jpipkak/jpipkak_headers.h rename to frmts/jpipkak/jpipkak_headers.h diff --git a/gdal/frmts/jpipkak/jpipkakdataset.cpp b/frmts/jpipkak/jpipkakdataset.cpp similarity index 100% rename from gdal/frmts/jpipkak/jpipkakdataset.cpp rename to frmts/jpipkak/jpipkakdataset.cpp diff --git a/gdal/frmts/jpipkak/jpipkakdataset.h b/frmts/jpipkak/jpipkakdataset.h similarity index 100% rename from gdal/frmts/jpipkak/jpipkakdataset.h rename to frmts/jpipkak/jpipkakdataset.h diff --git a/gdal/frmts/jpipkak/jpipsequence.PNG b/frmts/jpipkak/jpipsequence.PNG similarity index 100% rename from gdal/frmts/jpipkak/jpipsequence.PNG rename to frmts/jpipkak/jpipsequence.PNG diff --git a/gdal/frmts/jpipkak/makefile.vc b/frmts/jpipkak/makefile.vc similarity index 100% rename from gdal/frmts/jpipkak/makefile.vc rename to frmts/jpipkak/makefile.vc diff --git a/gdal/frmts/kea/CMakeLists.txt b/frmts/kea/CMakeLists.txt similarity index 100% rename from gdal/frmts/kea/CMakeLists.txt rename to frmts/kea/CMakeLists.txt diff --git a/gdal/frmts/kea/GNUmakefile b/frmts/kea/GNUmakefile similarity index 100% rename from gdal/frmts/kea/GNUmakefile rename to frmts/kea/GNUmakefile diff --git a/gdal/frmts/kea/keaband.cpp b/frmts/kea/keaband.cpp similarity index 100% rename from gdal/frmts/kea/keaband.cpp rename to frmts/kea/keaband.cpp diff --git a/gdal/frmts/kea/keaband.h b/frmts/kea/keaband.h similarity index 100% rename from gdal/frmts/kea/keaband.h rename to frmts/kea/keaband.h diff --git a/gdal/frmts/kea/keacopy.cpp b/frmts/kea/keacopy.cpp similarity index 100% rename from gdal/frmts/kea/keacopy.cpp rename to frmts/kea/keacopy.cpp diff --git a/gdal/frmts/kea/keacopy.h b/frmts/kea/keacopy.h similarity index 100% rename from gdal/frmts/kea/keacopy.h rename to frmts/kea/keacopy.h diff --git a/gdal/frmts/kea/keadataset.cpp b/frmts/kea/keadataset.cpp similarity index 100% rename from gdal/frmts/kea/keadataset.cpp rename to frmts/kea/keadataset.cpp diff --git a/gdal/frmts/kea/keadataset.h b/frmts/kea/keadataset.h similarity index 100% rename from gdal/frmts/kea/keadataset.h rename to frmts/kea/keadataset.h diff --git a/gdal/frmts/kea/keadriver.cpp b/frmts/kea/keadriver.cpp similarity index 100% rename from gdal/frmts/kea/keadriver.cpp rename to frmts/kea/keadriver.cpp diff --git a/gdal/frmts/kea/keamaskband.cpp b/frmts/kea/keamaskband.cpp similarity index 100% rename from gdal/frmts/kea/keamaskband.cpp rename to frmts/kea/keamaskband.cpp diff --git a/gdal/frmts/kea/keamaskband.h b/frmts/kea/keamaskband.h similarity index 100% rename from gdal/frmts/kea/keamaskband.h rename to frmts/kea/keamaskband.h diff --git a/gdal/frmts/kea/keaoverview.cpp b/frmts/kea/keaoverview.cpp similarity index 100% rename from gdal/frmts/kea/keaoverview.cpp rename to frmts/kea/keaoverview.cpp diff --git a/gdal/frmts/kea/keaoverview.h b/frmts/kea/keaoverview.h similarity index 100% rename from gdal/frmts/kea/keaoverview.h rename to frmts/kea/keaoverview.h diff --git a/gdal/frmts/kea/kearat.cpp b/frmts/kea/kearat.cpp similarity index 100% rename from gdal/frmts/kea/kearat.cpp rename to frmts/kea/kearat.cpp diff --git a/gdal/frmts/kea/kearat.h b/frmts/kea/kearat.h similarity index 100% rename from gdal/frmts/kea/kearat.h rename to frmts/kea/kearat.h diff --git a/gdal/frmts/kea/libkea_headers.h b/frmts/kea/libkea_headers.h similarity index 100% rename from gdal/frmts/kea/libkea_headers.h rename to frmts/kea/libkea_headers.h diff --git a/gdal/frmts/kea/makefile.vc b/frmts/kea/makefile.vc similarity index 100% rename from gdal/frmts/kea/makefile.vc rename to frmts/kea/makefile.vc diff --git a/gdal/frmts/kmlsuperoverlay/CMakeLists.txt b/frmts/kmlsuperoverlay/CMakeLists.txt similarity index 100% rename from gdal/frmts/kmlsuperoverlay/CMakeLists.txt rename to frmts/kmlsuperoverlay/CMakeLists.txt diff --git a/gdal/frmts/kmlsuperoverlay/GNUmakefile b/frmts/kmlsuperoverlay/GNUmakefile similarity index 100% rename from gdal/frmts/kmlsuperoverlay/GNUmakefile rename to frmts/kmlsuperoverlay/GNUmakefile diff --git a/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp b/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp similarity index 100% rename from gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp rename to frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp diff --git a/gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h b/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h similarity index 100% rename from gdal/frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h rename to frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h diff --git a/gdal/frmts/kmlsuperoverlay/makefile.vc b/frmts/kmlsuperoverlay/makefile.vc similarity index 100% rename from gdal/frmts/kmlsuperoverlay/makefile.vc rename to frmts/kmlsuperoverlay/makefile.vc diff --git a/gdal/frmts/l1b/CMakeLists.txt b/frmts/l1b/CMakeLists.txt similarity index 100% rename from gdal/frmts/l1b/CMakeLists.txt rename to frmts/l1b/CMakeLists.txt diff --git a/gdal/frmts/l1b/GNUmakefile b/frmts/l1b/GNUmakefile similarity index 100% rename from gdal/frmts/l1b/GNUmakefile rename to frmts/l1b/GNUmakefile diff --git a/gdal/frmts/l1b/l1bdataset.cpp b/frmts/l1b/l1bdataset.cpp similarity index 100% rename from gdal/frmts/l1b/l1bdataset.cpp rename to frmts/l1b/l1bdataset.cpp diff --git a/gdal/frmts/l1b/makefile.vc b/frmts/l1b/makefile.vc similarity index 100% rename from gdal/frmts/l1b/makefile.vc rename to frmts/l1b/makefile.vc diff --git a/gdal/frmts/leveller/CMakeLists.txt b/frmts/leveller/CMakeLists.txt similarity index 100% rename from gdal/frmts/leveller/CMakeLists.txt rename to frmts/leveller/CMakeLists.txt diff --git a/gdal/frmts/leveller/GNUmakefile b/frmts/leveller/GNUmakefile similarity index 100% rename from gdal/frmts/leveller/GNUmakefile rename to frmts/leveller/GNUmakefile diff --git a/gdal/frmts/leveller/levellerdataset.cpp b/frmts/leveller/levellerdataset.cpp similarity index 100% rename from gdal/frmts/leveller/levellerdataset.cpp rename to frmts/leveller/levellerdataset.cpp diff --git a/gdal/frmts/leveller/makefile.vc b/frmts/leveller/makefile.vc similarity index 100% rename from gdal/frmts/leveller/makefile.vc rename to frmts/leveller/makefile.vc diff --git a/gdal/frmts/makefile.vc b/frmts/makefile.vc similarity index 100% rename from gdal/frmts/makefile.vc rename to frmts/makefile.vc diff --git a/gdal/frmts/map/CMakeLists.txt b/frmts/map/CMakeLists.txt similarity index 100% rename from gdal/frmts/map/CMakeLists.txt rename to frmts/map/CMakeLists.txt diff --git a/gdal/frmts/map/GNUmakefile b/frmts/map/GNUmakefile similarity index 100% rename from gdal/frmts/map/GNUmakefile rename to frmts/map/GNUmakefile diff --git a/gdal/frmts/map/makefile.vc b/frmts/map/makefile.vc similarity index 100% rename from gdal/frmts/map/makefile.vc rename to frmts/map/makefile.vc diff --git a/gdal/frmts/map/mapdataset.cpp b/frmts/map/mapdataset.cpp similarity index 100% rename from gdal/frmts/map/mapdataset.cpp rename to frmts/map/mapdataset.cpp diff --git a/gdal/frmts/mbtiles/CMakeLists.txt b/frmts/mbtiles/CMakeLists.txt similarity index 100% rename from gdal/frmts/mbtiles/CMakeLists.txt rename to frmts/mbtiles/CMakeLists.txt diff --git a/gdal/frmts/mbtiles/GNUmakefile b/frmts/mbtiles/GNUmakefile similarity index 100% rename from gdal/frmts/mbtiles/GNUmakefile rename to frmts/mbtiles/GNUmakefile diff --git a/gdal/frmts/mbtiles/makefile.vc b/frmts/mbtiles/makefile.vc similarity index 100% rename from gdal/frmts/mbtiles/makefile.vc rename to frmts/mbtiles/makefile.vc diff --git a/gdal/frmts/mbtiles/mbtilesdataset.cpp b/frmts/mbtiles/mbtilesdataset.cpp similarity index 100% rename from gdal/frmts/mbtiles/mbtilesdataset.cpp rename to frmts/mbtiles/mbtilesdataset.cpp diff --git a/gdal/frmts/mem/CMakeLists.txt b/frmts/mem/CMakeLists.txt similarity index 100% rename from gdal/frmts/mem/CMakeLists.txt rename to frmts/mem/CMakeLists.txt diff --git a/gdal/frmts/mem/GNUmakefile b/frmts/mem/GNUmakefile similarity index 100% rename from gdal/frmts/mem/GNUmakefile rename to frmts/mem/GNUmakefile diff --git a/gdal/frmts/mem/makefile.vc b/frmts/mem/makefile.vc similarity index 100% rename from gdal/frmts/mem/makefile.vc rename to frmts/mem/makefile.vc diff --git a/gdal/frmts/mem/memdataset.cpp b/frmts/mem/memdataset.cpp similarity index 100% rename from gdal/frmts/mem/memdataset.cpp rename to frmts/mem/memdataset.cpp diff --git a/gdal/frmts/mem/memdataset.h b/frmts/mem/memdataset.h similarity index 100% rename from gdal/frmts/mem/memdataset.h rename to frmts/mem/memdataset.h diff --git a/gdal/frmts/mem/memmultidim.h b/frmts/mem/memmultidim.h similarity index 100% rename from gdal/frmts/mem/memmultidim.h rename to frmts/mem/memmultidim.h diff --git a/gdal/frmts/mrf/BitMask2D.h b/frmts/mrf/BitMask2D.h similarity index 100% rename from gdal/frmts/mrf/BitMask2D.h rename to frmts/mrf/BitMask2D.h diff --git a/gdal/frmts/mrf/CMakeLists.txt b/frmts/mrf/CMakeLists.txt similarity index 100% rename from gdal/frmts/mrf/CMakeLists.txt rename to frmts/mrf/CMakeLists.txt diff --git a/gdal/frmts/mrf/GNUmakefile b/frmts/mrf/GNUmakefile similarity index 100% rename from gdal/frmts/mrf/GNUmakefile rename to frmts/mrf/GNUmakefile diff --git a/gdal/frmts/mrf/JPEG12_band.cpp b/frmts/mrf/JPEG12_band.cpp similarity index 100% rename from gdal/frmts/mrf/JPEG12_band.cpp rename to frmts/mrf/JPEG12_band.cpp diff --git a/gdal/frmts/mrf/JPEG_band.cpp b/frmts/mrf/JPEG_band.cpp similarity index 100% rename from gdal/frmts/mrf/JPEG_band.cpp rename to frmts/mrf/JPEG_band.cpp diff --git a/gdal/frmts/mrf/JPNG_band.cpp b/frmts/mrf/JPNG_band.cpp similarity index 100% rename from gdal/frmts/mrf/JPNG_band.cpp rename to frmts/mrf/JPNG_band.cpp diff --git a/gdal/frmts/mrf/LERCV1/CMakeLists.txt b/frmts/mrf/LERCV1/CMakeLists.txt similarity index 100% rename from gdal/frmts/mrf/LERCV1/CMakeLists.txt rename to frmts/mrf/LERCV1/CMakeLists.txt diff --git a/gdal/frmts/mrf/LERCV1/GNUmakefile b/frmts/mrf/LERCV1/GNUmakefile similarity index 100% rename from gdal/frmts/mrf/LERCV1/GNUmakefile rename to frmts/mrf/LERCV1/GNUmakefile diff --git a/gdal/frmts/mrf/LERCV1/LICENSE.TXT b/frmts/mrf/LERCV1/LICENSE.TXT similarity index 100% rename from gdal/frmts/mrf/LERCV1/LICENSE.TXT rename to frmts/mrf/LERCV1/LICENSE.TXT diff --git a/gdal/frmts/mrf/LERCV1/Lerc1Image.cpp b/frmts/mrf/LERCV1/Lerc1Image.cpp similarity index 100% rename from gdal/frmts/mrf/LERCV1/Lerc1Image.cpp rename to frmts/mrf/LERCV1/Lerc1Image.cpp diff --git a/gdal/frmts/mrf/LERCV1/Lerc1Image.h b/frmts/mrf/LERCV1/Lerc1Image.h similarity index 100% rename from gdal/frmts/mrf/LERCV1/Lerc1Image.h rename to frmts/mrf/LERCV1/Lerc1Image.h diff --git a/gdal/frmts/mrf/LERCV1/NOTICE.TXT b/frmts/mrf/LERCV1/NOTICE.TXT similarity index 100% rename from gdal/frmts/mrf/LERCV1/NOTICE.TXT rename to frmts/mrf/LERCV1/NOTICE.TXT diff --git a/gdal/frmts/mrf/LERCV1/makefile.vc b/frmts/mrf/LERCV1/makefile.vc similarity index 100% rename from gdal/frmts/mrf/LERCV1/makefile.vc rename to frmts/mrf/LERCV1/makefile.vc diff --git a/gdal/frmts/mrf/LERC_band.cpp b/frmts/mrf/LERC_band.cpp similarity index 100% rename from gdal/frmts/mrf/LERC_band.cpp rename to frmts/mrf/LERC_band.cpp diff --git a/gdal/frmts/mrf/PNG_band.cpp b/frmts/mrf/PNG_band.cpp similarity index 100% rename from gdal/frmts/mrf/PNG_band.cpp rename to frmts/mrf/PNG_band.cpp diff --git a/gdal/frmts/mrf/Packer.h b/frmts/mrf/Packer.h similarity index 100% rename from gdal/frmts/mrf/Packer.h rename to frmts/mrf/Packer.h diff --git a/gdal/frmts/mrf/Packer_RLE.cpp b/frmts/mrf/Packer_RLE.cpp similarity index 100% rename from gdal/frmts/mrf/Packer_RLE.cpp rename to frmts/mrf/Packer_RLE.cpp diff --git a/gdal/frmts/mrf/Packer_RLE.h b/frmts/mrf/Packer_RLE.h similarity index 100% rename from gdal/frmts/mrf/Packer_RLE.h rename to frmts/mrf/Packer_RLE.h diff --git a/gdal/frmts/mrf/README.md b/frmts/mrf/README.md similarity index 100% rename from gdal/frmts/mrf/README.md rename to frmts/mrf/README.md diff --git a/gdal/frmts/mrf/Tif_band.cpp b/frmts/mrf/Tif_band.cpp similarity index 100% rename from gdal/frmts/mrf/Tif_band.cpp rename to frmts/mrf/Tif_band.cpp diff --git a/gdal/frmts/mrf/makefile.vc b/frmts/mrf/makefile.vc similarity index 100% rename from gdal/frmts/mrf/makefile.vc rename to frmts/mrf/makefile.vc diff --git a/gdal/frmts/mrf/marfa.h b/frmts/mrf/marfa.h similarity index 100% rename from gdal/frmts/mrf/marfa.h rename to frmts/mrf/marfa.h diff --git a/gdal/frmts/mrf/marfa_dataset.cpp b/frmts/mrf/marfa_dataset.cpp similarity index 100% rename from gdal/frmts/mrf/marfa_dataset.cpp rename to frmts/mrf/marfa_dataset.cpp diff --git a/gdal/frmts/mrf/mrf_band.cpp b/frmts/mrf/mrf_band.cpp similarity index 100% rename from gdal/frmts/mrf/mrf_band.cpp rename to frmts/mrf/mrf_band.cpp diff --git a/gdal/frmts/mrf/mrf_overview.cpp b/frmts/mrf/mrf_overview.cpp similarity index 100% rename from gdal/frmts/mrf/mrf_overview.cpp rename to frmts/mrf/mrf_overview.cpp diff --git a/gdal/frmts/mrf/mrf_util.cpp b/frmts/mrf/mrf_util.cpp similarity index 100% rename from gdal/frmts/mrf/mrf_util.cpp rename to frmts/mrf/mrf_util.cpp diff --git a/gdal/frmts/mrsid/CMakeLists.txt b/frmts/mrsid/CMakeLists.txt similarity index 100% rename from gdal/frmts/mrsid/CMakeLists.txt rename to frmts/mrsid/CMakeLists.txt diff --git a/gdal/frmts/mrsid/GNUmakefile b/frmts/mrsid/GNUmakefile similarity index 100% rename from gdal/frmts/mrsid/GNUmakefile rename to frmts/mrsid/GNUmakefile diff --git a/gdal/frmts/mrsid/makefile.vc b/frmts/mrsid/makefile.vc similarity index 100% rename from gdal/frmts/mrsid/makefile.vc rename to frmts/mrsid/makefile.vc diff --git a/gdal/frmts/mrsid/mrsiddataset.cpp b/frmts/mrsid/mrsiddataset.cpp similarity index 100% rename from gdal/frmts/mrsid/mrsiddataset.cpp rename to frmts/mrsid/mrsiddataset.cpp diff --git a/gdal/frmts/mrsid/mrsiddataset_headers_include.h b/frmts/mrsid/mrsiddataset_headers_include.h similarity index 100% rename from gdal/frmts/mrsid/mrsiddataset_headers_include.h rename to frmts/mrsid/mrsiddataset_headers_include.h diff --git a/gdal/frmts/mrsid/mrsidstream.cpp b/frmts/mrsid/mrsidstream.cpp similarity index 100% rename from gdal/frmts/mrsid/mrsidstream.cpp rename to frmts/mrsid/mrsidstream.cpp diff --git a/gdal/frmts/mrsid/mrsidstream.h b/frmts/mrsid/mrsidstream.h similarity index 100% rename from gdal/frmts/mrsid/mrsidstream.h rename to frmts/mrsid/mrsidstream.h diff --git a/gdal/frmts/mrsid/mrsidstream_headers_include.h b/frmts/mrsid/mrsidstream_headers_include.h similarity index 100% rename from gdal/frmts/mrsid/mrsidstream_headers_include.h rename to frmts/mrsid/mrsidstream_headers_include.h diff --git a/gdal/frmts/mrsid/nmake.opt b/frmts/mrsid/nmake.opt similarity index 100% rename from gdal/frmts/mrsid/nmake.opt rename to frmts/mrsid/nmake.opt diff --git a/gdal/frmts/mrsid_lidar/CMakeLists.txt b/frmts/mrsid_lidar/CMakeLists.txt similarity index 100% rename from gdal/frmts/mrsid_lidar/CMakeLists.txt rename to frmts/mrsid_lidar/CMakeLists.txt diff --git a/gdal/frmts/mrsid_lidar/GNUmakefile b/frmts/mrsid_lidar/GNUmakefile similarity index 100% rename from gdal/frmts/mrsid_lidar/GNUmakefile rename to frmts/mrsid_lidar/GNUmakefile diff --git a/gdal/frmts/mrsid_lidar/gdal_MG4Lidar.cpp b/frmts/mrsid_lidar/gdal_MG4Lidar.cpp similarity index 100% rename from gdal/frmts/mrsid_lidar/gdal_MG4Lidar.cpp rename to frmts/mrsid_lidar/gdal_MG4Lidar.cpp diff --git a/gdal/frmts/mrsid_lidar/makefile.vc b/frmts/mrsid_lidar/makefile.vc similarity index 100% rename from gdal/frmts/mrsid_lidar/makefile.vc rename to frmts/mrsid_lidar/makefile.vc diff --git a/gdal/frmts/mrsid_lidar/mg4lidar_headers.h b/frmts/mrsid_lidar/mg4lidar_headers.h similarity index 100% rename from gdal/frmts/mrsid_lidar/mg4lidar_headers.h rename to frmts/mrsid_lidar/mg4lidar_headers.h diff --git a/gdal/frmts/msg/CMakeLists.txt b/frmts/msg/CMakeLists.txt similarity index 100% rename from gdal/frmts/msg/CMakeLists.txt rename to frmts/msg/CMakeLists.txt diff --git a/gdal/frmts/msg/GNUmakefile b/frmts/msg/GNUmakefile similarity index 100% rename from gdal/frmts/msg/GNUmakefile rename to frmts/msg/GNUmakefile diff --git a/gdal/frmts/msg/PublicDecompWTMakefiles.zip b/frmts/msg/PublicDecompWTMakefiles.zip similarity index 100% rename from gdal/frmts/msg/PublicDecompWTMakefiles.zip rename to frmts/msg/PublicDecompWTMakefiles.zip diff --git a/gdal/frmts/msg/PublicDecompWT_all.cpp b/frmts/msg/PublicDecompWT_all.cpp similarity index 100% rename from gdal/frmts/msg/PublicDecompWT_all.cpp rename to frmts/msg/PublicDecompWT_all.cpp diff --git a/gdal/frmts/msg/PublicDecompWT_headers.h b/frmts/msg/PublicDecompWT_headers.h similarity index 100% rename from gdal/frmts/msg/PublicDecompWT_headers.h rename to frmts/msg/PublicDecompWT_headers.h diff --git a/gdal/frmts/msg/makefile.vc b/frmts/msg/makefile.vc similarity index 100% rename from gdal/frmts/msg/makefile.vc rename to frmts/msg/makefile.vc diff --git a/gdal/frmts/msg/msgcommand.cpp b/frmts/msg/msgcommand.cpp similarity index 100% rename from gdal/frmts/msg/msgcommand.cpp rename to frmts/msg/msgcommand.cpp diff --git a/gdal/frmts/msg/msgcommand.h b/frmts/msg/msgcommand.h similarity index 100% rename from gdal/frmts/msg/msgcommand.h rename to frmts/msg/msgcommand.h diff --git a/gdal/frmts/msg/msgdataset.cpp b/frmts/msg/msgdataset.cpp similarity index 100% rename from gdal/frmts/msg/msgdataset.cpp rename to frmts/msg/msgdataset.cpp diff --git a/gdal/frmts/msg/msgdataset.h b/frmts/msg/msgdataset.h similarity index 100% rename from gdal/frmts/msg/msgdataset.h rename to frmts/msg/msgdataset.h diff --git a/gdal/frmts/msg/prologue.cpp b/frmts/msg/prologue.cpp similarity index 100% rename from gdal/frmts/msg/prologue.cpp rename to frmts/msg/prologue.cpp diff --git a/gdal/frmts/msg/prologue.h b/frmts/msg/prologue.h similarity index 100% rename from gdal/frmts/msg/prologue.h rename to frmts/msg/prologue.h diff --git a/gdal/frmts/msg/reflectancecalculator.cpp b/frmts/msg/reflectancecalculator.cpp similarity index 100% rename from gdal/frmts/msg/reflectancecalculator.cpp rename to frmts/msg/reflectancecalculator.cpp diff --git a/gdal/frmts/msg/reflectancecalculator.h b/frmts/msg/reflectancecalculator.h similarity index 100% rename from gdal/frmts/msg/reflectancecalculator.h rename to frmts/msg/reflectancecalculator.h diff --git a/gdal/frmts/msg/xritheaderparser.cpp b/frmts/msg/xritheaderparser.cpp similarity index 100% rename from gdal/frmts/msg/xritheaderparser.cpp rename to frmts/msg/xritheaderparser.cpp diff --git a/gdal/frmts/msg/xritheaderparser.h b/frmts/msg/xritheaderparser.h similarity index 100% rename from gdal/frmts/msg/xritheaderparser.h rename to frmts/msg/xritheaderparser.h diff --git a/gdal/frmts/msgn/CMakeLists.txt b/frmts/msgn/CMakeLists.txt similarity index 100% rename from gdal/frmts/msgn/CMakeLists.txt rename to frmts/msgn/CMakeLists.txt diff --git a/gdal/frmts/msgn/GNUmakefile b/frmts/msgn/GNUmakefile similarity index 100% rename from gdal/frmts/msgn/GNUmakefile rename to frmts/msgn/GNUmakefile diff --git a/gdal/frmts/msgn/makefile.vc b/frmts/msgn/makefile.vc similarity index 100% rename from gdal/frmts/msgn/makefile.vc rename to frmts/msgn/makefile.vc diff --git a/gdal/frmts/msgn/msg_basic_types.cpp b/frmts/msgn/msg_basic_types.cpp similarity index 100% rename from gdal/frmts/msgn/msg_basic_types.cpp rename to frmts/msgn/msg_basic_types.cpp diff --git a/gdal/frmts/msgn/msg_basic_types.h b/frmts/msgn/msg_basic_types.h similarity index 100% rename from gdal/frmts/msgn/msg_basic_types.h rename to frmts/msgn/msg_basic_types.h diff --git a/gdal/frmts/msgn/msg_reader_core.cpp b/frmts/msgn/msg_reader_core.cpp similarity index 100% rename from gdal/frmts/msgn/msg_reader_core.cpp rename to frmts/msgn/msg_reader_core.cpp diff --git a/gdal/frmts/msgn/msg_reader_core.h b/frmts/msgn/msg_reader_core.h similarity index 100% rename from gdal/frmts/msgn/msg_reader_core.h rename to frmts/msgn/msg_reader_core.h diff --git a/gdal/frmts/msgn/msgndataset.cpp b/frmts/msgn/msgndataset.cpp similarity index 100% rename from gdal/frmts/msgn/msgndataset.cpp rename to frmts/msgn/msgndataset.cpp diff --git a/gdal/frmts/netcdf/CMakeLists.txt b/frmts/netcdf/CMakeLists.txt similarity index 100% rename from gdal/frmts/netcdf/CMakeLists.txt rename to frmts/netcdf/CMakeLists.txt diff --git a/gdal/frmts/netcdf/GNUmakefile b/frmts/netcdf/GNUmakefile similarity index 100% rename from gdal/frmts/netcdf/GNUmakefile rename to frmts/netcdf/GNUmakefile diff --git a/gdal/frmts/netcdf/gmtdataset.cpp b/frmts/netcdf/gmtdataset.cpp similarity index 100% rename from gdal/frmts/netcdf/gmtdataset.cpp rename to frmts/netcdf/gmtdataset.cpp diff --git a/gdal/frmts/netcdf/makefile.vc b/frmts/netcdf/makefile.vc similarity index 100% rename from gdal/frmts/netcdf/makefile.vc rename to frmts/netcdf/makefile.vc diff --git a/gdal/frmts/netcdf/netcdf_cf_constants.h b/frmts/netcdf/netcdf_cf_constants.h similarity index 100% rename from gdal/frmts/netcdf/netcdf_cf_constants.h rename to frmts/netcdf/netcdf_cf_constants.h diff --git a/gdal/frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp b/frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp rename to frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp diff --git a/gdal/frmts/netcdf/netcdfdataset.cpp b/frmts/netcdf/netcdfdataset.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdfdataset.cpp rename to frmts/netcdf/netcdfdataset.cpp diff --git a/gdal/frmts/netcdf/netcdfdataset.h b/frmts/netcdf/netcdfdataset.h similarity index 100% rename from gdal/frmts/netcdf/netcdfdataset.h rename to frmts/netcdf/netcdfdataset.h diff --git a/gdal/frmts/netcdf/netcdflayer.cpp b/frmts/netcdf/netcdflayer.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdflayer.cpp rename to frmts/netcdf/netcdflayer.cpp diff --git a/gdal/frmts/netcdf/netcdflayersg.cpp b/frmts/netcdf/netcdflayersg.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdflayersg.cpp rename to frmts/netcdf/netcdflayersg.cpp diff --git a/gdal/frmts/netcdf/netcdflayersg.h b/frmts/netcdf/netcdflayersg.h similarity index 100% rename from gdal/frmts/netcdf/netcdflayersg.h rename to frmts/netcdf/netcdflayersg.h diff --git a/gdal/frmts/netcdf/netcdfmultidim.cpp b/frmts/netcdf/netcdfmultidim.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdfmultidim.cpp rename to frmts/netcdf/netcdfmultidim.cpp diff --git a/gdal/frmts/netcdf/netcdfsg.cpp b/frmts/netcdf/netcdfsg.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdfsg.cpp rename to frmts/netcdf/netcdfsg.cpp diff --git a/gdal/frmts/netcdf/netcdfsg.h b/frmts/netcdf/netcdfsg.h similarity index 100% rename from gdal/frmts/netcdf/netcdfsg.h rename to frmts/netcdf/netcdfsg.h diff --git a/gdal/frmts/netcdf/netcdfsgwriterutil.cpp b/frmts/netcdf/netcdfsgwriterutil.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdfsgwriterutil.cpp rename to frmts/netcdf/netcdfsgwriterutil.cpp diff --git a/gdal/frmts/netcdf/netcdfsgwriterutil.h b/frmts/netcdf/netcdfsgwriterutil.h similarity index 100% rename from gdal/frmts/netcdf/netcdfsgwriterutil.h rename to frmts/netcdf/netcdfsgwriterutil.h diff --git a/gdal/frmts/netcdf/netcdfuffd.h b/frmts/netcdf/netcdfuffd.h similarity index 100% rename from gdal/frmts/netcdf/netcdfuffd.h rename to frmts/netcdf/netcdfuffd.h diff --git a/gdal/frmts/netcdf/netcdfvirtual.cpp b/frmts/netcdf/netcdfvirtual.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdfvirtual.cpp rename to frmts/netcdf/netcdfvirtual.cpp diff --git a/gdal/frmts/netcdf/netcdfvirtual.h b/frmts/netcdf/netcdfvirtual.h similarity index 100% rename from gdal/frmts/netcdf/netcdfvirtual.h rename to frmts/netcdf/netcdfvirtual.h diff --git a/gdal/frmts/netcdf/netcdfwriterconfig.cpp b/frmts/netcdf/netcdfwriterconfig.cpp similarity index 100% rename from gdal/frmts/netcdf/netcdfwriterconfig.cpp rename to frmts/netcdf/netcdfwriterconfig.cpp diff --git a/gdal/frmts/ngsgeoid/CMakeLists.txt b/frmts/ngsgeoid/CMakeLists.txt similarity index 100% rename from gdal/frmts/ngsgeoid/CMakeLists.txt rename to frmts/ngsgeoid/CMakeLists.txt diff --git a/gdal/frmts/ngsgeoid/GNUmakefile b/frmts/ngsgeoid/GNUmakefile similarity index 100% rename from gdal/frmts/ngsgeoid/GNUmakefile rename to frmts/ngsgeoid/GNUmakefile diff --git a/gdal/frmts/ngsgeoid/makefile.vc b/frmts/ngsgeoid/makefile.vc similarity index 100% rename from gdal/frmts/ngsgeoid/makefile.vc rename to frmts/ngsgeoid/makefile.vc diff --git a/gdal/frmts/ngsgeoid/ngsgeoiddataset.cpp b/frmts/ngsgeoid/ngsgeoiddataset.cpp similarity index 100% rename from gdal/frmts/ngsgeoid/ngsgeoiddataset.cpp rename to frmts/ngsgeoid/ngsgeoiddataset.cpp diff --git a/gdal/frmts/nitf/CMakeLists.txt b/frmts/nitf/CMakeLists.txt similarity index 100% rename from gdal/frmts/nitf/CMakeLists.txt rename to frmts/nitf/CMakeLists.txt diff --git a/gdal/frmts/nitf/GNUmakefile b/frmts/nitf/GNUmakefile similarity index 100% rename from gdal/frmts/nitf/GNUmakefile rename to frmts/nitf/GNUmakefile diff --git a/gdal/frmts/nitf/ecrgtocdataset.cpp b/frmts/nitf/ecrgtocdataset.cpp similarity index 100% rename from gdal/frmts/nitf/ecrgtocdataset.cpp rename to frmts/nitf/ecrgtocdataset.cpp diff --git a/gdal/frmts/nitf/makefile.vc b/frmts/nitf/makefile.vc similarity index 100% rename from gdal/frmts/nitf/makefile.vc rename to frmts/nitf/makefile.vc diff --git a/gdal/frmts/nitf/mgrs.c b/frmts/nitf/mgrs.c similarity index 100% rename from gdal/frmts/nitf/mgrs.c rename to frmts/nitf/mgrs.c diff --git a/gdal/frmts/nitf/mgrs.h b/frmts/nitf/mgrs.h similarity index 100% rename from gdal/frmts/nitf/mgrs.h rename to frmts/nitf/mgrs.h diff --git a/gdal/frmts/nitf/nitf_gcprpc.cpp b/frmts/nitf/nitf_gcprpc.cpp similarity index 100% rename from gdal/frmts/nitf/nitf_gcprpc.cpp rename to frmts/nitf/nitf_gcprpc.cpp diff --git a/gdal/frmts/nitf/nitfaridpcm.cpp b/frmts/nitf/nitfaridpcm.cpp similarity index 100% rename from gdal/frmts/nitf/nitfaridpcm.cpp rename to frmts/nitf/nitfaridpcm.cpp diff --git a/gdal/frmts/nitf/nitfbilevel.cpp b/frmts/nitf/nitfbilevel.cpp similarity index 100% rename from gdal/frmts/nitf/nitfbilevel.cpp rename to frmts/nitf/nitfbilevel.cpp diff --git a/gdal/frmts/nitf/nitfdataset.cpp b/frmts/nitf/nitfdataset.cpp similarity index 100% rename from gdal/frmts/nitf/nitfdataset.cpp rename to frmts/nitf/nitfdataset.cpp diff --git a/gdal/frmts/nitf/nitfdataset.h b/frmts/nitf/nitfdataset.h similarity index 100% rename from gdal/frmts/nitf/nitfdataset.h rename to frmts/nitf/nitfdataset.h diff --git a/gdal/frmts/nitf/nitfdes.c b/frmts/nitf/nitfdes.c similarity index 100% rename from gdal/frmts/nitf/nitfdes.c rename to frmts/nitf/nitfdes.c diff --git a/gdal/frmts/nitf/nitfdump.c b/frmts/nitf/nitfdump.c similarity index 100% rename from gdal/frmts/nitf/nitfdump.c rename to frmts/nitf/nitfdump.c diff --git a/gdal/frmts/nitf/nitffile.c b/frmts/nitf/nitffile.c similarity index 100% rename from gdal/frmts/nitf/nitffile.c rename to frmts/nitf/nitffile.c diff --git a/gdal/frmts/nitf/nitfimage.c b/frmts/nitf/nitfimage.c similarity index 100% rename from gdal/frmts/nitf/nitfimage.c rename to frmts/nitf/nitfimage.c diff --git a/gdal/frmts/nitf/nitflib.h b/frmts/nitf/nitflib.h similarity index 100% rename from gdal/frmts/nitf/nitflib.h rename to frmts/nitf/nitflib.h diff --git a/gdal/frmts/nitf/nitfrasterband.cpp b/frmts/nitf/nitfrasterband.cpp similarity index 100% rename from gdal/frmts/nitf/nitfrasterband.cpp rename to frmts/nitf/nitfrasterband.cpp diff --git a/gdal/frmts/nitf/nitfwritejpeg.cpp b/frmts/nitf/nitfwritejpeg.cpp similarity index 100% rename from gdal/frmts/nitf/nitfwritejpeg.cpp rename to frmts/nitf/nitfwritejpeg.cpp diff --git a/gdal/frmts/nitf/nitfwritejpeg_12.cpp b/frmts/nitf/nitfwritejpeg_12.cpp similarity index 100% rename from gdal/frmts/nitf/nitfwritejpeg_12.cpp rename to frmts/nitf/nitfwritejpeg_12.cpp diff --git a/gdal/frmts/nitf/readme.md b/frmts/nitf/readme.md similarity index 100% rename from gdal/frmts/nitf/readme.md rename to frmts/nitf/readme.md diff --git a/gdal/frmts/nitf/rpftocdataset.cpp b/frmts/nitf/rpftocdataset.cpp similarity index 100% rename from gdal/frmts/nitf/rpftocdataset.cpp rename to frmts/nitf/rpftocdataset.cpp diff --git a/gdal/frmts/nitf/rpftocfile.cpp b/frmts/nitf/rpftocfile.cpp similarity index 100% rename from gdal/frmts/nitf/rpftocfile.cpp rename to frmts/nitf/rpftocfile.cpp diff --git a/gdal/frmts/nitf/rpftoclib.h b/frmts/nitf/rpftoclib.h similarity index 100% rename from gdal/frmts/nitf/rpftoclib.h rename to frmts/nitf/rpftoclib.h diff --git a/gdal/frmts/northwood/CMakeLists.txt b/frmts/northwood/CMakeLists.txt similarity index 100% rename from gdal/frmts/northwood/CMakeLists.txt rename to frmts/northwood/CMakeLists.txt diff --git a/gdal/frmts/northwood/GNUmakefile b/frmts/northwood/GNUmakefile similarity index 100% rename from gdal/frmts/northwood/GNUmakefile rename to frmts/northwood/GNUmakefile diff --git a/gdal/frmts/northwood/grcdataset.cpp b/frmts/northwood/grcdataset.cpp similarity index 100% rename from gdal/frmts/northwood/grcdataset.cpp rename to frmts/northwood/grcdataset.cpp diff --git a/gdal/frmts/northwood/grddataset.cpp b/frmts/northwood/grddataset.cpp similarity index 100% rename from gdal/frmts/northwood/grddataset.cpp rename to frmts/northwood/grddataset.cpp diff --git a/gdal/frmts/northwood/makefile.vc b/frmts/northwood/makefile.vc similarity index 100% rename from gdal/frmts/northwood/makefile.vc rename to frmts/northwood/makefile.vc diff --git a/gdal/frmts/northwood/northwood.cpp b/frmts/northwood/northwood.cpp similarity index 100% rename from gdal/frmts/northwood/northwood.cpp rename to frmts/northwood/northwood.cpp diff --git a/gdal/frmts/northwood/northwood.h b/frmts/northwood/northwood.h similarity index 100% rename from gdal/frmts/northwood/northwood.h rename to frmts/northwood/northwood.h diff --git a/gdal/frmts/null/GNUmakefile b/frmts/null/GNUmakefile similarity index 100% rename from gdal/frmts/null/GNUmakefile rename to frmts/null/GNUmakefile diff --git a/gdal/frmts/null/nulldataset.cpp b/frmts/null/nulldataset.cpp similarity index 100% rename from gdal/frmts/null/nulldataset.cpp rename to frmts/null/nulldataset.cpp diff --git a/gdal/frmts/o/README.TXT b/frmts/o/README.TXT similarity index 100% rename from gdal/frmts/o/README.TXT rename to frmts/o/README.TXT diff --git a/gdal/frmts/ogcapi/CMakeLists.txt b/frmts/ogcapi/CMakeLists.txt similarity index 100% rename from gdal/frmts/ogcapi/CMakeLists.txt rename to frmts/ogcapi/CMakeLists.txt diff --git a/gdal/frmts/ogcapi/GNUmakefile b/frmts/ogcapi/GNUmakefile similarity index 100% rename from gdal/frmts/ogcapi/GNUmakefile rename to frmts/ogcapi/GNUmakefile diff --git a/gdal/frmts/ogcapi/gdalogcapidataset.cpp b/frmts/ogcapi/gdalogcapidataset.cpp similarity index 100% rename from gdal/frmts/ogcapi/gdalogcapidataset.cpp rename to frmts/ogcapi/gdalogcapidataset.cpp diff --git a/gdal/frmts/ogcapi/makefile.vc b/frmts/ogcapi/makefile.vc similarity index 100% rename from gdal/frmts/ogcapi/makefile.vc rename to frmts/ogcapi/makefile.vc diff --git a/gdal/frmts/openjpeg/CMakeLists.txt b/frmts/openjpeg/CMakeLists.txt similarity index 100% rename from gdal/frmts/openjpeg/CMakeLists.txt rename to frmts/openjpeg/CMakeLists.txt diff --git a/gdal/frmts/openjpeg/GNUmakefile b/frmts/openjpeg/GNUmakefile similarity index 100% rename from gdal/frmts/openjpeg/GNUmakefile rename to frmts/openjpeg/GNUmakefile diff --git a/gdal/frmts/openjpeg/eoptemplate_pleiades.xml b/frmts/openjpeg/eoptemplate_pleiades.xml similarity index 100% rename from gdal/frmts/openjpeg/eoptemplate_pleiades.xml rename to frmts/openjpeg/eoptemplate_pleiades.xml diff --git a/gdal/frmts/openjpeg/eoptemplate_worldviewgeoeye.xml b/frmts/openjpeg/eoptemplate_worldviewgeoeye.xml similarity index 100% rename from gdal/frmts/openjpeg/eoptemplate_worldviewgeoeye.xml rename to frmts/openjpeg/eoptemplate_worldviewgeoeye.xml diff --git a/gdal/frmts/openjpeg/makefile.vc b/frmts/openjpeg/makefile.vc similarity index 100% rename from gdal/frmts/openjpeg/makefile.vc rename to frmts/openjpeg/makefile.vc diff --git a/gdal/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp similarity index 100% rename from gdal/frmts/openjpeg/openjpegdataset.cpp rename to frmts/openjpeg/openjpegdataset.cpp diff --git a/gdal/frmts/ozi/CMakeLists.txt b/frmts/ozi/CMakeLists.txt similarity index 100% rename from gdal/frmts/ozi/CMakeLists.txt rename to frmts/ozi/CMakeLists.txt diff --git a/gdal/frmts/ozi/GNUmakefile b/frmts/ozi/GNUmakefile similarity index 100% rename from gdal/frmts/ozi/GNUmakefile rename to frmts/ozi/GNUmakefile diff --git a/gdal/frmts/ozi/makefile.vc b/frmts/ozi/makefile.vc similarity index 100% rename from gdal/frmts/ozi/makefile.vc rename to frmts/ozi/makefile.vc diff --git a/gdal/frmts/ozi/ozidataset.cpp b/frmts/ozi/ozidataset.cpp similarity index 100% rename from gdal/frmts/ozi/ozidataset.cpp rename to frmts/ozi/ozidataset.cpp diff --git a/gdal/frmts/pcidsk/CMakeLists.txt b/frmts/pcidsk/CMakeLists.txt similarity index 100% rename from gdal/frmts/pcidsk/CMakeLists.txt rename to frmts/pcidsk/CMakeLists.txt diff --git a/gdal/frmts/pcidsk/GNUmakefile b/frmts/pcidsk/GNUmakefile similarity index 100% rename from gdal/frmts/pcidsk/GNUmakefile rename to frmts/pcidsk/GNUmakefile diff --git a/gdal/frmts/pcidsk/gdal_edb.cpp b/frmts/pcidsk/gdal_edb.cpp similarity index 100% rename from gdal/frmts/pcidsk/gdal_edb.cpp rename to frmts/pcidsk/gdal_edb.cpp diff --git a/gdal/frmts/pcidsk/makefile.vc b/frmts/pcidsk/makefile.vc similarity index 100% rename from gdal/frmts/pcidsk/makefile.vc rename to frmts/pcidsk/makefile.vc diff --git a/gdal/frmts/pcidsk/notes.txt b/frmts/pcidsk/notes.txt similarity index 100% rename from gdal/frmts/pcidsk/notes.txt rename to frmts/pcidsk/notes.txt diff --git a/gdal/frmts/pcidsk/ogrpcidsklayer.cpp b/frmts/pcidsk/ogrpcidsklayer.cpp similarity index 100% rename from gdal/frmts/pcidsk/ogrpcidsklayer.cpp rename to frmts/pcidsk/ogrpcidsklayer.cpp diff --git a/gdal/frmts/pcidsk/pcidskdataset2.cpp b/frmts/pcidsk/pcidskdataset2.cpp similarity index 100% rename from gdal/frmts/pcidsk/pcidskdataset2.cpp rename to frmts/pcidsk/pcidskdataset2.cpp diff --git a/gdal/frmts/pcidsk/pcidskdataset2.h b/frmts/pcidsk/pcidskdataset2.h similarity index 100% rename from gdal/frmts/pcidsk/pcidskdataset2.h rename to frmts/pcidsk/pcidskdataset2.h diff --git a/gdal/frmts/pcidsk/sdk/CMakeLists.txt b/frmts/pcidsk/sdk/CMakeLists.txt similarity index 100% rename from gdal/frmts/pcidsk/sdk/CMakeLists.txt rename to frmts/pcidsk/sdk/CMakeLists.txt diff --git a/gdal/frmts/pcidsk/sdk/Doxyfile b/frmts/pcidsk/sdk/Doxyfile similarity index 100% rename from gdal/frmts/pcidsk/sdk/Doxyfile rename to frmts/pcidsk/sdk/Doxyfile diff --git a/gdal/frmts/pcidsk/sdk/Makefile b/frmts/pcidsk/sdk/Makefile similarity index 100% rename from gdal/frmts/pcidsk/sdk/Makefile rename to frmts/pcidsk/sdk/Makefile diff --git a/gdal/frmts/pcidsk/sdk/Makefile.vc b/frmts/pcidsk/sdk/Makefile.vc similarity index 100% rename from gdal/frmts/pcidsk/sdk/Makefile.vc rename to frmts/pcidsk/sdk/Makefile.vc diff --git a/gdal/frmts/pcidsk/sdk/blockdir/Makefile b/frmts/pcidsk/sdk/blockdir/Makefile similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/Makefile rename to frmts/pcidsk/sdk/blockdir/Makefile diff --git a/gdal/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp b/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp rename to frmts/pcidsk/sdk/blockdir/asciitiledir.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/asciitiledir.h b/frmts/pcidsk/sdk/blockdir/asciitiledir.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/asciitiledir.h rename to frmts/pcidsk/sdk/blockdir/asciitiledir.h diff --git a/gdal/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp b/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp rename to frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/asciitilelayer.h b/frmts/pcidsk/sdk/blockdir/asciitilelayer.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/asciitilelayer.h rename to frmts/pcidsk/sdk/blockdir/asciitilelayer.h diff --git a/gdal/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp b/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp rename to frmts/pcidsk/sdk/blockdir/binarytiledir.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/binarytiledir.h b/frmts/pcidsk/sdk/blockdir/binarytiledir.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/binarytiledir.h rename to frmts/pcidsk/sdk/blockdir/binarytiledir.h diff --git a/gdal/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp b/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp rename to frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/binarytilelayer.h b/frmts/pcidsk/sdk/blockdir/binarytilelayer.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/binarytilelayer.h rename to frmts/pcidsk/sdk/blockdir/binarytilelayer.h diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blockdir.cpp b/frmts/pcidsk/sdk/blockdir/blockdir.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blockdir.cpp rename to frmts/pcidsk/sdk/blockdir/blockdir.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blockdir.h b/frmts/pcidsk/sdk/blockdir/blockdir.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blockdir.h rename to frmts/pcidsk/sdk/blockdir/blockdir.h diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blockfile.cpp b/frmts/pcidsk/sdk/blockdir/blockfile.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blockfile.cpp rename to frmts/pcidsk/sdk/blockdir/blockfile.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blockfile.h b/frmts/pcidsk/sdk/blockdir/blockfile.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blockfile.h rename to frmts/pcidsk/sdk/blockdir/blockfile.h diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blocklayer.cpp b/frmts/pcidsk/sdk/blockdir/blocklayer.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blocklayer.cpp rename to frmts/pcidsk/sdk/blockdir/blocklayer.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blocklayer.h b/frmts/pcidsk/sdk/blockdir/blocklayer.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blocklayer.h rename to frmts/pcidsk/sdk/blockdir/blocklayer.h diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp b/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp rename to frmts/pcidsk/sdk/blockdir/blocktiledir.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blocktiledir.h b/frmts/pcidsk/sdk/blockdir/blocktiledir.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blocktiledir.h rename to frmts/pcidsk/sdk/blockdir/blocktiledir.h diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp b/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp rename to frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp diff --git a/gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.h b/frmts/pcidsk/sdk/blockdir/blocktilelayer.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.h rename to frmts/pcidsk/sdk/blockdir/blocktilelayer.h diff --git a/gdal/frmts/pcidsk/sdk/building.dox b/frmts/pcidsk/sdk/building.dox similarity index 100% rename from gdal/frmts/pcidsk/sdk/building.dox rename to frmts/pcidsk/sdk/building.dox diff --git a/gdal/frmts/pcidsk/sdk/channel/Makefile b/frmts/pcidsk/sdk/channel/Makefile similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/Makefile rename to frmts/pcidsk/sdk/channel/Makefile diff --git a/gdal/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.cpp b/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.cpp rename to frmts/pcidsk/sdk/channel/cbandinterleavedchannel.cpp diff --git a/gdal/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.h b/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/cbandinterleavedchannel.h rename to frmts/pcidsk/sdk/channel/cbandinterleavedchannel.h diff --git a/gdal/frmts/pcidsk/sdk/channel/cexternalchannel.cpp b/frmts/pcidsk/sdk/channel/cexternalchannel.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/cexternalchannel.cpp rename to frmts/pcidsk/sdk/channel/cexternalchannel.cpp diff --git a/gdal/frmts/pcidsk/sdk/channel/cexternalchannel.h b/frmts/pcidsk/sdk/channel/cexternalchannel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/cexternalchannel.h rename to frmts/pcidsk/sdk/channel/cexternalchannel.h diff --git a/gdal/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp b/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp rename to frmts/pcidsk/sdk/channel/cpcidskchannel.cpp diff --git a/gdal/frmts/pcidsk/sdk/channel/cpcidskchannel.h b/frmts/pcidsk/sdk/channel/cpcidskchannel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/cpcidskchannel.h rename to frmts/pcidsk/sdk/channel/cpcidskchannel.h diff --git a/gdal/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.cpp b/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.cpp rename to frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.cpp diff --git a/gdal/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.h b/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.h rename to frmts/pcidsk/sdk/channel/cpixelinterleavedchannel.h diff --git a/gdal/frmts/pcidsk/sdk/channel/ctiledchannel.cpp b/frmts/pcidsk/sdk/channel/ctiledchannel.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/ctiledchannel.cpp rename to frmts/pcidsk/sdk/channel/ctiledchannel.cpp diff --git a/gdal/frmts/pcidsk/sdk/channel/ctiledchannel.h b/frmts/pcidsk/sdk/channel/ctiledchannel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/channel/ctiledchannel.h rename to frmts/pcidsk/sdk/channel/ctiledchannel.h diff --git a/gdal/frmts/pcidsk/sdk/core/Makefile b/frmts/pcidsk/sdk/core/Makefile similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/Makefile rename to frmts/pcidsk/sdk/core/Makefile diff --git a/gdal/frmts/pcidsk/sdk/core/clinksegment.cpp b/frmts/pcidsk/sdk/core/clinksegment.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/clinksegment.cpp rename to frmts/pcidsk/sdk/core/clinksegment.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/clinksegment.h b/frmts/pcidsk/sdk/core/clinksegment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/clinksegment.h rename to frmts/pcidsk/sdk/core/clinksegment.h diff --git a/gdal/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp b/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp rename to frmts/pcidsk/sdk/core/cpcidskblockfile.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/cpcidskblockfile.h b/frmts/pcidsk/sdk/core/cpcidskblockfile.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/cpcidskblockfile.h rename to frmts/pcidsk/sdk/core/cpcidskblockfile.h diff --git a/gdal/frmts/pcidsk/sdk/core/cpcidskfile.cpp b/frmts/pcidsk/sdk/core/cpcidskfile.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/cpcidskfile.cpp rename to frmts/pcidsk/sdk/core/cpcidskfile.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/cpcidskfile.h b/frmts/pcidsk/sdk/core/cpcidskfile.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/cpcidskfile.h rename to frmts/pcidsk/sdk/core/cpcidskfile.h diff --git a/gdal/frmts/pcidsk/sdk/core/edb_pcidsk.cpp b/frmts/pcidsk/sdk/core/edb_pcidsk.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/edb_pcidsk.cpp rename to frmts/pcidsk/sdk/core/edb_pcidsk.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/libjpeg_io.cpp b/frmts/pcidsk/sdk/core/libjpeg_io.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/libjpeg_io.cpp rename to frmts/pcidsk/sdk/core/libjpeg_io.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/metadataset.h b/frmts/pcidsk/sdk/core/metadataset.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/metadataset.h rename to frmts/pcidsk/sdk/core/metadataset.h diff --git a/gdal/frmts/pcidsk/sdk/core/metadataset_p.cpp b/frmts/pcidsk/sdk/core/metadataset_p.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/metadataset_p.cpp rename to frmts/pcidsk/sdk/core/metadataset_p.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/mutexholder.h b/frmts/pcidsk/sdk/core/mutexholder.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/mutexholder.h rename to frmts/pcidsk/sdk/core/mutexholder.h diff --git a/gdal/frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp b/frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp rename to frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/pcidsk_raster.cpp b/frmts/pcidsk/sdk/core/pcidsk_raster.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidsk_raster.cpp rename to frmts/pcidsk/sdk/core/pcidsk_raster.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/pcidsk_raster.h b/frmts/pcidsk/sdk/core/pcidsk_raster.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidsk_raster.h rename to frmts/pcidsk/sdk/core/pcidsk_raster.h diff --git a/gdal/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp b/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp rename to frmts/pcidsk/sdk/core/pcidsk_scanint.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/pcidsk_scanint.h b/frmts/pcidsk/sdk/core/pcidsk_scanint.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidsk_scanint.h rename to frmts/pcidsk/sdk/core/pcidsk_scanint.h diff --git a/gdal/frmts/pcidsk/sdk/core/pcidsk_utils.cpp b/frmts/pcidsk/sdk/core/pcidsk_utils.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidsk_utils.cpp rename to frmts/pcidsk/sdk/core/pcidsk_utils.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/pcidsk_utils.h b/frmts/pcidsk/sdk/core/pcidsk_utils.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidsk_utils.h rename to frmts/pcidsk/sdk/core/pcidsk_utils.h diff --git a/gdal/frmts/pcidsk/sdk/core/pcidskbuffer.cpp b/frmts/pcidsk/sdk/core/pcidskbuffer.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidskbuffer.cpp rename to frmts/pcidsk/sdk/core/pcidskbuffer.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/pcidskcreate.cpp b/frmts/pcidsk/sdk/core/pcidskcreate.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidskcreate.cpp rename to frmts/pcidsk/sdk/core/pcidskcreate.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/pcidskexception.cpp b/frmts/pcidsk/sdk/core/pcidskexception.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidskexception.cpp rename to frmts/pcidsk/sdk/core/pcidskexception.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/pcidskinterfaces.cpp b/frmts/pcidsk/sdk/core/pcidskinterfaces.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidskinterfaces.cpp rename to frmts/pcidsk/sdk/core/pcidskinterfaces.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/pcidskopen.cpp b/frmts/pcidsk/sdk/core/pcidskopen.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/pcidskopen.cpp rename to frmts/pcidsk/sdk/core/pcidskopen.cpp diff --git a/gdal/frmts/pcidsk/sdk/core/protectedfile.h b/frmts/pcidsk/sdk/core/protectedfile.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/core/protectedfile.h rename to frmts/pcidsk/sdk/core/protectedfile.h diff --git a/gdal/frmts/pcidsk/sdk/index.dox b/frmts/pcidsk/sdk/index.dox similarity index 100% rename from gdal/frmts/pcidsk/sdk/index.dox rename to frmts/pcidsk/sdk/index.dox diff --git a/gdal/frmts/pcidsk/sdk/pcidsk.h b/frmts/pcidsk/sdk/pcidsk.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk.h rename to frmts/pcidsk/sdk/pcidsk.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_array.h b/frmts/pcidsk/sdk/pcidsk_array.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_array.h rename to frmts/pcidsk/sdk/pcidsk_array.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_binary.h b/frmts/pcidsk/sdk/pcidsk_binary.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_binary.h rename to frmts/pcidsk/sdk/pcidsk_binary.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_blut.h b/frmts/pcidsk/sdk/pcidsk_blut.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_blut.h rename to frmts/pcidsk/sdk/pcidsk_blut.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_bpct.h b/frmts/pcidsk/sdk/pcidsk_bpct.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_bpct.h rename to frmts/pcidsk/sdk/pcidsk_bpct.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_buffer.h b/frmts/pcidsk/sdk/pcidsk_buffer.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_buffer.h rename to frmts/pcidsk/sdk/pcidsk_buffer.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_channel.h b/frmts/pcidsk/sdk/pcidsk_channel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_channel.h rename to frmts/pcidsk/sdk/pcidsk_channel.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_config.h b/frmts/pcidsk/sdk/pcidsk_config.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_config.h rename to frmts/pcidsk/sdk/pcidsk_config.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_edb.h b/frmts/pcidsk/sdk/pcidsk_edb.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_edb.h rename to frmts/pcidsk/sdk/pcidsk_edb.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_ephemeris.h b/frmts/pcidsk/sdk/pcidsk_ephemeris.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_ephemeris.h rename to frmts/pcidsk/sdk/pcidsk_ephemeris.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_exception.h b/frmts/pcidsk/sdk/pcidsk_exception.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_exception.h rename to frmts/pcidsk/sdk/pcidsk_exception.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_file.h b/frmts/pcidsk/sdk/pcidsk_file.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_file.h rename to frmts/pcidsk/sdk/pcidsk_file.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_gcp.h b/frmts/pcidsk/sdk/pcidsk_gcp.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_gcp.h rename to frmts/pcidsk/sdk/pcidsk_gcp.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_gcpsegment.h b/frmts/pcidsk/sdk/pcidsk_gcpsegment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_gcpsegment.h rename to frmts/pcidsk/sdk/pcidsk_gcpsegment.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_georef.h b/frmts/pcidsk/sdk/pcidsk_georef.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_georef.h rename to frmts/pcidsk/sdk/pcidsk_georef.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_interfaces.h b/frmts/pcidsk/sdk/pcidsk_interfaces.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_interfaces.h rename to frmts/pcidsk/sdk/pcidsk_interfaces.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_io.h b/frmts/pcidsk/sdk/pcidsk_io.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_io.h rename to frmts/pcidsk/sdk/pcidsk_io.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_lut.h b/frmts/pcidsk/sdk/pcidsk_lut.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_lut.h rename to frmts/pcidsk/sdk/pcidsk_lut.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_mutex.h b/frmts/pcidsk/sdk/pcidsk_mutex.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_mutex.h rename to frmts/pcidsk/sdk/pcidsk_mutex.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_pct.h b/frmts/pcidsk/sdk/pcidsk_pct.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_pct.h rename to frmts/pcidsk/sdk/pcidsk_pct.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_poly.h b/frmts/pcidsk/sdk/pcidsk_poly.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_poly.h rename to frmts/pcidsk/sdk/pcidsk_poly.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_rpc.h b/frmts/pcidsk/sdk/pcidsk_rpc.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_rpc.h rename to frmts/pcidsk/sdk/pcidsk_rpc.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_segment.h b/frmts/pcidsk/sdk/pcidsk_segment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_segment.h rename to frmts/pcidsk/sdk/pcidsk_segment.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_shape.h b/frmts/pcidsk/sdk/pcidsk_shape.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_shape.h rename to frmts/pcidsk/sdk/pcidsk_shape.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_tex.h b/frmts/pcidsk/sdk/pcidsk_tex.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_tex.h rename to frmts/pcidsk/sdk/pcidsk_tex.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_toutin.h b/frmts/pcidsk/sdk/pcidsk_toutin.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_toutin.h rename to frmts/pcidsk/sdk/pcidsk_toutin.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_types.h b/frmts/pcidsk/sdk/pcidsk_types.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_types.h rename to frmts/pcidsk/sdk/pcidsk_types.h diff --git a/gdal/frmts/pcidsk/sdk/pcidsk_vectorsegment.h b/frmts/pcidsk/sdk/pcidsk_vectorsegment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsk_vectorsegment.h rename to frmts/pcidsk/sdk/pcidsk_vectorsegment.h diff --git a/gdal/frmts/pcidsk/sdk/pcidskchannel.dox b/frmts/pcidsk/sdk/pcidskchannel.dox similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidskchannel.dox rename to frmts/pcidsk/sdk/pcidskchannel.dox diff --git a/gdal/frmts/pcidsk/sdk/pcidskfile.dox b/frmts/pcidsk/sdk/pcidskfile.dox similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidskfile.dox rename to frmts/pcidsk/sdk/pcidskfile.dox diff --git a/gdal/frmts/pcidsk/sdk/pcidskmutex.dox b/frmts/pcidsk/sdk/pcidskmutex.dox similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidskmutex.dox rename to frmts/pcidsk/sdk/pcidskmutex.dox diff --git a/gdal/frmts/pcidsk/sdk/pcidsksegment.dox b/frmts/pcidsk/sdk/pcidsksegment.dox similarity index 100% rename from gdal/frmts/pcidsk/sdk/pcidsksegment.dox rename to frmts/pcidsk/sdk/pcidsksegment.dox diff --git a/gdal/frmts/pcidsk/sdk/port/Makefile b/frmts/pcidsk/sdk/port/Makefile similarity index 100% rename from gdal/frmts/pcidsk/sdk/port/Makefile rename to frmts/pcidsk/sdk/port/Makefile diff --git a/gdal/frmts/pcidsk/sdk/port/io_stdio.cpp b/frmts/pcidsk/sdk/port/io_stdio.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/port/io_stdio.cpp rename to frmts/pcidsk/sdk/port/io_stdio.cpp diff --git a/gdal/frmts/pcidsk/sdk/port/io_win32.cpp b/frmts/pcidsk/sdk/port/io_win32.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/port/io_win32.cpp rename to frmts/pcidsk/sdk/port/io_win32.cpp diff --git a/gdal/frmts/pcidsk/sdk/port/pthread_mutex.cpp b/frmts/pcidsk/sdk/port/pthread_mutex.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/port/pthread_mutex.cpp rename to frmts/pcidsk/sdk/port/pthread_mutex.cpp diff --git a/gdal/frmts/pcidsk/sdk/port/win32_mutex.cpp b/frmts/pcidsk/sdk/port/win32_mutex.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/port/win32_mutex.cpp rename to frmts/pcidsk/sdk/port/win32_mutex.cpp diff --git a/gdal/frmts/pcidsk/sdk/raster/rasterconfig.h b/frmts/pcidsk/sdk/raster/rasterconfig.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/raster/rasterconfig.h rename to frmts/pcidsk/sdk/raster/rasterconfig.h diff --git a/gdal/frmts/pcidsk/sdk/raster/rastertypes.hh b/frmts/pcidsk/sdk/raster/rastertypes.hh similarity index 100% rename from gdal/frmts/pcidsk/sdk/raster/rastertypes.hh rename to frmts/pcidsk/sdk/raster/rastertypes.hh diff --git a/gdal/frmts/pcidsk/sdk/segment/Makefile b/frmts/pcidsk/sdk/segment/Makefile similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/Makefile rename to frmts/pcidsk/sdk/segment/Makefile diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsk_array.cpp b/frmts/pcidsk/sdk/segment/cpcidsk_array.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsk_array.cpp rename to frmts/pcidsk/sdk/segment/cpcidsk_array.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsk_array.h b/frmts/pcidsk/sdk/segment/cpcidsk_array.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsk_array.h rename to frmts/pcidsk/sdk/segment/cpcidsk_array.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsk_tex.cpp b/frmts/pcidsk/sdk/segment/cpcidsk_tex.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsk_tex.cpp rename to frmts/pcidsk/sdk/segment/cpcidsk_tex.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsk_tex.h b/frmts/pcidsk/sdk/segment/cpcidsk_tex.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsk_tex.h rename to frmts/pcidsk/sdk/segment/cpcidsk_tex.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp b/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp rename to frmts/pcidsk/sdk/segment/cpcidskbinarysegment.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.h b/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskbinarysegment.h rename to frmts/pcidsk/sdk/segment/cpcidskbinarysegment.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp b/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp rename to frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskbitmap.h b/frmts/pcidsk/sdk/segment/cpcidskbitmap.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskbitmap.h rename to frmts/pcidsk/sdk/segment/cpcidskbitmap.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskblut.cpp b/frmts/pcidsk/sdk/segment/cpcidskblut.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskblut.cpp rename to frmts/pcidsk/sdk/segment/cpcidskblut.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskblut.h b/frmts/pcidsk/sdk/segment/cpcidskblut.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskblut.h rename to frmts/pcidsk/sdk/segment/cpcidskblut.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp b/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp rename to frmts/pcidsk/sdk/segment/cpcidskbpct.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskbpct.h b/frmts/pcidsk/sdk/segment/cpcidskbpct.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskbpct.h rename to frmts/pcidsk/sdk/segment/cpcidskbpct.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.cpp b/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.cpp rename to frmts/pcidsk/sdk/segment/cpcidskephemerissegment.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.h b/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskephemerissegment.h rename to frmts/pcidsk/sdk/segment/cpcidskephemerissegment.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.cpp b/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.cpp rename to frmts/pcidsk/sdk/segment/cpcidskgcp2segment.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.h b/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskgcp2segment.h rename to frmts/pcidsk/sdk/segment/cpcidskgcp2segment.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp b/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp rename to frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskgeoref.h b/frmts/pcidsk/sdk/segment/cpcidskgeoref.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskgeoref.h rename to frmts/pcidsk/sdk/segment/cpcidskgeoref.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsklut.cpp b/frmts/pcidsk/sdk/segment/cpcidsklut.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsklut.cpp rename to frmts/pcidsk/sdk/segment/cpcidsklut.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsklut.h b/frmts/pcidsk/sdk/segment/cpcidsklut.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsklut.h rename to frmts/pcidsk/sdk/segment/cpcidsklut.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskpct.cpp b/frmts/pcidsk/sdk/segment/cpcidskpct.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskpct.cpp rename to frmts/pcidsk/sdk/segment/cpcidskpct.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskpct.h b/frmts/pcidsk/sdk/segment/cpcidskpct.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskpct.h rename to frmts/pcidsk/sdk/segment/cpcidskpct.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp b/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp rename to frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskpolymodel.h b/frmts/pcidsk/sdk/segment/cpcidskpolymodel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskpolymodel.h rename to frmts/pcidsk/sdk/segment/cpcidskpolymodel.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp b/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp rename to frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h b/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h rename to frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsksegment.cpp b/frmts/pcidsk/sdk/segment/cpcidsksegment.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsksegment.cpp rename to frmts/pcidsk/sdk/segment/cpcidsksegment.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsksegment.h b/frmts/pcidsk/sdk/segment/cpcidsksegment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsksegment.h rename to frmts/pcidsk/sdk/segment/cpcidsksegment.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.cpp b/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.cpp rename to frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.h b/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.h rename to frmts/pcidsk/sdk/segment/cpcidsktoutinmodel.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp rename to frmts/pcidsk/sdk/segment/cpcidskvectorsegment.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.h b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment.h rename to frmts/pcidsk/sdk/segment/cpcidskvectorsegment.h diff --git a/gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment_consistencycheck.cpp b/frmts/pcidsk/sdk/segment/cpcidskvectorsegment_consistencycheck.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/cpcidskvectorsegment_consistencycheck.cpp rename to frmts/pcidsk/sdk/segment/cpcidskvectorsegment_consistencycheck.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/metadatasegment.h b/frmts/pcidsk/sdk/segment/metadatasegment.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/metadatasegment.h rename to frmts/pcidsk/sdk/segment/metadatasegment.h diff --git a/gdal/frmts/pcidsk/sdk/segment/metadatasegment_p.cpp b/frmts/pcidsk/sdk/segment/metadatasegment_p.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/metadatasegment_p.cpp rename to frmts/pcidsk/sdk/segment/metadatasegment_p.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/orbitstructures.h b/frmts/pcidsk/sdk/segment/orbitstructures.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/orbitstructures.h rename to frmts/pcidsk/sdk/segment/orbitstructures.h diff --git a/gdal/frmts/pcidsk/sdk/segment/pcidsksegmentbuilder.h b/frmts/pcidsk/sdk/segment/pcidsksegmentbuilder.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/pcidsksegmentbuilder.h rename to frmts/pcidsk/sdk/segment/pcidsksegmentbuilder.h diff --git a/gdal/frmts/pcidsk/sdk/segment/systiledir.cpp b/frmts/pcidsk/sdk/segment/systiledir.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/systiledir.cpp rename to frmts/pcidsk/sdk/segment/systiledir.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/systiledir.h b/frmts/pcidsk/sdk/segment/systiledir.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/systiledir.h rename to frmts/pcidsk/sdk/segment/systiledir.h diff --git a/gdal/frmts/pcidsk/sdk/segment/toutinstructures.h b/frmts/pcidsk/sdk/segment/toutinstructures.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/toutinstructures.h rename to frmts/pcidsk/sdk/segment/toutinstructures.h diff --git a/gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp b/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp rename to frmts/pcidsk/sdk/segment/vecsegdataindex.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.h b/frmts/pcidsk/sdk/segment/vecsegdataindex.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.h rename to frmts/pcidsk/sdk/segment/vecsegdataindex.h diff --git a/gdal/frmts/pcidsk/sdk/segment/vecsegheader.cpp b/frmts/pcidsk/sdk/segment/vecsegheader.cpp similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/vecsegheader.cpp rename to frmts/pcidsk/sdk/segment/vecsegheader.cpp diff --git a/gdal/frmts/pcidsk/sdk/segment/vecsegheader.h b/frmts/pcidsk/sdk/segment/vecsegheader.h similarity index 100% rename from gdal/frmts/pcidsk/sdk/segment/vecsegheader.h rename to frmts/pcidsk/sdk/segment/vecsegheader.h diff --git a/gdal/frmts/pcidsk/sdk/tutorial.dox b/frmts/pcidsk/sdk/tutorial.dox similarity index 100% rename from gdal/frmts/pcidsk/sdk/tutorial.dox rename to frmts/pcidsk/sdk/tutorial.dox diff --git a/gdal/frmts/pcidsk/vsi_pcidsk_io.cpp b/frmts/pcidsk/vsi_pcidsk_io.cpp similarity index 100% rename from gdal/frmts/pcidsk/vsi_pcidsk_io.cpp rename to frmts/pcidsk/vsi_pcidsk_io.cpp diff --git a/gdal/frmts/pcraster/CMakeLists.txt b/frmts/pcraster/CMakeLists.txt similarity index 100% rename from gdal/frmts/pcraster/CMakeLists.txt rename to frmts/pcraster/CMakeLists.txt diff --git a/gdal/frmts/pcraster/GNUmakefile b/frmts/pcraster/GNUmakefile similarity index 100% rename from gdal/frmts/pcraster/GNUmakefile rename to frmts/pcraster/GNUmakefile diff --git a/gdal/frmts/pcraster/doxygen.cfg b/frmts/pcraster/doxygen.cfg similarity index 100% rename from gdal/frmts/pcraster/doxygen.cfg rename to frmts/pcraster/doxygen.cfg diff --git a/gdal/frmts/pcraster/libcsf/AUTHORS b/frmts/pcraster/libcsf/AUTHORS similarity index 100% rename from gdal/frmts/pcraster/libcsf/AUTHORS rename to frmts/pcraster/libcsf/AUTHORS diff --git a/gdal/frmts/pcraster/libcsf/CMakeLists.txt b/frmts/pcraster/libcsf/CMakeLists.txt similarity index 100% rename from gdal/frmts/pcraster/libcsf/CMakeLists.txt rename to frmts/pcraster/libcsf/CMakeLists.txt diff --git a/gdal/frmts/pcraster/libcsf/COPYING b/frmts/pcraster/libcsf/COPYING similarity index 100% rename from gdal/frmts/pcraster/libcsf/COPYING rename to frmts/pcraster/libcsf/COPYING diff --git a/gdal/frmts/pcraster/libcsf/README b/frmts/pcraster/libcsf/README similarity index 100% rename from gdal/frmts/pcraster/libcsf/README rename to frmts/pcraster/libcsf/README diff --git a/gdal/frmts/pcraster/libcsf/_getcell.c b/frmts/pcraster/libcsf/_getcell.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/_getcell.c rename to frmts/pcraster/libcsf/_getcell.c diff --git a/gdal/frmts/pcraster/libcsf/_getrow.c b/frmts/pcraster/libcsf/_getrow.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/_getrow.c rename to frmts/pcraster/libcsf/_getrow.c diff --git a/gdal/frmts/pcraster/libcsf/_gsomece.c b/frmts/pcraster/libcsf/_gsomece.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/_gsomece.c rename to frmts/pcraster/libcsf/_gsomece.c diff --git a/gdal/frmts/pcraster/libcsf/_putcell.c b/frmts/pcraster/libcsf/_putcell.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/_putcell.c rename to frmts/pcraster/libcsf/_putcell.c diff --git a/gdal/frmts/pcraster/libcsf/_rputrow.c b/frmts/pcraster/libcsf/_rputrow.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/_rputrow.c rename to frmts/pcraster/libcsf/_rputrow.c diff --git a/gdal/frmts/pcraster/libcsf/angle.c b/frmts/pcraster/libcsf/angle.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/angle.c rename to frmts/pcraster/libcsf/angle.c diff --git a/gdal/frmts/pcraster/libcsf/attravai.c b/frmts/pcraster/libcsf/attravai.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/attravai.c rename to frmts/pcraster/libcsf/attravai.c diff --git a/gdal/frmts/pcraster/libcsf/attrsize.c b/frmts/pcraster/libcsf/attrsize.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/attrsize.c rename to frmts/pcraster/libcsf/attrsize.c diff --git a/gdal/frmts/pcraster/libcsf/cellsize.c b/frmts/pcraster/libcsf/cellsize.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/cellsize.c rename to frmts/pcraster/libcsf/cellsize.c diff --git a/gdal/frmts/pcraster/libcsf/create2.c b/frmts/pcraster/libcsf/create2.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/create2.c rename to frmts/pcraster/libcsf/create2.c diff --git a/gdal/frmts/pcraster/libcsf/csf.h b/frmts/pcraster/libcsf/csf.h similarity index 100% rename from gdal/frmts/pcraster/libcsf/csf.h rename to frmts/pcraster/libcsf/csf.h diff --git a/gdal/frmts/pcraster/libcsf/csfattr.h b/frmts/pcraster/libcsf/csfattr.h similarity index 100% rename from gdal/frmts/pcraster/libcsf/csfattr.h rename to frmts/pcraster/libcsf/csfattr.h diff --git a/gdal/frmts/pcraster/libcsf/csfglob.c b/frmts/pcraster/libcsf/csfglob.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/csfglob.c rename to frmts/pcraster/libcsf/csfglob.c diff --git a/gdal/frmts/pcraster/libcsf/csfimpl.h b/frmts/pcraster/libcsf/csfimpl.h similarity index 100% rename from gdal/frmts/pcraster/libcsf/csfimpl.h rename to frmts/pcraster/libcsf/csfimpl.h diff --git a/gdal/frmts/pcraster/libcsf/csfsup.c b/frmts/pcraster/libcsf/csfsup.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/csfsup.c rename to frmts/pcraster/libcsf/csfsup.c diff --git a/gdal/frmts/pcraster/libcsf/csftypes.h b/frmts/pcraster/libcsf/csftypes.h similarity index 100% rename from gdal/frmts/pcraster/libcsf/csftypes.h rename to frmts/pcraster/libcsf/csftypes.h diff --git a/gdal/frmts/pcraster/libcsf/delattr.c b/frmts/pcraster/libcsf/delattr.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/delattr.c rename to frmts/pcraster/libcsf/delattr.c diff --git a/gdal/frmts/pcraster/libcsf/dumconv.c b/frmts/pcraster/libcsf/dumconv.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/dumconv.c rename to frmts/pcraster/libcsf/dumconv.c diff --git a/gdal/frmts/pcraster/libcsf/endian.c b/frmts/pcraster/libcsf/endian.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/endian.c rename to frmts/pcraster/libcsf/endian.c diff --git a/gdal/frmts/pcraster/libcsf/file.c b/frmts/pcraster/libcsf/file.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/file.c rename to frmts/pcraster/libcsf/file.c diff --git a/gdal/frmts/pcraster/libcsf/filename.c b/frmts/pcraster/libcsf/filename.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/filename.c rename to frmts/pcraster/libcsf/filename.c diff --git a/gdal/frmts/pcraster/libcsf/gattrblk.c b/frmts/pcraster/libcsf/gattrblk.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gattrblk.c rename to frmts/pcraster/libcsf/gattrblk.c diff --git a/gdal/frmts/pcraster/libcsf/gattridx.c b/frmts/pcraster/libcsf/gattridx.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gattridx.c rename to frmts/pcraster/libcsf/gattridx.c diff --git a/gdal/frmts/pcraster/libcsf/gcellrep.c b/frmts/pcraster/libcsf/gcellrep.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gcellrep.c rename to frmts/pcraster/libcsf/gcellrep.c diff --git a/gdal/frmts/pcraster/libcsf/gdattype.c b/frmts/pcraster/libcsf/gdattype.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gdattype.c rename to frmts/pcraster/libcsf/gdattype.c diff --git a/gdal/frmts/pcraster/libcsf/getattr.c b/frmts/pcraster/libcsf/getattr.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/getattr.c rename to frmts/pcraster/libcsf/getattr.c diff --git a/gdal/frmts/pcraster/libcsf/getx0.c b/frmts/pcraster/libcsf/getx0.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/getx0.c rename to frmts/pcraster/libcsf/getx0.c diff --git a/gdal/frmts/pcraster/libcsf/gety0.c b/frmts/pcraster/libcsf/gety0.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gety0.c rename to frmts/pcraster/libcsf/gety0.c diff --git a/gdal/frmts/pcraster/libcsf/ggisfid.c b/frmts/pcraster/libcsf/ggisfid.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/ggisfid.c rename to frmts/pcraster/libcsf/ggisfid.c diff --git a/gdal/frmts/pcraster/libcsf/gmaxval.c b/frmts/pcraster/libcsf/gmaxval.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gmaxval.c rename to frmts/pcraster/libcsf/gmaxval.c diff --git a/gdal/frmts/pcraster/libcsf/gminval.c b/frmts/pcraster/libcsf/gminval.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gminval.c rename to frmts/pcraster/libcsf/gminval.c diff --git a/gdal/frmts/pcraster/libcsf/gnrcols.c b/frmts/pcraster/libcsf/gnrcols.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gnrcols.c rename to frmts/pcraster/libcsf/gnrcols.c diff --git a/gdal/frmts/pcraster/libcsf/gnrrows.c b/frmts/pcraster/libcsf/gnrrows.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gnrrows.c rename to frmts/pcraster/libcsf/gnrrows.c diff --git a/gdal/frmts/pcraster/libcsf/gproj.c b/frmts/pcraster/libcsf/gproj.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gproj.c rename to frmts/pcraster/libcsf/gproj.c diff --git a/gdal/frmts/pcraster/libcsf/gputproj.c b/frmts/pcraster/libcsf/gputproj.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gputproj.c rename to frmts/pcraster/libcsf/gputproj.c diff --git a/gdal/frmts/pcraster/libcsf/gvalscal.c b/frmts/pcraster/libcsf/gvalscal.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gvalscal.c rename to frmts/pcraster/libcsf/gvalscal.c diff --git a/gdal/frmts/pcraster/libcsf/gvartype.c b/frmts/pcraster/libcsf/gvartype.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gvartype.c rename to frmts/pcraster/libcsf/gvartype.c diff --git a/gdal/frmts/pcraster/libcsf/gversion.c b/frmts/pcraster/libcsf/gversion.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/gversion.c rename to frmts/pcraster/libcsf/gversion.c diff --git a/gdal/frmts/pcraster/libcsf/ismv.c b/frmts/pcraster/libcsf/ismv.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/ismv.c rename to frmts/pcraster/libcsf/ismv.c diff --git a/gdal/frmts/pcraster/libcsf/kernlcsf.c b/frmts/pcraster/libcsf/kernlcsf.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/kernlcsf.c rename to frmts/pcraster/libcsf/kernlcsf.c diff --git a/gdal/frmts/pcraster/libcsf/legend.c b/frmts/pcraster/libcsf/legend.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/legend.c rename to frmts/pcraster/libcsf/legend.c diff --git a/gdal/frmts/pcraster/libcsf/makefile.vc b/frmts/pcraster/libcsf/makefile.vc similarity index 100% rename from gdal/frmts/pcraster/libcsf/makefile.vc rename to frmts/pcraster/libcsf/makefile.vc diff --git a/gdal/frmts/pcraster/libcsf/mclose.c b/frmts/pcraster/libcsf/mclose.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/mclose.c rename to frmts/pcraster/libcsf/mclose.c diff --git a/gdal/frmts/pcraster/libcsf/mopen.c b/frmts/pcraster/libcsf/mopen.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/mopen.c rename to frmts/pcraster/libcsf/mopen.c diff --git a/gdal/frmts/pcraster/libcsf/moreattr.c b/frmts/pcraster/libcsf/moreattr.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/moreattr.c rename to frmts/pcraster/libcsf/moreattr.c diff --git a/gdal/frmts/pcraster/libcsf/mperror.c b/frmts/pcraster/libcsf/mperror.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/mperror.c rename to frmts/pcraster/libcsf/mperror.c diff --git a/gdal/frmts/pcraster/libcsf/pcrtypes.h b/frmts/pcraster/libcsf/pcrtypes.h similarity index 100% rename from gdal/frmts/pcraster/libcsf/pcrtypes.h rename to frmts/pcraster/libcsf/pcrtypes.h diff --git a/gdal/frmts/pcraster/libcsf/pgisfid.c b/frmts/pcraster/libcsf/pgisfid.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/pgisfid.c rename to frmts/pcraster/libcsf/pgisfid.c diff --git a/gdal/frmts/pcraster/libcsf/pmaxval.c b/frmts/pcraster/libcsf/pmaxval.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/pmaxval.c rename to frmts/pcraster/libcsf/pmaxval.c diff --git a/gdal/frmts/pcraster/libcsf/pminval.c b/frmts/pcraster/libcsf/pminval.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/pminval.c rename to frmts/pcraster/libcsf/pminval.c diff --git a/gdal/frmts/pcraster/libcsf/putallmv.c b/frmts/pcraster/libcsf/putallmv.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/putallmv.c rename to frmts/pcraster/libcsf/putallmv.c diff --git a/gdal/frmts/pcraster/libcsf/putattr.c b/frmts/pcraster/libcsf/putattr.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/putattr.c rename to frmts/pcraster/libcsf/putattr.c diff --git a/gdal/frmts/pcraster/libcsf/putsomec.c b/frmts/pcraster/libcsf/putsomec.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/putsomec.c rename to frmts/pcraster/libcsf/putsomec.c diff --git a/gdal/frmts/pcraster/libcsf/putx0.c b/frmts/pcraster/libcsf/putx0.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/putx0.c rename to frmts/pcraster/libcsf/putx0.c diff --git a/gdal/frmts/pcraster/libcsf/puty0.c b/frmts/pcraster/libcsf/puty0.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/puty0.c rename to frmts/pcraster/libcsf/puty0.c diff --git a/gdal/frmts/pcraster/libcsf/pvalscal.c b/frmts/pcraster/libcsf/pvalscal.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/pvalscal.c rename to frmts/pcraster/libcsf/pvalscal.c diff --git a/gdal/frmts/pcraster/libcsf/rattrblk.c b/frmts/pcraster/libcsf/rattrblk.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/rattrblk.c rename to frmts/pcraster/libcsf/rattrblk.c diff --git a/gdal/frmts/pcraster/libcsf/rcomp.c b/frmts/pcraster/libcsf/rcomp.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/rcomp.c rename to frmts/pcraster/libcsf/rcomp.c diff --git a/gdal/frmts/pcraster/libcsf/rcoords.c b/frmts/pcraster/libcsf/rcoords.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/rcoords.c rename to frmts/pcraster/libcsf/rcoords.c diff --git a/gdal/frmts/pcraster/libcsf/rdup2.c b/frmts/pcraster/libcsf/rdup2.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/rdup2.c rename to frmts/pcraster/libcsf/rdup2.c diff --git a/gdal/frmts/pcraster/libcsf/reseterr.c b/frmts/pcraster/libcsf/reseterr.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/reseterr.c rename to frmts/pcraster/libcsf/reseterr.c diff --git a/gdal/frmts/pcraster/libcsf/rextend.c b/frmts/pcraster/libcsf/rextend.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/rextend.c rename to frmts/pcraster/libcsf/rextend.c diff --git a/gdal/frmts/pcraster/libcsf/rmalloc.c b/frmts/pcraster/libcsf/rmalloc.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/rmalloc.c rename to frmts/pcraster/libcsf/rmalloc.c diff --git a/gdal/frmts/pcraster/libcsf/rrowcol.c b/frmts/pcraster/libcsf/rrowcol.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/rrowcol.c rename to frmts/pcraster/libcsf/rrowcol.c diff --git a/gdal/frmts/pcraster/libcsf/ruseas.c b/frmts/pcraster/libcsf/ruseas.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/ruseas.c rename to frmts/pcraster/libcsf/ruseas.c diff --git a/gdal/frmts/pcraster/libcsf/setangle.c b/frmts/pcraster/libcsf/setangle.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/setangle.c rename to frmts/pcraster/libcsf/setangle.c diff --git a/gdal/frmts/pcraster/libcsf/setmv.c b/frmts/pcraster/libcsf/setmv.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/setmv.c rename to frmts/pcraster/libcsf/setmv.c diff --git a/gdal/frmts/pcraster/libcsf/setvtmv.c b/frmts/pcraster/libcsf/setvtmv.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/setvtmv.c rename to frmts/pcraster/libcsf/setvtmv.c diff --git a/gdal/frmts/pcraster/libcsf/strconst.c b/frmts/pcraster/libcsf/strconst.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/strconst.c rename to frmts/pcraster/libcsf/strconst.c diff --git a/gdal/frmts/pcraster/libcsf/strpad.c b/frmts/pcraster/libcsf/strpad.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/strpad.c rename to frmts/pcraster/libcsf/strpad.c diff --git a/gdal/frmts/pcraster/libcsf/swapio.c b/frmts/pcraster/libcsf/swapio.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/swapio.c rename to frmts/pcraster/libcsf/swapio.c diff --git a/gdal/frmts/pcraster/libcsf/trackmm.c b/frmts/pcraster/libcsf/trackmm.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/trackmm.c rename to frmts/pcraster/libcsf/trackmm.c diff --git a/gdal/frmts/pcraster/libcsf/vs2.c b/frmts/pcraster/libcsf/vs2.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/vs2.c rename to frmts/pcraster/libcsf/vs2.c diff --git a/gdal/frmts/pcraster/libcsf/vsdef.c b/frmts/pcraster/libcsf/vsdef.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/vsdef.c rename to frmts/pcraster/libcsf/vsdef.c diff --git a/gdal/frmts/pcraster/libcsf/vsis.c b/frmts/pcraster/libcsf/vsis.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/vsis.c rename to frmts/pcraster/libcsf/vsis.c diff --git a/gdal/frmts/pcraster/libcsf/vsvers.c b/frmts/pcraster/libcsf/vsvers.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/vsvers.c rename to frmts/pcraster/libcsf/vsvers.c diff --git a/gdal/frmts/pcraster/libcsf/wattrblk.c b/frmts/pcraster/libcsf/wattrblk.c similarity index 100% rename from gdal/frmts/pcraster/libcsf/wattrblk.c rename to frmts/pcraster/libcsf/wattrblk.c diff --git a/gdal/frmts/pcraster/makefile.vc b/frmts/pcraster/makefile.vc similarity index 100% rename from gdal/frmts/pcraster/makefile.vc rename to frmts/pcraster/makefile.vc diff --git a/gdal/frmts/pcraster/pcrasterdataset.cpp b/frmts/pcraster/pcrasterdataset.cpp similarity index 100% rename from gdal/frmts/pcraster/pcrasterdataset.cpp rename to frmts/pcraster/pcrasterdataset.cpp diff --git a/gdal/frmts/pcraster/pcrasterdataset.h b/frmts/pcraster/pcrasterdataset.h similarity index 100% rename from gdal/frmts/pcraster/pcrasterdataset.h rename to frmts/pcraster/pcrasterdataset.h diff --git a/gdal/frmts/pcraster/pcrastermisc.cpp b/frmts/pcraster/pcrastermisc.cpp similarity index 100% rename from gdal/frmts/pcraster/pcrastermisc.cpp rename to frmts/pcraster/pcrastermisc.cpp diff --git a/gdal/frmts/pcraster/pcrasterrasterband.cpp b/frmts/pcraster/pcrasterrasterband.cpp similarity index 100% rename from gdal/frmts/pcraster/pcrasterrasterband.cpp rename to frmts/pcraster/pcrasterrasterband.cpp diff --git a/gdal/frmts/pcraster/pcrasterrasterband.h b/frmts/pcraster/pcrasterrasterband.h similarity index 100% rename from gdal/frmts/pcraster/pcrasterrasterband.h rename to frmts/pcraster/pcrasterrasterband.h diff --git a/gdal/frmts/pcraster/pcrasterutil.cpp b/frmts/pcraster/pcrasterutil.cpp similarity index 100% rename from gdal/frmts/pcraster/pcrasterutil.cpp rename to frmts/pcraster/pcrasterutil.cpp diff --git a/gdal/frmts/pcraster/pcrasterutil.h b/frmts/pcraster/pcrasterutil.h similarity index 100% rename from gdal/frmts/pcraster/pcrasterutil.h rename to frmts/pcraster/pcrasterutil.h diff --git a/gdal/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt similarity index 100% rename from gdal/frmts/pdf/CMakeLists.txt rename to frmts/pdf/CMakeLists.txt diff --git a/gdal/frmts/pdf/GNUmakefile b/frmts/pdf/GNUmakefile similarity index 100% rename from gdal/frmts/pdf/GNUmakefile rename to frmts/pdf/GNUmakefile diff --git a/gdal/frmts/pdf/gdal_pdf.h b/frmts/pdf/gdal_pdf.h similarity index 100% rename from gdal/frmts/pdf/gdal_pdf.h rename to frmts/pdf/gdal_pdf.h diff --git a/gdal/frmts/pdf/makefile.vc b/frmts/pdf/makefile.vc similarity index 100% rename from gdal/frmts/pdf/makefile.vc rename to frmts/pdf/makefile.vc diff --git a/gdal/frmts/pdf/ogrpdflayer.cpp b/frmts/pdf/ogrpdflayer.cpp similarity index 100% rename from gdal/frmts/pdf/ogrpdflayer.cpp rename to frmts/pdf/ogrpdflayer.cpp diff --git a/gdal/frmts/pdf/pdfcreatecopy.cpp b/frmts/pdf/pdfcreatecopy.cpp similarity index 100% rename from gdal/frmts/pdf/pdfcreatecopy.cpp rename to frmts/pdf/pdfcreatecopy.cpp diff --git a/gdal/frmts/pdf/pdfcreatecopy.h b/frmts/pdf/pdfcreatecopy.h similarity index 100% rename from gdal/frmts/pdf/pdfcreatecopy.h rename to frmts/pdf/pdfcreatecopy.h diff --git a/gdal/frmts/pdf/pdfcreatefromcomposition.cpp b/frmts/pdf/pdfcreatefromcomposition.cpp similarity index 100% rename from gdal/frmts/pdf/pdfcreatefromcomposition.cpp rename to frmts/pdf/pdfcreatefromcomposition.cpp diff --git a/gdal/frmts/pdf/pdfcreatefromcomposition.h b/frmts/pdf/pdfcreatefromcomposition.h similarity index 100% rename from gdal/frmts/pdf/pdfcreatefromcomposition.h rename to frmts/pdf/pdfcreatefromcomposition.h diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp similarity index 100% rename from gdal/frmts/pdf/pdfdataset.cpp rename to frmts/pdf/pdfdataset.cpp diff --git a/gdal/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp similarity index 100% rename from gdal/frmts/pdf/pdfio.cpp rename to frmts/pdf/pdfio.cpp diff --git a/gdal/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h similarity index 100% rename from gdal/frmts/pdf/pdfio.h rename to frmts/pdf/pdfio.h diff --git a/gdal/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp similarity index 100% rename from gdal/frmts/pdf/pdfobject.cpp rename to frmts/pdf/pdfobject.cpp diff --git a/gdal/frmts/pdf/pdfobject.h b/frmts/pdf/pdfobject.h similarity index 100% rename from gdal/frmts/pdf/pdfobject.h rename to frmts/pdf/pdfobject.h diff --git a/gdal/frmts/pdf/pdfreadvectors.cpp b/frmts/pdf/pdfreadvectors.cpp similarity index 100% rename from gdal/frmts/pdf/pdfreadvectors.cpp rename to frmts/pdf/pdfreadvectors.cpp diff --git a/gdal/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h similarity index 100% rename from gdal/frmts/pdf/pdfsdk_headers.h rename to frmts/pdf/pdfsdk_headers.h diff --git a/gdal/frmts/pdf/pdfwritabledataset.cpp b/frmts/pdf/pdfwritabledataset.cpp similarity index 100% rename from gdal/frmts/pdf/pdfwritabledataset.cpp rename to frmts/pdf/pdfwritabledataset.cpp diff --git a/gdal/frmts/pds/CMakeLists.txt b/frmts/pds/CMakeLists.txt similarity index 100% rename from gdal/frmts/pds/CMakeLists.txt rename to frmts/pds/CMakeLists.txt diff --git a/gdal/frmts/pds/GNUmakefile b/frmts/pds/GNUmakefile similarity index 100% rename from gdal/frmts/pds/GNUmakefile rename to frmts/pds/GNUmakefile diff --git a/gdal/frmts/pds/isis2dataset.cpp b/frmts/pds/isis2dataset.cpp similarity index 100% rename from gdal/frmts/pds/isis2dataset.cpp rename to frmts/pds/isis2dataset.cpp diff --git a/gdal/frmts/pds/isis3dataset.cpp b/frmts/pds/isis3dataset.cpp similarity index 100% rename from gdal/frmts/pds/isis3dataset.cpp rename to frmts/pds/isis3dataset.cpp diff --git a/gdal/frmts/pds/makefile.vc b/frmts/pds/makefile.vc similarity index 100% rename from gdal/frmts/pds/makefile.vc rename to frmts/pds/makefile.vc diff --git a/gdal/frmts/pds/pds4dataset.cpp b/frmts/pds/pds4dataset.cpp similarity index 100% rename from gdal/frmts/pds/pds4dataset.cpp rename to frmts/pds/pds4dataset.cpp diff --git a/gdal/frmts/pds/pds4dataset.h b/frmts/pds/pds4dataset.h similarity index 100% rename from gdal/frmts/pds/pds4dataset.h rename to frmts/pds/pds4dataset.h diff --git a/gdal/frmts/pds/pds4vector.cpp b/frmts/pds/pds4vector.cpp similarity index 100% rename from gdal/frmts/pds/pds4vector.cpp rename to frmts/pds/pds4vector.cpp diff --git a/gdal/frmts/pds/pdsdataset.cpp b/frmts/pds/pdsdataset.cpp similarity index 100% rename from gdal/frmts/pds/pdsdataset.cpp rename to frmts/pds/pdsdataset.cpp diff --git a/gdal/frmts/pds/vicardataset.cpp b/frmts/pds/vicardataset.cpp similarity index 100% rename from gdal/frmts/pds/vicardataset.cpp rename to frmts/pds/vicardataset.cpp diff --git a/gdal/frmts/pds/vicardataset.h b/frmts/pds/vicardataset.h similarity index 100% rename from gdal/frmts/pds/vicardataset.h rename to frmts/pds/vicardataset.h diff --git a/gdal/frmts/pds/vicarkeywordhandler.cpp b/frmts/pds/vicarkeywordhandler.cpp similarity index 100% rename from gdal/frmts/pds/vicarkeywordhandler.cpp rename to frmts/pds/vicarkeywordhandler.cpp diff --git a/gdal/frmts/pds/vicarkeywordhandler.h b/frmts/pds/vicarkeywordhandler.h similarity index 100% rename from gdal/frmts/pds/vicarkeywordhandler.h rename to frmts/pds/vicarkeywordhandler.h diff --git a/gdal/frmts/plmosaic/CMakeLists.txt b/frmts/plmosaic/CMakeLists.txt similarity index 100% rename from gdal/frmts/plmosaic/CMakeLists.txt rename to frmts/plmosaic/CMakeLists.txt diff --git a/gdal/frmts/plmosaic/GNUmakefile b/frmts/plmosaic/GNUmakefile similarity index 100% rename from gdal/frmts/plmosaic/GNUmakefile rename to frmts/plmosaic/GNUmakefile diff --git a/gdal/frmts/plmosaic/makefile.vc b/frmts/plmosaic/makefile.vc similarity index 100% rename from gdal/frmts/plmosaic/makefile.vc rename to frmts/plmosaic/makefile.vc diff --git a/gdal/frmts/plmosaic/plmosaicdataset.cpp b/frmts/plmosaic/plmosaicdataset.cpp similarity index 100% rename from gdal/frmts/plmosaic/plmosaicdataset.cpp rename to frmts/plmosaic/plmosaicdataset.cpp diff --git a/gdal/frmts/png/CMakeLists.txt b/frmts/png/CMakeLists.txt similarity index 100% rename from gdal/frmts/png/CMakeLists.txt rename to frmts/png/CMakeLists.txt diff --git a/gdal/frmts/png/GNUmakefile b/frmts/png/GNUmakefile similarity index 100% rename from gdal/frmts/png/GNUmakefile rename to frmts/png/GNUmakefile diff --git a/gdal/frmts/png/libpng/CMakeLists.txt b/frmts/png/libpng/CMakeLists.txt similarity index 100% rename from gdal/frmts/png/libpng/CMakeLists.txt rename to frmts/png/libpng/CMakeLists.txt diff --git a/gdal/frmts/png/libpng/LICENSE b/frmts/png/libpng/LICENSE similarity index 100% rename from gdal/frmts/png/libpng/LICENSE rename to frmts/png/libpng/LICENSE diff --git a/gdal/frmts/png/libpng/README b/frmts/png/libpng/README similarity index 100% rename from gdal/frmts/png/libpng/README rename to frmts/png/libpng/README diff --git a/gdal/frmts/png/libpng/libpng_gdal.patch b/frmts/png/libpng/libpng_gdal.patch similarity index 100% rename from gdal/frmts/png/libpng/libpng_gdal.patch rename to frmts/png/libpng/libpng_gdal.patch diff --git a/gdal/frmts/png/libpng/makefile.vc b/frmts/png/libpng/makefile.vc similarity index 100% rename from gdal/frmts/png/libpng/makefile.vc rename to frmts/png/libpng/makefile.vc diff --git a/gdal/frmts/png/libpng/png.c b/frmts/png/libpng/png.c similarity index 100% rename from gdal/frmts/png/libpng/png.c rename to frmts/png/libpng/png.c diff --git a/gdal/frmts/png/libpng/png.h b/frmts/png/libpng/png.h similarity index 100% rename from gdal/frmts/png/libpng/png.h rename to frmts/png/libpng/png.h diff --git a/gdal/frmts/png/libpng/pngconf.h b/frmts/png/libpng/pngconf.h similarity index 100% rename from gdal/frmts/png/libpng/pngconf.h rename to frmts/png/libpng/pngconf.h diff --git a/gdal/frmts/png/libpng/pngdebug.h b/frmts/png/libpng/pngdebug.h similarity index 100% rename from gdal/frmts/png/libpng/pngdebug.h rename to frmts/png/libpng/pngdebug.h diff --git a/gdal/frmts/png/libpng/pngerror.c b/frmts/png/libpng/pngerror.c similarity index 100% rename from gdal/frmts/png/libpng/pngerror.c rename to frmts/png/libpng/pngerror.c diff --git a/gdal/frmts/png/libpng/pngget.c b/frmts/png/libpng/pngget.c similarity index 100% rename from gdal/frmts/png/libpng/pngget.c rename to frmts/png/libpng/pngget.c diff --git a/gdal/frmts/png/libpng/pnginfo.h b/frmts/png/libpng/pnginfo.h similarity index 100% rename from gdal/frmts/png/libpng/pnginfo.h rename to frmts/png/libpng/pnginfo.h diff --git a/gdal/frmts/png/libpng/pnglibconf.h b/frmts/png/libpng/pnglibconf.h similarity index 100% rename from gdal/frmts/png/libpng/pnglibconf.h rename to frmts/png/libpng/pnglibconf.h diff --git a/gdal/frmts/png/libpng/pngmem.c b/frmts/png/libpng/pngmem.c similarity index 100% rename from gdal/frmts/png/libpng/pngmem.c rename to frmts/png/libpng/pngmem.c diff --git a/gdal/frmts/png/libpng/pngpread.c b/frmts/png/libpng/pngpread.c similarity index 100% rename from gdal/frmts/png/libpng/pngpread.c rename to frmts/png/libpng/pngpread.c diff --git a/gdal/frmts/png/libpng/pngpriv.h b/frmts/png/libpng/pngpriv.h similarity index 100% rename from gdal/frmts/png/libpng/pngpriv.h rename to frmts/png/libpng/pngpriv.h diff --git a/gdal/frmts/png/libpng/pngread.c b/frmts/png/libpng/pngread.c similarity index 100% rename from gdal/frmts/png/libpng/pngread.c rename to frmts/png/libpng/pngread.c diff --git a/gdal/frmts/png/libpng/pngrio.c b/frmts/png/libpng/pngrio.c similarity index 100% rename from gdal/frmts/png/libpng/pngrio.c rename to frmts/png/libpng/pngrio.c diff --git a/gdal/frmts/png/libpng/pngrtran.c b/frmts/png/libpng/pngrtran.c similarity index 100% rename from gdal/frmts/png/libpng/pngrtran.c rename to frmts/png/libpng/pngrtran.c diff --git a/gdal/frmts/png/libpng/pngrutil.c b/frmts/png/libpng/pngrutil.c similarity index 100% rename from gdal/frmts/png/libpng/pngrutil.c rename to frmts/png/libpng/pngrutil.c diff --git a/gdal/frmts/png/libpng/pngset.c b/frmts/png/libpng/pngset.c similarity index 100% rename from gdal/frmts/png/libpng/pngset.c rename to frmts/png/libpng/pngset.c diff --git a/gdal/frmts/png/libpng/pngstruct.h b/frmts/png/libpng/pngstruct.h similarity index 100% rename from gdal/frmts/png/libpng/pngstruct.h rename to frmts/png/libpng/pngstruct.h diff --git a/gdal/frmts/png/libpng/pngtrans.c b/frmts/png/libpng/pngtrans.c similarity index 100% rename from gdal/frmts/png/libpng/pngtrans.c rename to frmts/png/libpng/pngtrans.c diff --git a/gdal/frmts/png/libpng/pngwio.c b/frmts/png/libpng/pngwio.c similarity index 100% rename from gdal/frmts/png/libpng/pngwio.c rename to frmts/png/libpng/pngwio.c diff --git a/gdal/frmts/png/libpng/pngwrite.c b/frmts/png/libpng/pngwrite.c similarity index 100% rename from gdal/frmts/png/libpng/pngwrite.c rename to frmts/png/libpng/pngwrite.c diff --git a/gdal/frmts/png/libpng/pngwtran.c b/frmts/png/libpng/pngwtran.c similarity index 100% rename from gdal/frmts/png/libpng/pngwtran.c rename to frmts/png/libpng/pngwtran.c diff --git a/gdal/frmts/png/libpng/pngwutil.c b/frmts/png/libpng/pngwutil.c similarity index 100% rename from gdal/frmts/png/libpng/pngwutil.c rename to frmts/png/libpng/pngwutil.c diff --git a/gdal/frmts/png/makefile.vc b/frmts/png/makefile.vc similarity index 100% rename from gdal/frmts/png/makefile.vc rename to frmts/png/makefile.vc diff --git a/gdal/frmts/png/pngdataset.cpp b/frmts/png/pngdataset.cpp similarity index 100% rename from gdal/frmts/png/pngdataset.cpp rename to frmts/png/pngdataset.cpp diff --git a/gdal/frmts/png/pngdataset.h b/frmts/png/pngdataset.h similarity index 100% rename from gdal/frmts/png/pngdataset.h rename to frmts/png/pngdataset.h diff --git a/gdal/frmts/postgisraster/CMakeLists.txt b/frmts/postgisraster/CMakeLists.txt similarity index 100% rename from gdal/frmts/postgisraster/CMakeLists.txt rename to frmts/postgisraster/CMakeLists.txt diff --git a/gdal/frmts/postgisraster/GNUmakefile b/frmts/postgisraster/GNUmakefile similarity index 100% rename from gdal/frmts/postgisraster/GNUmakefile rename to frmts/postgisraster/GNUmakefile diff --git a/gdal/frmts/postgisraster/makefile.vc b/frmts/postgisraster/makefile.vc similarity index 100% rename from gdal/frmts/postgisraster/makefile.vc rename to frmts/postgisraster/makefile.vc diff --git a/gdal/frmts/postgisraster/postgisraster.h b/frmts/postgisraster/postgisraster.h similarity index 100% rename from gdal/frmts/postgisraster/postgisraster.h rename to frmts/postgisraster/postgisraster.h diff --git a/gdal/frmts/postgisraster/postgisrasterdataset.cpp b/frmts/postgisraster/postgisrasterdataset.cpp similarity index 100% rename from gdal/frmts/postgisraster/postgisrasterdataset.cpp rename to frmts/postgisraster/postgisrasterdataset.cpp diff --git a/gdal/frmts/postgisraster/postgisrasterdriver.cpp b/frmts/postgisraster/postgisrasterdriver.cpp similarity index 100% rename from gdal/frmts/postgisraster/postgisrasterdriver.cpp rename to frmts/postgisraster/postgisrasterdriver.cpp diff --git a/gdal/frmts/postgisraster/postgisrasterrasterband.cpp b/frmts/postgisraster/postgisrasterrasterband.cpp similarity index 100% rename from gdal/frmts/postgisraster/postgisrasterrasterband.cpp rename to frmts/postgisraster/postgisrasterrasterband.cpp diff --git a/gdal/frmts/postgisraster/postgisrastertiledataset.cpp b/frmts/postgisraster/postgisrastertiledataset.cpp similarity index 100% rename from gdal/frmts/postgisraster/postgisrastertiledataset.cpp rename to frmts/postgisraster/postgisrastertiledataset.cpp diff --git a/gdal/frmts/postgisraster/postgisrastertilerasterband.cpp b/frmts/postgisraster/postgisrastertilerasterband.cpp similarity index 100% rename from gdal/frmts/postgisraster/postgisrastertilerasterband.cpp rename to frmts/postgisraster/postgisrastertilerasterband.cpp diff --git a/gdal/frmts/postgisraster/postgisrastertools.cpp b/frmts/postgisraster/postgisrastertools.cpp similarity index 100% rename from gdal/frmts/postgisraster/postgisrastertools.cpp rename to frmts/postgisraster/postgisrastertools.cpp diff --git a/gdal/frmts/postgisraster/readme b/frmts/postgisraster/readme similarity index 100% rename from gdal/frmts/postgisraster/readme rename to frmts/postgisraster/readme diff --git a/gdal/frmts/postgisraster/todo b/frmts/postgisraster/todo similarity index 100% rename from gdal/frmts/postgisraster/todo rename to frmts/postgisraster/todo diff --git a/gdal/frmts/prf/CMakeLists.txt b/frmts/prf/CMakeLists.txt similarity index 100% rename from gdal/frmts/prf/CMakeLists.txt rename to frmts/prf/CMakeLists.txt diff --git a/gdal/frmts/prf/GNUmakefile b/frmts/prf/GNUmakefile similarity index 100% rename from gdal/frmts/prf/GNUmakefile rename to frmts/prf/GNUmakefile diff --git a/gdal/frmts/prf/makefile.vc b/frmts/prf/makefile.vc similarity index 100% rename from gdal/frmts/prf/makefile.vc rename to frmts/prf/makefile.vc diff --git a/gdal/frmts/prf/phprfdataset.cpp b/frmts/prf/phprfdataset.cpp similarity index 100% rename from gdal/frmts/prf/phprfdataset.cpp rename to frmts/prf/phprfdataset.cpp diff --git a/gdal/frmts/r/CMakeLists.txt b/frmts/r/CMakeLists.txt similarity index 100% rename from gdal/frmts/r/CMakeLists.txt rename to frmts/r/CMakeLists.txt diff --git a/gdal/frmts/r/GNUmakefile b/frmts/r/GNUmakefile similarity index 100% rename from gdal/frmts/r/GNUmakefile rename to frmts/r/GNUmakefile diff --git a/gdal/frmts/r/makefile.vc b/frmts/r/makefile.vc similarity index 100% rename from gdal/frmts/r/makefile.vc rename to frmts/r/makefile.vc diff --git a/gdal/frmts/r/rcreatecopy.cpp b/frmts/r/rcreatecopy.cpp similarity index 100% rename from gdal/frmts/r/rcreatecopy.cpp rename to frmts/r/rcreatecopy.cpp diff --git a/gdal/frmts/r/rdataset.cpp b/frmts/r/rdataset.cpp similarity index 100% rename from gdal/frmts/r/rdataset.cpp rename to frmts/r/rdataset.cpp diff --git a/gdal/frmts/r/rdataset.h b/frmts/r/rdataset.h similarity index 100% rename from gdal/frmts/r/rdataset.h rename to frmts/r/rdataset.h diff --git a/gdal/frmts/rasdaman/CMakeLists.txt b/frmts/rasdaman/CMakeLists.txt similarity index 100% rename from gdal/frmts/rasdaman/CMakeLists.txt rename to frmts/rasdaman/CMakeLists.txt diff --git a/gdal/frmts/rasdaman/GNUmakefile b/frmts/rasdaman/GNUmakefile similarity index 100% rename from gdal/frmts/rasdaman/GNUmakefile rename to frmts/rasdaman/GNUmakefile diff --git a/gdal/frmts/rasdaman/makefile.vc b/frmts/rasdaman/makefile.vc similarity index 100% rename from gdal/frmts/rasdaman/makefile.vc rename to frmts/rasdaman/makefile.vc diff --git a/gdal/frmts/rasdaman/rasdamandataset.cpp b/frmts/rasdaman/rasdamandataset.cpp similarity index 100% rename from gdal/frmts/rasdaman/rasdamandataset.cpp rename to frmts/rasdaman/rasdamandataset.cpp diff --git a/gdal/frmts/rasdaman/rasdamandataset.h b/frmts/rasdaman/rasdamandataset.h similarity index 100% rename from gdal/frmts/rasdaman/rasdamandataset.h rename to frmts/rasdaman/rasdamandataset.h diff --git a/gdal/frmts/rasterlite/CMakeLists.txt b/frmts/rasterlite/CMakeLists.txt similarity index 100% rename from gdal/frmts/rasterlite/CMakeLists.txt rename to frmts/rasterlite/CMakeLists.txt diff --git a/gdal/frmts/rasterlite/GNUmakefile b/frmts/rasterlite/GNUmakefile similarity index 100% rename from gdal/frmts/rasterlite/GNUmakefile rename to frmts/rasterlite/GNUmakefile diff --git a/gdal/frmts/rasterlite/makefile.vc b/frmts/rasterlite/makefile.vc similarity index 100% rename from gdal/frmts/rasterlite/makefile.vc rename to frmts/rasterlite/makefile.vc diff --git a/gdal/frmts/rasterlite/rasterlitecreatecopy.cpp b/frmts/rasterlite/rasterlitecreatecopy.cpp similarity index 100% rename from gdal/frmts/rasterlite/rasterlitecreatecopy.cpp rename to frmts/rasterlite/rasterlitecreatecopy.cpp diff --git a/gdal/frmts/rasterlite/rasterlitedataset.cpp b/frmts/rasterlite/rasterlitedataset.cpp similarity index 100% rename from gdal/frmts/rasterlite/rasterlitedataset.cpp rename to frmts/rasterlite/rasterlitedataset.cpp diff --git a/gdal/frmts/rasterlite/rasterlitedataset.h b/frmts/rasterlite/rasterlitedataset.h similarity index 100% rename from gdal/frmts/rasterlite/rasterlitedataset.h rename to frmts/rasterlite/rasterlitedataset.h diff --git a/gdal/frmts/rasterlite/rasterliteoverviews.cpp b/frmts/rasterlite/rasterliteoverviews.cpp similarity index 100% rename from gdal/frmts/rasterlite/rasterliteoverviews.cpp rename to frmts/rasterlite/rasterliteoverviews.cpp diff --git a/gdal/frmts/raw/CMakeLists.txt b/frmts/raw/CMakeLists.txt similarity index 100% rename from gdal/frmts/raw/CMakeLists.txt rename to frmts/raw/CMakeLists.txt diff --git a/gdal/frmts/raw/GNUmakefile b/frmts/raw/GNUmakefile similarity index 100% rename from gdal/frmts/raw/GNUmakefile rename to frmts/raw/GNUmakefile diff --git a/gdal/frmts/raw/ace2dataset.cpp b/frmts/raw/ace2dataset.cpp similarity index 100% rename from gdal/frmts/raw/ace2dataset.cpp rename to frmts/raw/ace2dataset.cpp diff --git a/gdal/frmts/raw/atlsci_spheroid.cpp b/frmts/raw/atlsci_spheroid.cpp similarity index 100% rename from gdal/frmts/raw/atlsci_spheroid.cpp rename to frmts/raw/atlsci_spheroid.cpp diff --git a/gdal/frmts/raw/atlsci_spheroid.h b/frmts/raw/atlsci_spheroid.h similarity index 100% rename from gdal/frmts/raw/atlsci_spheroid.h rename to frmts/raw/atlsci_spheroid.h diff --git a/gdal/frmts/raw/btdataset.cpp b/frmts/raw/btdataset.cpp similarity index 100% rename from gdal/frmts/raw/btdataset.cpp rename to frmts/raw/btdataset.cpp diff --git a/gdal/frmts/raw/byndataset.cpp b/frmts/raw/byndataset.cpp similarity index 100% rename from gdal/frmts/raw/byndataset.cpp rename to frmts/raw/byndataset.cpp diff --git a/gdal/frmts/raw/byndataset.h b/frmts/raw/byndataset.h similarity index 100% rename from gdal/frmts/raw/byndataset.h rename to frmts/raw/byndataset.h diff --git a/gdal/frmts/raw/cpgdataset.cpp b/frmts/raw/cpgdataset.cpp similarity index 100% rename from gdal/frmts/raw/cpgdataset.cpp rename to frmts/raw/cpgdataset.cpp diff --git a/gdal/frmts/raw/ctable2dataset.cpp b/frmts/raw/ctable2dataset.cpp similarity index 100% rename from gdal/frmts/raw/ctable2dataset.cpp rename to frmts/raw/ctable2dataset.cpp diff --git a/gdal/frmts/raw/dipxdataset.cpp b/frmts/raw/dipxdataset.cpp similarity index 100% rename from gdal/frmts/raw/dipxdataset.cpp rename to frmts/raw/dipxdataset.cpp diff --git a/gdal/frmts/raw/doq1dataset.cpp b/frmts/raw/doq1dataset.cpp similarity index 100% rename from gdal/frmts/raw/doq1dataset.cpp rename to frmts/raw/doq1dataset.cpp diff --git a/gdal/frmts/raw/doq2dataset.cpp b/frmts/raw/doq2dataset.cpp similarity index 100% rename from gdal/frmts/raw/doq2dataset.cpp rename to frmts/raw/doq2dataset.cpp diff --git a/gdal/frmts/raw/ehdrdataset.cpp b/frmts/raw/ehdrdataset.cpp similarity index 100% rename from gdal/frmts/raw/ehdrdataset.cpp rename to frmts/raw/ehdrdataset.cpp diff --git a/gdal/frmts/raw/ehdrdataset.h b/frmts/raw/ehdrdataset.h similarity index 100% rename from gdal/frmts/raw/ehdrdataset.h rename to frmts/raw/ehdrdataset.h diff --git a/gdal/frmts/raw/eirdataset.cpp b/frmts/raw/eirdataset.cpp similarity index 100% rename from gdal/frmts/raw/eirdataset.cpp rename to frmts/raw/eirdataset.cpp diff --git a/gdal/frmts/raw/envidataset.cpp b/frmts/raw/envidataset.cpp similarity index 100% rename from gdal/frmts/raw/envidataset.cpp rename to frmts/raw/envidataset.cpp diff --git a/gdal/frmts/raw/envidataset.h b/frmts/raw/envidataset.h similarity index 100% rename from gdal/frmts/raw/envidataset.h rename to frmts/raw/envidataset.h diff --git a/gdal/frmts/raw/fastdataset.cpp b/frmts/raw/fastdataset.cpp similarity index 100% rename from gdal/frmts/raw/fastdataset.cpp rename to frmts/raw/fastdataset.cpp diff --git a/gdal/frmts/raw/fujibasdataset.cpp b/frmts/raw/fujibasdataset.cpp similarity index 100% rename from gdal/frmts/raw/fujibasdataset.cpp rename to frmts/raw/fujibasdataset.cpp diff --git a/gdal/frmts/raw/genbindataset.cpp b/frmts/raw/genbindataset.cpp similarity index 100% rename from gdal/frmts/raw/genbindataset.cpp rename to frmts/raw/genbindataset.cpp diff --git a/gdal/frmts/raw/gscdataset.cpp b/frmts/raw/gscdataset.cpp similarity index 100% rename from gdal/frmts/raw/gscdataset.cpp rename to frmts/raw/gscdataset.cpp diff --git a/gdal/frmts/raw/gtxdataset.cpp b/frmts/raw/gtxdataset.cpp similarity index 100% rename from gdal/frmts/raw/gtxdataset.cpp rename to frmts/raw/gtxdataset.cpp diff --git a/gdal/frmts/raw/hkvdataset.cpp b/frmts/raw/hkvdataset.cpp similarity index 100% rename from gdal/frmts/raw/hkvdataset.cpp rename to frmts/raw/hkvdataset.cpp diff --git a/gdal/frmts/raw/idadataset.cpp b/frmts/raw/idadataset.cpp similarity index 100% rename from gdal/frmts/raw/idadataset.cpp rename to frmts/raw/idadataset.cpp diff --git a/gdal/frmts/raw/iscedataset.cpp b/frmts/raw/iscedataset.cpp similarity index 100% rename from gdal/frmts/raw/iscedataset.cpp rename to frmts/raw/iscedataset.cpp diff --git a/gdal/frmts/raw/krodataset.cpp b/frmts/raw/krodataset.cpp similarity index 100% rename from gdal/frmts/raw/krodataset.cpp rename to frmts/raw/krodataset.cpp diff --git a/gdal/frmts/raw/landataset.cpp b/frmts/raw/landataset.cpp similarity index 100% rename from gdal/frmts/raw/landataset.cpp rename to frmts/raw/landataset.cpp diff --git a/gdal/frmts/raw/lcpdataset.cpp b/frmts/raw/lcpdataset.cpp similarity index 100% rename from gdal/frmts/raw/lcpdataset.cpp rename to frmts/raw/lcpdataset.cpp diff --git a/gdal/frmts/raw/loslasdataset.cpp b/frmts/raw/loslasdataset.cpp similarity index 100% rename from gdal/frmts/raw/loslasdataset.cpp rename to frmts/raw/loslasdataset.cpp diff --git a/gdal/frmts/raw/makefile.vc b/frmts/raw/makefile.vc similarity index 100% rename from gdal/frmts/raw/makefile.vc rename to frmts/raw/makefile.vc diff --git a/gdal/frmts/raw/mffdataset.cpp b/frmts/raw/mffdataset.cpp similarity index 100% rename from gdal/frmts/raw/mffdataset.cpp rename to frmts/raw/mffdataset.cpp diff --git a/gdal/frmts/raw/ndfdataset.cpp b/frmts/raw/ndfdataset.cpp similarity index 100% rename from gdal/frmts/raw/ndfdataset.cpp rename to frmts/raw/ndfdataset.cpp diff --git a/gdal/frmts/raw/ntv2dataset.cpp b/frmts/raw/ntv2dataset.cpp similarity index 100% rename from gdal/frmts/raw/ntv2dataset.cpp rename to frmts/raw/ntv2dataset.cpp diff --git a/gdal/frmts/raw/pauxdataset.cpp b/frmts/raw/pauxdataset.cpp similarity index 100% rename from gdal/frmts/raw/pauxdataset.cpp rename to frmts/raw/pauxdataset.cpp diff --git a/gdal/frmts/raw/pnmdataset.cpp b/frmts/raw/pnmdataset.cpp similarity index 100% rename from gdal/frmts/raw/pnmdataset.cpp rename to frmts/raw/pnmdataset.cpp diff --git a/gdal/frmts/raw/roipacdataset.cpp b/frmts/raw/roipacdataset.cpp similarity index 100% rename from gdal/frmts/raw/roipacdataset.cpp rename to frmts/raw/roipacdataset.cpp diff --git a/gdal/frmts/raw/rrasterdataset.cpp b/frmts/raw/rrasterdataset.cpp similarity index 100% rename from gdal/frmts/raw/rrasterdataset.cpp rename to frmts/raw/rrasterdataset.cpp diff --git a/gdal/frmts/raw/snodasdataset.cpp b/frmts/raw/snodasdataset.cpp similarity index 100% rename from gdal/frmts/raw/snodasdataset.cpp rename to frmts/raw/snodasdataset.cpp diff --git a/gdal/frmts/rda/CMakeLists.txt b/frmts/rda/CMakeLists.txt similarity index 100% rename from gdal/frmts/rda/CMakeLists.txt rename to frmts/rda/CMakeLists.txt diff --git a/gdal/frmts/rda/GNUmakefile b/frmts/rda/GNUmakefile similarity index 100% rename from gdal/frmts/rda/GNUmakefile rename to frmts/rda/GNUmakefile diff --git a/gdal/frmts/rda/makefile.vc b/frmts/rda/makefile.vc similarity index 100% rename from gdal/frmts/rda/makefile.vc rename to frmts/rda/makefile.vc diff --git a/gdal/frmts/rda/rdadataset.cpp b/frmts/rda/rdadataset.cpp similarity index 100% rename from gdal/frmts/rda/rdadataset.cpp rename to frmts/rda/rdadataset.cpp diff --git a/gdal/frmts/rdb/CMakeLists.txt b/frmts/rdb/CMakeLists.txt similarity index 100% rename from gdal/frmts/rdb/CMakeLists.txt rename to frmts/rdb/CMakeLists.txt diff --git a/gdal/frmts/rdb/GNUmakefile b/frmts/rdb/GNUmakefile similarity index 100% rename from gdal/frmts/rdb/GNUmakefile rename to frmts/rdb/GNUmakefile diff --git a/gdal/frmts/rdb/makefile.vc b/frmts/rdb/makefile.vc similarity index 100% rename from gdal/frmts/rdb/makefile.vc rename to frmts/rdb/makefile.vc diff --git a/gdal/frmts/rdb/rdbdataset.cpp b/frmts/rdb/rdbdataset.cpp similarity index 100% rename from gdal/frmts/rdb/rdbdataset.cpp rename to frmts/rdb/rdbdataset.cpp diff --git a/gdal/frmts/rdb/rdbdataset.hpp b/frmts/rdb/rdbdataset.hpp similarity index 100% rename from gdal/frmts/rdb/rdbdataset.hpp rename to frmts/rdb/rdbdataset.hpp diff --git a/gdal/frmts/rik/CMakeLists.txt b/frmts/rik/CMakeLists.txt similarity index 100% rename from gdal/frmts/rik/CMakeLists.txt rename to frmts/rik/CMakeLists.txt diff --git a/gdal/frmts/rik/GNUmakefile b/frmts/rik/GNUmakefile similarity index 100% rename from gdal/frmts/rik/GNUmakefile rename to frmts/rik/GNUmakefile diff --git a/gdal/frmts/rik/makefile.vc b/frmts/rik/makefile.vc similarity index 100% rename from gdal/frmts/rik/makefile.vc rename to frmts/rik/makefile.vc diff --git a/gdal/frmts/rik/rikdataset.cpp b/frmts/rik/rikdataset.cpp similarity index 100% rename from gdal/frmts/rik/rikdataset.cpp rename to frmts/rik/rikdataset.cpp diff --git a/gdal/frmts/rmf/CMakeLists.txt b/frmts/rmf/CMakeLists.txt similarity index 100% rename from gdal/frmts/rmf/CMakeLists.txt rename to frmts/rmf/CMakeLists.txt diff --git a/gdal/frmts/rmf/GNUmakefile b/frmts/rmf/GNUmakefile similarity index 100% rename from gdal/frmts/rmf/GNUmakefile rename to frmts/rmf/GNUmakefile diff --git a/gdal/frmts/rmf/makefile.vc b/frmts/rmf/makefile.vc similarity index 100% rename from gdal/frmts/rmf/makefile.vc rename to frmts/rmf/makefile.vc diff --git a/gdal/frmts/rmf/rmfdataset.cpp b/frmts/rmf/rmfdataset.cpp similarity index 100% rename from gdal/frmts/rmf/rmfdataset.cpp rename to frmts/rmf/rmfdataset.cpp diff --git a/gdal/frmts/rmf/rmfdataset.h b/frmts/rmf/rmfdataset.h similarity index 100% rename from gdal/frmts/rmf/rmfdataset.h rename to frmts/rmf/rmfdataset.h diff --git a/gdal/frmts/rmf/rmfdem.cpp b/frmts/rmf/rmfdem.cpp similarity index 100% rename from gdal/frmts/rmf/rmfdem.cpp rename to frmts/rmf/rmfdem.cpp diff --git a/gdal/frmts/rmf/rmfjpeg.cpp b/frmts/rmf/rmfjpeg.cpp similarity index 100% rename from gdal/frmts/rmf/rmfjpeg.cpp rename to frmts/rmf/rmfjpeg.cpp diff --git a/gdal/frmts/rmf/rmflzw.cpp b/frmts/rmf/rmflzw.cpp similarity index 100% rename from gdal/frmts/rmf/rmflzw.cpp rename to frmts/rmf/rmflzw.cpp diff --git a/gdal/frmts/rs2/CMakeLists.txt b/frmts/rs2/CMakeLists.txt similarity index 100% rename from gdal/frmts/rs2/CMakeLists.txt rename to frmts/rs2/CMakeLists.txt diff --git a/gdal/frmts/rs2/GNUmakefile b/frmts/rs2/GNUmakefile similarity index 100% rename from gdal/frmts/rs2/GNUmakefile rename to frmts/rs2/GNUmakefile diff --git a/gdal/frmts/rs2/makefile.vc b/frmts/rs2/makefile.vc similarity index 100% rename from gdal/frmts/rs2/makefile.vc rename to frmts/rs2/makefile.vc diff --git a/gdal/frmts/rs2/rs2dataset.cpp b/frmts/rs2/rs2dataset.cpp similarity index 100% rename from gdal/frmts/rs2/rs2dataset.cpp rename to frmts/rs2/rs2dataset.cpp diff --git a/gdal/frmts/safe/CMakeLists.txt b/frmts/safe/CMakeLists.txt similarity index 100% rename from gdal/frmts/safe/CMakeLists.txt rename to frmts/safe/CMakeLists.txt diff --git a/gdal/frmts/safe/GNUmakefile b/frmts/safe/GNUmakefile similarity index 100% rename from gdal/frmts/safe/GNUmakefile rename to frmts/safe/GNUmakefile diff --git a/gdal/frmts/safe/makefile.vc b/frmts/safe/makefile.vc similarity index 100% rename from gdal/frmts/safe/makefile.vc rename to frmts/safe/makefile.vc diff --git a/gdal/frmts/safe/safedataset.cpp b/frmts/safe/safedataset.cpp similarity index 100% rename from gdal/frmts/safe/safedataset.cpp rename to frmts/safe/safedataset.cpp diff --git a/gdal/frmts/safe/safedataset.h b/frmts/safe/safedataset.h similarity index 100% rename from gdal/frmts/safe/safedataset.h rename to frmts/safe/safedataset.h diff --git a/gdal/frmts/saga/CMakeLists.txt b/frmts/saga/CMakeLists.txt similarity index 100% rename from gdal/frmts/saga/CMakeLists.txt rename to frmts/saga/CMakeLists.txt diff --git a/gdal/frmts/saga/GNUmakefile b/frmts/saga/GNUmakefile similarity index 100% rename from gdal/frmts/saga/GNUmakefile rename to frmts/saga/GNUmakefile diff --git a/gdal/frmts/saga/makefile.vc b/frmts/saga/makefile.vc similarity index 100% rename from gdal/frmts/saga/makefile.vc rename to frmts/saga/makefile.vc diff --git a/gdal/frmts/saga/sagadataset.cpp b/frmts/saga/sagadataset.cpp similarity index 100% rename from gdal/frmts/saga/sagadataset.cpp rename to frmts/saga/sagadataset.cpp diff --git a/gdal/frmts/sdts/CMakeLists.txt b/frmts/sdts/CMakeLists.txt similarity index 100% rename from gdal/frmts/sdts/CMakeLists.txt rename to frmts/sdts/CMakeLists.txt diff --git a/gdal/frmts/sdts/Doxyfile b/frmts/sdts/Doxyfile similarity index 100% rename from gdal/frmts/sdts/Doxyfile rename to frmts/sdts/Doxyfile diff --git a/gdal/frmts/sdts/GNUmakefile b/frmts/sdts/GNUmakefile similarity index 100% rename from gdal/frmts/sdts/GNUmakefile rename to frmts/sdts/GNUmakefile diff --git a/gdal/frmts/sdts/Makefile.in b/frmts/sdts/Makefile.in similarity index 100% rename from gdal/frmts/sdts/Makefile.in rename to frmts/sdts/Makefile.in diff --git a/gdal/frmts/sdts/aclocal.m4 b/frmts/sdts/aclocal.m4 similarity index 100% rename from gdal/frmts/sdts/aclocal.m4 rename to frmts/sdts/aclocal.m4 diff --git a/gdal/frmts/sdts/configure.in b/frmts/sdts/configure.in similarity index 100% rename from gdal/frmts/sdts/configure.in rename to frmts/sdts/configure.in diff --git a/gdal/frmts/sdts/makefile.vc b/frmts/sdts/makefile.vc similarity index 100% rename from gdal/frmts/sdts/makefile.vc rename to frmts/sdts/makefile.vc diff --git a/gdal/frmts/sdts/makefile.vc.dist b/frmts/sdts/makefile.vc.dist similarity index 100% rename from gdal/frmts/sdts/makefile.vc.dist rename to frmts/sdts/makefile.vc.dist diff --git a/gdal/frmts/sdts/sdts2shp.cpp b/frmts/sdts/sdts2shp.cpp similarity index 100% rename from gdal/frmts/sdts/sdts2shp.cpp rename to frmts/sdts/sdts2shp.cpp diff --git a/gdal/frmts/sdts/sdts_al.h b/frmts/sdts/sdts_al.h similarity index 100% rename from gdal/frmts/sdts/sdts_al.h rename to frmts/sdts/sdts_al.h diff --git a/gdal/frmts/sdts/sdts_main.dox b/frmts/sdts/sdts_main.dox similarity index 100% rename from gdal/frmts/sdts/sdts_main.dox rename to frmts/sdts/sdts_main.dox diff --git a/gdal/frmts/sdts/sdts_tut.dox b/frmts/sdts/sdts_tut.dox similarity index 100% rename from gdal/frmts/sdts/sdts_tut.dox rename to frmts/sdts/sdts_tut.dox diff --git a/gdal/frmts/sdts/sdtsattrreader.cpp b/frmts/sdts/sdtsattrreader.cpp similarity index 100% rename from gdal/frmts/sdts/sdtsattrreader.cpp rename to frmts/sdts/sdtsattrreader.cpp diff --git a/gdal/frmts/sdts/sdtscatd.cpp b/frmts/sdts/sdtscatd.cpp similarity index 100% rename from gdal/frmts/sdts/sdtscatd.cpp rename to frmts/sdts/sdtscatd.cpp diff --git a/gdal/frmts/sdts/sdtsdataset.cpp b/frmts/sdts/sdtsdataset.cpp similarity index 100% rename from gdal/frmts/sdts/sdtsdataset.cpp rename to frmts/sdts/sdtsdataset.cpp diff --git a/gdal/frmts/sdts/sdtsindexedreader.cpp b/frmts/sdts/sdtsindexedreader.cpp similarity index 100% rename from gdal/frmts/sdts/sdtsindexedreader.cpp rename to frmts/sdts/sdtsindexedreader.cpp diff --git a/gdal/frmts/sdts/sdtsiref.cpp b/frmts/sdts/sdtsiref.cpp similarity index 100% rename from gdal/frmts/sdts/sdtsiref.cpp rename to frmts/sdts/sdtsiref.cpp diff --git a/gdal/frmts/sdts/sdtslib.cpp b/frmts/sdts/sdtslib.cpp similarity index 100% rename from gdal/frmts/sdts/sdtslib.cpp rename to frmts/sdts/sdtslib.cpp diff --git a/gdal/frmts/sdts/sdtslinereader.cpp b/frmts/sdts/sdtslinereader.cpp similarity index 100% rename from gdal/frmts/sdts/sdtslinereader.cpp rename to frmts/sdts/sdtslinereader.cpp diff --git a/gdal/frmts/sdts/sdtspointreader.cpp b/frmts/sdts/sdtspointreader.cpp similarity index 100% rename from gdal/frmts/sdts/sdtspointreader.cpp rename to frmts/sdts/sdtspointreader.cpp diff --git a/gdal/frmts/sdts/sdtspolygonreader.cpp b/frmts/sdts/sdtspolygonreader.cpp similarity index 100% rename from gdal/frmts/sdts/sdtspolygonreader.cpp rename to frmts/sdts/sdtspolygonreader.cpp diff --git a/gdal/frmts/sdts/sdtsrasterreader.cpp b/frmts/sdts/sdtsrasterreader.cpp similarity index 100% rename from gdal/frmts/sdts/sdtsrasterreader.cpp rename to frmts/sdts/sdtsrasterreader.cpp diff --git a/gdal/frmts/sdts/sdtstransfer.cpp b/frmts/sdts/sdtstransfer.cpp similarity index 100% rename from gdal/frmts/sdts/sdtstransfer.cpp rename to frmts/sdts/sdtstransfer.cpp diff --git a/gdal/frmts/sdts/sdtsxref.cpp b/frmts/sdts/sdtsxref.cpp similarity index 100% rename from gdal/frmts/sdts/sdtsxref.cpp rename to frmts/sdts/sdtsxref.cpp diff --git a/gdal/frmts/sentinel2/CMakeLists.txt b/frmts/sentinel2/CMakeLists.txt similarity index 100% rename from gdal/frmts/sentinel2/CMakeLists.txt rename to frmts/sentinel2/CMakeLists.txt diff --git a/gdal/frmts/sentinel2/GNUmakefile b/frmts/sentinel2/GNUmakefile similarity index 100% rename from gdal/frmts/sentinel2/GNUmakefile rename to frmts/sentinel2/GNUmakefile diff --git a/gdal/frmts/sentinel2/makefile.vc b/frmts/sentinel2/makefile.vc similarity index 100% rename from gdal/frmts/sentinel2/makefile.vc rename to frmts/sentinel2/makefile.vc diff --git a/gdal/frmts/sentinel2/sentinel2dataset.cpp b/frmts/sentinel2/sentinel2dataset.cpp similarity index 100% rename from gdal/frmts/sentinel2/sentinel2dataset.cpp rename to frmts/sentinel2/sentinel2dataset.cpp diff --git a/gdal/frmts/sgi/CMakeLists.txt b/frmts/sgi/CMakeLists.txt similarity index 100% rename from gdal/frmts/sgi/CMakeLists.txt rename to frmts/sgi/CMakeLists.txt diff --git a/gdal/frmts/sgi/GNUmakefile b/frmts/sgi/GNUmakefile similarity index 100% rename from gdal/frmts/sgi/GNUmakefile rename to frmts/sgi/GNUmakefile diff --git a/gdal/frmts/sgi/makefile.vc b/frmts/sgi/makefile.vc similarity index 100% rename from gdal/frmts/sgi/makefile.vc rename to frmts/sgi/makefile.vc diff --git a/gdal/frmts/sgi/sgidataset.cpp b/frmts/sgi/sgidataset.cpp similarity index 100% rename from gdal/frmts/sgi/sgidataset.cpp rename to frmts/sgi/sgidataset.cpp diff --git a/gdal/frmts/sigdem/CMakeLists.txt b/frmts/sigdem/CMakeLists.txt similarity index 100% rename from gdal/frmts/sigdem/CMakeLists.txt rename to frmts/sigdem/CMakeLists.txt diff --git a/gdal/frmts/sigdem/GNUmakefile b/frmts/sigdem/GNUmakefile similarity index 100% rename from gdal/frmts/sigdem/GNUmakefile rename to frmts/sigdem/GNUmakefile diff --git a/gdal/frmts/sigdem/makefile.vc b/frmts/sigdem/makefile.vc similarity index 100% rename from gdal/frmts/sigdem/makefile.vc rename to frmts/sigdem/makefile.vc diff --git a/gdal/frmts/sigdem/sigdemdataset.cpp b/frmts/sigdem/sigdemdataset.cpp similarity index 100% rename from gdal/frmts/sigdem/sigdemdataset.cpp rename to frmts/sigdem/sigdemdataset.cpp diff --git a/gdal/frmts/sigdem/sigdemdataset.h b/frmts/sigdem/sigdemdataset.h similarity index 100% rename from gdal/frmts/sigdem/sigdemdataset.h rename to frmts/sigdem/sigdemdataset.h diff --git a/gdal/frmts/srtmhgt/CMakeLists.txt b/frmts/srtmhgt/CMakeLists.txt similarity index 100% rename from gdal/frmts/srtmhgt/CMakeLists.txt rename to frmts/srtmhgt/CMakeLists.txt diff --git a/gdal/frmts/srtmhgt/GNUmakefile b/frmts/srtmhgt/GNUmakefile similarity index 100% rename from gdal/frmts/srtmhgt/GNUmakefile rename to frmts/srtmhgt/GNUmakefile diff --git a/gdal/frmts/srtmhgt/makefile.vc b/frmts/srtmhgt/makefile.vc similarity index 100% rename from gdal/frmts/srtmhgt/makefile.vc rename to frmts/srtmhgt/makefile.vc diff --git a/gdal/frmts/srtmhgt/srtmhgtdataset.cpp b/frmts/srtmhgt/srtmhgtdataset.cpp similarity index 100% rename from gdal/frmts/srtmhgt/srtmhgtdataset.cpp rename to frmts/srtmhgt/srtmhgtdataset.cpp diff --git a/gdal/frmts/stacit/CMakeLists.txt b/frmts/stacit/CMakeLists.txt similarity index 100% rename from gdal/frmts/stacit/CMakeLists.txt rename to frmts/stacit/CMakeLists.txt diff --git a/gdal/frmts/stacit/GNUmakefile b/frmts/stacit/GNUmakefile similarity index 100% rename from gdal/frmts/stacit/GNUmakefile rename to frmts/stacit/GNUmakefile diff --git a/gdal/frmts/stacit/makefile.vc b/frmts/stacit/makefile.vc similarity index 100% rename from gdal/frmts/stacit/makefile.vc rename to frmts/stacit/makefile.vc diff --git a/gdal/frmts/stacit/stacitdataset.cpp b/frmts/stacit/stacitdataset.cpp similarity index 100% rename from gdal/frmts/stacit/stacitdataset.cpp rename to frmts/stacit/stacitdataset.cpp diff --git a/gdal/frmts/stacta/CMakeLists.txt b/frmts/stacta/CMakeLists.txt similarity index 100% rename from gdal/frmts/stacta/CMakeLists.txt rename to frmts/stacta/CMakeLists.txt diff --git a/gdal/frmts/stacta/GNUmakefile b/frmts/stacta/GNUmakefile similarity index 100% rename from gdal/frmts/stacta/GNUmakefile rename to frmts/stacta/GNUmakefile diff --git a/gdal/frmts/stacta/makefile.vc b/frmts/stacta/makefile.vc similarity index 100% rename from gdal/frmts/stacta/makefile.vc rename to frmts/stacta/makefile.vc diff --git a/gdal/frmts/stacta/stactadataset.cpp b/frmts/stacta/stactadataset.cpp similarity index 100% rename from gdal/frmts/stacta/stactadataset.cpp rename to frmts/stacta/stactadataset.cpp diff --git a/gdal/frmts/stacta/stactadataset.h b/frmts/stacta/stactadataset.h similarity index 100% rename from gdal/frmts/stacta/stactadataset.h rename to frmts/stacta/stactadataset.h diff --git a/gdal/frmts/terragen/CMakeLists.txt b/frmts/terragen/CMakeLists.txt similarity index 100% rename from gdal/frmts/terragen/CMakeLists.txt rename to frmts/terragen/CMakeLists.txt diff --git a/gdal/frmts/terragen/GNUmakefile b/frmts/terragen/GNUmakefile similarity index 100% rename from gdal/frmts/terragen/GNUmakefile rename to frmts/terragen/GNUmakefile diff --git a/gdal/frmts/terragen/makefile.vc b/frmts/terragen/makefile.vc similarity index 100% rename from gdal/frmts/terragen/makefile.vc rename to frmts/terragen/makefile.vc diff --git a/gdal/frmts/terragen/readme.txt b/frmts/terragen/readme.txt similarity index 100% rename from gdal/frmts/terragen/readme.txt rename to frmts/terragen/readme.txt diff --git a/gdal/frmts/terragen/terragendataset.cpp b/frmts/terragen/terragendataset.cpp similarity index 100% rename from gdal/frmts/terragen/terragendataset.cpp rename to frmts/terragen/terragendataset.cpp diff --git a/gdal/frmts/tga/CMakeLists.txt b/frmts/tga/CMakeLists.txt similarity index 100% rename from gdal/frmts/tga/CMakeLists.txt rename to frmts/tga/CMakeLists.txt diff --git a/gdal/frmts/tga/GNUmakefile b/frmts/tga/GNUmakefile similarity index 100% rename from gdal/frmts/tga/GNUmakefile rename to frmts/tga/GNUmakefile diff --git a/gdal/frmts/tga/makefile.vc b/frmts/tga/makefile.vc similarity index 100% rename from gdal/frmts/tga/makefile.vc rename to frmts/tga/makefile.vc diff --git a/gdal/frmts/tga/tgadataset.cpp b/frmts/tga/tgadataset.cpp similarity index 100% rename from gdal/frmts/tga/tgadataset.cpp rename to frmts/tga/tgadataset.cpp diff --git a/gdal/frmts/til/CMakeLists.txt b/frmts/til/CMakeLists.txt similarity index 100% rename from gdal/frmts/til/CMakeLists.txt rename to frmts/til/CMakeLists.txt diff --git a/gdal/frmts/til/GNUmakefile b/frmts/til/GNUmakefile similarity index 100% rename from gdal/frmts/til/GNUmakefile rename to frmts/til/GNUmakefile diff --git a/gdal/frmts/til/makefile.vc b/frmts/til/makefile.vc similarity index 100% rename from gdal/frmts/til/makefile.vc rename to frmts/til/makefile.vc diff --git a/gdal/frmts/til/tildataset.cpp b/frmts/til/tildataset.cpp similarity index 100% rename from gdal/frmts/til/tildataset.cpp rename to frmts/til/tildataset.cpp diff --git a/gdal/frmts/tiledb/CMakeLists.txt b/frmts/tiledb/CMakeLists.txt similarity index 100% rename from gdal/frmts/tiledb/CMakeLists.txt rename to frmts/tiledb/CMakeLists.txt diff --git a/gdal/frmts/tiledb/GNUmakefile b/frmts/tiledb/GNUmakefile similarity index 100% rename from gdal/frmts/tiledb/GNUmakefile rename to frmts/tiledb/GNUmakefile diff --git a/gdal/frmts/tiledb/makefile.vc b/frmts/tiledb/makefile.vc similarity index 100% rename from gdal/frmts/tiledb/makefile.vc rename to frmts/tiledb/makefile.vc diff --git a/gdal/frmts/tiledb/tiledb_headers.h b/frmts/tiledb/tiledb_headers.h similarity index 100% rename from gdal/frmts/tiledb/tiledb_headers.h rename to frmts/tiledb/tiledb_headers.h diff --git a/gdal/frmts/tiledb/tiledbdataset.cpp b/frmts/tiledb/tiledbdataset.cpp similarity index 100% rename from gdal/frmts/tiledb/tiledbdataset.cpp rename to frmts/tiledb/tiledbdataset.cpp diff --git a/gdal/frmts/tsx/CMakeLists.txt b/frmts/tsx/CMakeLists.txt similarity index 100% rename from gdal/frmts/tsx/CMakeLists.txt rename to frmts/tsx/CMakeLists.txt diff --git a/gdal/frmts/tsx/GNUmakefile b/frmts/tsx/GNUmakefile similarity index 100% rename from gdal/frmts/tsx/GNUmakefile rename to frmts/tsx/GNUmakefile diff --git a/gdal/frmts/tsx/makefile.vc b/frmts/tsx/makefile.vc similarity index 100% rename from gdal/frmts/tsx/makefile.vc rename to frmts/tsx/makefile.vc diff --git a/gdal/frmts/tsx/tsxdataset.cpp b/frmts/tsx/tsxdataset.cpp similarity index 100% rename from gdal/frmts/tsx/tsxdataset.cpp rename to frmts/tsx/tsxdataset.cpp diff --git a/gdal/frmts/usgsdem/CDED.notes b/frmts/usgsdem/CDED.notes similarity index 100% rename from gdal/frmts/usgsdem/CDED.notes rename to frmts/usgsdem/CDED.notes diff --git a/gdal/frmts/usgsdem/CMakeLists.txt b/frmts/usgsdem/CMakeLists.txt similarity index 100% rename from gdal/frmts/usgsdem/CMakeLists.txt rename to frmts/usgsdem/CMakeLists.txt diff --git a/gdal/frmts/usgsdem/GNUmakefile b/frmts/usgsdem/GNUmakefile similarity index 100% rename from gdal/frmts/usgsdem/GNUmakefile rename to frmts/usgsdem/GNUmakefile diff --git a/gdal/frmts/usgsdem/makefile.vc b/frmts/usgsdem/makefile.vc similarity index 100% rename from gdal/frmts/usgsdem/makefile.vc rename to frmts/usgsdem/makefile.vc diff --git a/gdal/frmts/usgsdem/usgsdem_create.cpp b/frmts/usgsdem/usgsdem_create.cpp similarity index 100% rename from gdal/frmts/usgsdem/usgsdem_create.cpp rename to frmts/usgsdem/usgsdem_create.cpp diff --git a/gdal/frmts/usgsdem/usgsdemdataset.cpp b/frmts/usgsdem/usgsdemdataset.cpp similarity index 100% rename from gdal/frmts/usgsdem/usgsdemdataset.cpp rename to frmts/usgsdem/usgsdemdataset.cpp diff --git a/gdal/frmts/vrt/CMakeLists.txt b/frmts/vrt/CMakeLists.txt similarity index 100% rename from gdal/frmts/vrt/CMakeLists.txt rename to frmts/vrt/CMakeLists.txt diff --git a/gdal/frmts/vrt/GNUmakefile b/frmts/vrt/GNUmakefile similarity index 100% rename from gdal/frmts/vrt/GNUmakefile rename to frmts/vrt/GNUmakefile diff --git a/gdal/frmts/vrt/gdal_vrt.h b/frmts/vrt/gdal_vrt.h similarity index 100% rename from gdal/frmts/vrt/gdal_vrt.h rename to frmts/vrt/gdal_vrt.h diff --git a/gdal/frmts/vrt/makefile.vc b/frmts/vrt/makefile.vc similarity index 100% rename from gdal/frmts/vrt/makefile.vc rename to frmts/vrt/makefile.vc diff --git a/gdal/frmts/vrt/pixelfunctions.cpp b/frmts/vrt/pixelfunctions.cpp similarity index 100% rename from gdal/frmts/vrt/pixelfunctions.cpp rename to frmts/vrt/pixelfunctions.cpp diff --git a/gdal/frmts/vrt/vrtdataset.cpp b/frmts/vrt/vrtdataset.cpp similarity index 100% rename from gdal/frmts/vrt/vrtdataset.cpp rename to frmts/vrt/vrtdataset.cpp diff --git a/gdal/frmts/vrt/vrtdataset.h b/frmts/vrt/vrtdataset.h similarity index 100% rename from gdal/frmts/vrt/vrtdataset.h rename to frmts/vrt/vrtdataset.h diff --git a/gdal/frmts/vrt/vrtderivedrasterband.cpp b/frmts/vrt/vrtderivedrasterband.cpp similarity index 100% rename from gdal/frmts/vrt/vrtderivedrasterband.cpp rename to frmts/vrt/vrtderivedrasterband.cpp diff --git a/gdal/frmts/vrt/vrtdriver.cpp b/frmts/vrt/vrtdriver.cpp similarity index 100% rename from gdal/frmts/vrt/vrtdriver.cpp rename to frmts/vrt/vrtdriver.cpp diff --git a/gdal/frmts/vrt/vrtfilters.cpp b/frmts/vrt/vrtfilters.cpp similarity index 100% rename from gdal/frmts/vrt/vrtfilters.cpp rename to frmts/vrt/vrtfilters.cpp diff --git a/gdal/frmts/vrt/vrtmultidim.cpp b/frmts/vrt/vrtmultidim.cpp similarity index 100% rename from gdal/frmts/vrt/vrtmultidim.cpp rename to frmts/vrt/vrtmultidim.cpp diff --git a/gdal/frmts/vrt/vrtpansharpened.cpp b/frmts/vrt/vrtpansharpened.cpp similarity index 100% rename from gdal/frmts/vrt/vrtpansharpened.cpp rename to frmts/vrt/vrtpansharpened.cpp diff --git a/gdal/frmts/vrt/vrtrasterband.cpp b/frmts/vrt/vrtrasterband.cpp similarity index 100% rename from gdal/frmts/vrt/vrtrasterband.cpp rename to frmts/vrt/vrtrasterband.cpp diff --git a/gdal/frmts/vrt/vrtrawrasterband.cpp b/frmts/vrt/vrtrawrasterband.cpp similarity index 100% rename from gdal/frmts/vrt/vrtrawrasterband.cpp rename to frmts/vrt/vrtrawrasterband.cpp diff --git a/gdal/frmts/vrt/vrtsourcedrasterband.cpp b/frmts/vrt/vrtsourcedrasterband.cpp similarity index 100% rename from gdal/frmts/vrt/vrtsourcedrasterband.cpp rename to frmts/vrt/vrtsourcedrasterband.cpp diff --git a/gdal/frmts/vrt/vrtsources.cpp b/frmts/vrt/vrtsources.cpp similarity index 100% rename from gdal/frmts/vrt/vrtsources.cpp rename to frmts/vrt/vrtsources.cpp diff --git a/gdal/frmts/vrt/vrtwarped.cpp b/frmts/vrt/vrtwarped.cpp similarity index 100% rename from gdal/frmts/vrt/vrtwarped.cpp rename to frmts/vrt/vrtwarped.cpp diff --git a/gdal/frmts/wcs/CMakeLists.txt b/frmts/wcs/CMakeLists.txt similarity index 100% rename from gdal/frmts/wcs/CMakeLists.txt rename to frmts/wcs/CMakeLists.txt diff --git a/gdal/frmts/wcs/GNUmakefile b/frmts/wcs/GNUmakefile similarity index 100% rename from gdal/frmts/wcs/GNUmakefile rename to frmts/wcs/GNUmakefile diff --git a/gdal/frmts/wcs/gmlcoverage.cpp b/frmts/wcs/gmlcoverage.cpp similarity index 100% rename from gdal/frmts/wcs/gmlcoverage.cpp rename to frmts/wcs/gmlcoverage.cpp diff --git a/gdal/frmts/wcs/gmlcoverage.h b/frmts/wcs/gmlcoverage.h similarity index 100% rename from gdal/frmts/wcs/gmlcoverage.h rename to frmts/wcs/gmlcoverage.h diff --git a/gdal/frmts/wcs/httpdriver.cpp b/frmts/wcs/httpdriver.cpp similarity index 100% rename from gdal/frmts/wcs/httpdriver.cpp rename to frmts/wcs/httpdriver.cpp diff --git a/gdal/frmts/wcs/makefile.vc b/frmts/wcs/makefile.vc similarity index 100% rename from gdal/frmts/wcs/makefile.vc rename to frmts/wcs/makefile.vc diff --git a/gdal/frmts/wcs/wcsdataset.cpp b/frmts/wcs/wcsdataset.cpp similarity index 100% rename from gdal/frmts/wcs/wcsdataset.cpp rename to frmts/wcs/wcsdataset.cpp diff --git a/gdal/frmts/wcs/wcsdataset.h b/frmts/wcs/wcsdataset.h similarity index 100% rename from gdal/frmts/wcs/wcsdataset.h rename to frmts/wcs/wcsdataset.h diff --git a/gdal/frmts/wcs/wcsdataset100.cpp b/frmts/wcs/wcsdataset100.cpp similarity index 100% rename from gdal/frmts/wcs/wcsdataset100.cpp rename to frmts/wcs/wcsdataset100.cpp diff --git a/gdal/frmts/wcs/wcsdataset110.cpp b/frmts/wcs/wcsdataset110.cpp similarity index 100% rename from gdal/frmts/wcs/wcsdataset110.cpp rename to frmts/wcs/wcsdataset110.cpp diff --git a/gdal/frmts/wcs/wcsdataset201.cpp b/frmts/wcs/wcsdataset201.cpp similarity index 100% rename from gdal/frmts/wcs/wcsdataset201.cpp rename to frmts/wcs/wcsdataset201.cpp diff --git a/gdal/frmts/wcs/wcsrasterband.cpp b/frmts/wcs/wcsrasterband.cpp similarity index 100% rename from gdal/frmts/wcs/wcsrasterband.cpp rename to frmts/wcs/wcsrasterband.cpp diff --git a/gdal/frmts/wcs/wcsrasterband.h b/frmts/wcs/wcsrasterband.h similarity index 100% rename from gdal/frmts/wcs/wcsrasterband.h rename to frmts/wcs/wcsrasterband.h diff --git a/gdal/frmts/wcs/wcsutils.cpp b/frmts/wcs/wcsutils.cpp similarity index 100% rename from gdal/frmts/wcs/wcsutils.cpp rename to frmts/wcs/wcsutils.cpp diff --git a/gdal/frmts/wcs/wcsutils.h b/frmts/wcs/wcsutils.h similarity index 100% rename from gdal/frmts/wcs/wcsutils.h rename to frmts/wcs/wcsutils.h diff --git a/gdal/frmts/webp/CMakeLists.txt b/frmts/webp/CMakeLists.txt similarity index 100% rename from gdal/frmts/webp/CMakeLists.txt rename to frmts/webp/CMakeLists.txt diff --git a/gdal/frmts/webp/GNUmakefile b/frmts/webp/GNUmakefile similarity index 100% rename from gdal/frmts/webp/GNUmakefile rename to frmts/webp/GNUmakefile diff --git a/gdal/frmts/webp/makefile.vc b/frmts/webp/makefile.vc similarity index 100% rename from gdal/frmts/webp/makefile.vc rename to frmts/webp/makefile.vc diff --git a/gdal/frmts/webp/webp_headers.h b/frmts/webp/webp_headers.h similarity index 100% rename from gdal/frmts/webp/webp_headers.h rename to frmts/webp/webp_headers.h diff --git a/gdal/frmts/webp/webpdataset.cpp b/frmts/webp/webpdataset.cpp similarity index 100% rename from gdal/frmts/webp/webpdataset.cpp rename to frmts/webp/webpdataset.cpp diff --git a/gdal/frmts/wms/CMakeLists.txt b/frmts/wms/CMakeLists.txt similarity index 100% rename from gdal/frmts/wms/CMakeLists.txt rename to frmts/wms/CMakeLists.txt diff --git a/gdal/frmts/wms/GNUmakefile b/frmts/wms/GNUmakefile similarity index 100% rename from gdal/frmts/wms/GNUmakefile rename to frmts/wms/GNUmakefile diff --git a/gdal/frmts/wms/WMSServerList.txt b/frmts/wms/WMSServerList.txt similarity index 100% rename from gdal/frmts/wms/WMSServerList.txt rename to frmts/wms/WMSServerList.txt diff --git a/gdal/frmts/wms/frmt_ags_arcgisonline.xml b/frmts/wms/frmt_ags_arcgisonline.xml similarity index 100% rename from gdal/frmts/wms/frmt_ags_arcgisonline.xml rename to frmts/wms/frmt_ags_arcgisonline.xml diff --git a/gdal/frmts/wms/frmt_twms_Clementine.xml b/frmts/wms/frmt_twms_Clementine.xml similarity index 100% rename from gdal/frmts/wms/frmt_twms_Clementine.xml rename to frmts/wms/frmt_twms_Clementine.xml diff --git a/gdal/frmts/wms/frmt_twms_Moon.xml b/frmts/wms/frmt_twms_Moon.xml similarity index 100% rename from gdal/frmts/wms/frmt_twms_Moon.xml rename to frmts/wms/frmt_twms_Moon.xml diff --git a/gdal/frmts/wms/frmt_twms_daily.xml b/frmts/wms/frmt_twms_daily.xml similarity index 100% rename from gdal/frmts/wms/frmt_twms_daily.xml rename to frmts/wms/frmt_twms_daily.xml diff --git a/gdal/frmts/wms/frmt_twms_srtm.xml b/frmts/wms/frmt_twms_srtm.xml similarity index 100% rename from gdal/frmts/wms/frmt_twms_srtm.xml rename to frmts/wms/frmt_twms_srtm.xml diff --git a/gdal/frmts/wms/frmt_wms_arcgis_mapserver_tms.xml b/frmts/wms/frmt_wms_arcgis_mapserver_tms.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_arcgis_mapserver_tms.xml rename to frmts/wms/frmt_wms_arcgis_mapserver_tms.xml diff --git a/gdal/frmts/wms/frmt_wms_arcgis_terrain_tms_lerc.xml b/frmts/wms/frmt_wms_arcgis_terrain_tms_lerc.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_arcgis_terrain_tms_lerc.xml rename to frmts/wms/frmt_wms_arcgis_terrain_tms_lerc.xml diff --git a/gdal/frmts/wms/frmt_wms_bluemarble_s3_tms.xml b/frmts/wms/frmt_wms_bluemarble_s3_tms.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_bluemarble_s3_tms.xml rename to frmts/wms/frmt_wms_bluemarble_s3_tms.xml diff --git a/gdal/frmts/wms/frmt_wms_googlemaps_tms.xml b/frmts/wms/frmt_wms_googlemaps_tms.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_googlemaps_tms.xml rename to frmts/wms/frmt_wms_googlemaps_tms.xml diff --git a/gdal/frmts/wms/frmt_wms_iip.xml b/frmts/wms/frmt_wms_iip.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_iip.xml rename to frmts/wms/frmt_wms_iip.xml diff --git a/gdal/frmts/wms/frmt_wms_metacarta_tms.xml b/frmts/wms/frmt_wms_metacarta_tms.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_metacarta_tms.xml rename to frmts/wms/frmt_wms_metacarta_tms.xml diff --git a/gdal/frmts/wms/frmt_wms_metacarta_wmsc.xml b/frmts/wms/frmt_wms_metacarta_wmsc.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_metacarta_wmsc.xml rename to frmts/wms/frmt_wms_metacarta_wmsc.xml diff --git a/gdal/frmts/wms/frmt_wms_onearth_global_mosaic.xml b/frmts/wms/frmt_wms_onearth_global_mosaic.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_onearth_global_mosaic.xml rename to frmts/wms/frmt_wms_onearth_global_mosaic.xml diff --git a/gdal/frmts/wms/frmt_wms_openstreetmap_tms.xml b/frmts/wms/frmt_wms_openstreetmap_tms.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_openstreetmap_tms.xml rename to frmts/wms/frmt_wms_openstreetmap_tms.xml diff --git a/gdal/frmts/wms/frmt_wms_tileservice_bmng.xml b/frmts/wms/frmt_wms_tileservice_bmng.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_tileservice_bmng.xml rename to frmts/wms/frmt_wms_tileservice_bmng.xml diff --git a/gdal/frmts/wms/frmt_wms_tileservice_nysdop2004.xml b/frmts/wms/frmt_wms_tileservice_nysdop2004.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_tileservice_nysdop2004.xml rename to frmts/wms/frmt_wms_tileservice_nysdop2004.xml diff --git a/gdal/frmts/wms/frmt_wms_virtualearth.xml b/frmts/wms/frmt_wms_virtualearth.xml similarity index 100% rename from gdal/frmts/wms/frmt_wms_virtualearth.xml rename to frmts/wms/frmt_wms_virtualearth.xml diff --git a/gdal/frmts/wms/gdalhttp.cpp b/frmts/wms/gdalhttp.cpp similarity index 100% rename from gdal/frmts/wms/gdalhttp.cpp rename to frmts/wms/gdalhttp.cpp diff --git a/gdal/frmts/wms/gdalhttp.h b/frmts/wms/gdalhttp.h similarity index 100% rename from gdal/frmts/wms/gdalhttp.h rename to frmts/wms/gdalhttp.h diff --git a/gdal/frmts/wms/gdalwmscache.cpp b/frmts/wms/gdalwmscache.cpp similarity index 100% rename from gdal/frmts/wms/gdalwmscache.cpp rename to frmts/wms/gdalwmscache.cpp diff --git a/gdal/frmts/wms/gdalwmsdataset.cpp b/frmts/wms/gdalwmsdataset.cpp similarity index 100% rename from gdal/frmts/wms/gdalwmsdataset.cpp rename to frmts/wms/gdalwmsdataset.cpp diff --git a/gdal/frmts/wms/gdalwmsrasterband.cpp b/frmts/wms/gdalwmsrasterband.cpp similarity index 100% rename from gdal/frmts/wms/gdalwmsrasterband.cpp rename to frmts/wms/gdalwmsrasterband.cpp diff --git a/gdal/frmts/wms/makefile.vc b/frmts/wms/makefile.vc similarity index 100% rename from gdal/frmts/wms/makefile.vc rename to frmts/wms/makefile.vc diff --git a/gdal/frmts/wms/minidriver.cpp b/frmts/wms/minidriver.cpp similarity index 100% rename from gdal/frmts/wms/minidriver.cpp rename to frmts/wms/minidriver.cpp diff --git a/gdal/frmts/wms/minidriver_arcgis_server.cpp b/frmts/wms/minidriver_arcgis_server.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_arcgis_server.cpp rename to frmts/wms/minidriver_arcgis_server.cpp diff --git a/gdal/frmts/wms/minidriver_arcgis_server.h b/frmts/wms/minidriver_arcgis_server.h similarity index 100% rename from gdal/frmts/wms/minidriver_arcgis_server.h rename to frmts/wms/minidriver_arcgis_server.h diff --git a/gdal/frmts/wms/minidriver_iip.cpp b/frmts/wms/minidriver_iip.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_iip.cpp rename to frmts/wms/minidriver_iip.cpp diff --git a/gdal/frmts/wms/minidriver_iip.h b/frmts/wms/minidriver_iip.h similarity index 100% rename from gdal/frmts/wms/minidriver_iip.h rename to frmts/wms/minidriver_iip.h diff --git a/gdal/frmts/wms/minidriver_mrf.cpp b/frmts/wms/minidriver_mrf.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_mrf.cpp rename to frmts/wms/minidriver_mrf.cpp diff --git a/gdal/frmts/wms/minidriver_mrf.h b/frmts/wms/minidriver_mrf.h similarity index 100% rename from gdal/frmts/wms/minidriver_mrf.h rename to frmts/wms/minidriver_mrf.h diff --git a/gdal/frmts/wms/minidriver_ogcapicoverage.cpp b/frmts/wms/minidriver_ogcapicoverage.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_ogcapicoverage.cpp rename to frmts/wms/minidriver_ogcapicoverage.cpp diff --git a/gdal/frmts/wms/minidriver_ogcapicoverage.h b/frmts/wms/minidriver_ogcapicoverage.h similarity index 100% rename from gdal/frmts/wms/minidriver_ogcapicoverage.h rename to frmts/wms/minidriver_ogcapicoverage.h diff --git a/gdal/frmts/wms/minidriver_ogcapimaps.cpp b/frmts/wms/minidriver_ogcapimaps.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_ogcapimaps.cpp rename to frmts/wms/minidriver_ogcapimaps.cpp diff --git a/gdal/frmts/wms/minidriver_ogcapimaps.h b/frmts/wms/minidriver_ogcapimaps.h similarity index 100% rename from gdal/frmts/wms/minidriver_ogcapimaps.h rename to frmts/wms/minidriver_ogcapimaps.h diff --git a/gdal/frmts/wms/minidriver_tiled_wms.cpp b/frmts/wms/minidriver_tiled_wms.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_tiled_wms.cpp rename to frmts/wms/minidriver_tiled_wms.cpp diff --git a/gdal/frmts/wms/minidriver_tiled_wms.h b/frmts/wms/minidriver_tiled_wms.h similarity index 100% rename from gdal/frmts/wms/minidriver_tiled_wms.h rename to frmts/wms/minidriver_tiled_wms.h diff --git a/gdal/frmts/wms/minidriver_tileservice.cpp b/frmts/wms/minidriver_tileservice.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_tileservice.cpp rename to frmts/wms/minidriver_tileservice.cpp diff --git a/gdal/frmts/wms/minidriver_tileservice.h b/frmts/wms/minidriver_tileservice.h similarity index 100% rename from gdal/frmts/wms/minidriver_tileservice.h rename to frmts/wms/minidriver_tileservice.h diff --git a/gdal/frmts/wms/minidriver_tms.cpp b/frmts/wms/minidriver_tms.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_tms.cpp rename to frmts/wms/minidriver_tms.cpp diff --git a/gdal/frmts/wms/minidriver_tms.h b/frmts/wms/minidriver_tms.h similarity index 100% rename from gdal/frmts/wms/minidriver_tms.h rename to frmts/wms/minidriver_tms.h diff --git a/gdal/frmts/wms/minidriver_virtualearth.cpp b/frmts/wms/minidriver_virtualearth.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_virtualearth.cpp rename to frmts/wms/minidriver_virtualearth.cpp diff --git a/gdal/frmts/wms/minidriver_virtualearth.h b/frmts/wms/minidriver_virtualearth.h similarity index 100% rename from gdal/frmts/wms/minidriver_virtualearth.h rename to frmts/wms/minidriver_virtualearth.h diff --git a/gdal/frmts/wms/minidriver_wms.cpp b/frmts/wms/minidriver_wms.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_wms.cpp rename to frmts/wms/minidriver_wms.cpp diff --git a/gdal/frmts/wms/minidriver_wms.h b/frmts/wms/minidriver_wms.h similarity index 100% rename from gdal/frmts/wms/minidriver_wms.h rename to frmts/wms/minidriver_wms.h diff --git a/gdal/frmts/wms/minidriver_worldwind.cpp b/frmts/wms/minidriver_worldwind.cpp similarity index 100% rename from gdal/frmts/wms/minidriver_worldwind.cpp rename to frmts/wms/minidriver_worldwind.cpp diff --git a/gdal/frmts/wms/minidriver_worldwind.h b/frmts/wms/minidriver_worldwind.h similarity index 100% rename from gdal/frmts/wms/minidriver_worldwind.h rename to frmts/wms/minidriver_worldwind.h diff --git a/gdal/frmts/wms/wmsdriver.cpp b/frmts/wms/wmsdriver.cpp similarity index 100% rename from gdal/frmts/wms/wmsdriver.cpp rename to frmts/wms/wmsdriver.cpp diff --git a/gdal/frmts/wms/wmsdriver.h b/frmts/wms/wmsdriver.h similarity index 100% rename from gdal/frmts/wms/wmsdriver.h rename to frmts/wms/wmsdriver.h diff --git a/gdal/frmts/wms/wmsmetadataset.cpp b/frmts/wms/wmsmetadataset.cpp similarity index 100% rename from gdal/frmts/wms/wmsmetadataset.cpp rename to frmts/wms/wmsmetadataset.cpp diff --git a/gdal/frmts/wms/wmsmetadataset.h b/frmts/wms/wmsmetadataset.h similarity index 100% rename from gdal/frmts/wms/wmsmetadataset.h rename to frmts/wms/wmsmetadataset.h diff --git a/gdal/frmts/wms/wmsutils.cpp b/frmts/wms/wmsutils.cpp similarity index 100% rename from gdal/frmts/wms/wmsutils.cpp rename to frmts/wms/wmsutils.cpp diff --git a/gdal/frmts/wmts/CMakeLists.txt b/frmts/wmts/CMakeLists.txt similarity index 100% rename from gdal/frmts/wmts/CMakeLists.txt rename to frmts/wmts/CMakeLists.txt diff --git a/gdal/frmts/wmts/GNUmakefile b/frmts/wmts/GNUmakefile similarity index 100% rename from gdal/frmts/wmts/GNUmakefile rename to frmts/wmts/GNUmakefile diff --git a/gdal/frmts/wmts/makefile.vc b/frmts/wmts/makefile.vc similarity index 100% rename from gdal/frmts/wmts/makefile.vc rename to frmts/wmts/makefile.vc diff --git a/gdal/frmts/wmts/wmtsdataset.cpp b/frmts/wmts/wmtsdataset.cpp similarity index 100% rename from gdal/frmts/wmts/wmtsdataset.cpp rename to frmts/wmts/wmtsdataset.cpp diff --git a/gdal/frmts/xpm/CMakeLists.txt b/frmts/xpm/CMakeLists.txt similarity index 100% rename from gdal/frmts/xpm/CMakeLists.txt rename to frmts/xpm/CMakeLists.txt diff --git a/gdal/frmts/xpm/GNUmakefile b/frmts/xpm/GNUmakefile similarity index 100% rename from gdal/frmts/xpm/GNUmakefile rename to frmts/xpm/GNUmakefile diff --git a/gdal/frmts/xpm/makefile.vc b/frmts/xpm/makefile.vc similarity index 100% rename from gdal/frmts/xpm/makefile.vc rename to frmts/xpm/makefile.vc diff --git a/gdal/frmts/xpm/xpmdataset.cpp b/frmts/xpm/xpmdataset.cpp similarity index 100% rename from gdal/frmts/xpm/xpmdataset.cpp rename to frmts/xpm/xpmdataset.cpp diff --git a/gdal/frmts/xyz/CMakeLists.txt b/frmts/xyz/CMakeLists.txt similarity index 100% rename from gdal/frmts/xyz/CMakeLists.txt rename to frmts/xyz/CMakeLists.txt diff --git a/gdal/frmts/xyz/GNUmakefile b/frmts/xyz/GNUmakefile similarity index 100% rename from gdal/frmts/xyz/GNUmakefile rename to frmts/xyz/GNUmakefile diff --git a/gdal/frmts/xyz/makefile.vc b/frmts/xyz/makefile.vc similarity index 100% rename from gdal/frmts/xyz/makefile.vc rename to frmts/xyz/makefile.vc diff --git a/gdal/frmts/xyz/xyzdataset.cpp b/frmts/xyz/xyzdataset.cpp similarity index 100% rename from gdal/frmts/xyz/xyzdataset.cpp rename to frmts/xyz/xyzdataset.cpp diff --git a/gdal/frmts/zarr/CMakeLists.txt b/frmts/zarr/CMakeLists.txt similarity index 100% rename from gdal/frmts/zarr/CMakeLists.txt rename to frmts/zarr/CMakeLists.txt diff --git a/gdal/frmts/zarr/GNUmakefile b/frmts/zarr/GNUmakefile similarity index 100% rename from gdal/frmts/zarr/GNUmakefile rename to frmts/zarr/GNUmakefile diff --git a/gdal/frmts/zarr/makefile.vc b/frmts/zarr/makefile.vc similarity index 100% rename from gdal/frmts/zarr/makefile.vc rename to frmts/zarr/makefile.vc diff --git a/gdal/frmts/zarr/ucs4_utf8.hpp b/frmts/zarr/ucs4_utf8.hpp similarity index 100% rename from gdal/frmts/zarr/ucs4_utf8.hpp rename to frmts/zarr/ucs4_utf8.hpp diff --git a/gdal/frmts/zarr/zarr.h b/frmts/zarr/zarr.h similarity index 100% rename from gdal/frmts/zarr/zarr.h rename to frmts/zarr/zarr.h diff --git a/gdal/frmts/zarr/zarr_array.cpp b/frmts/zarr/zarr_array.cpp similarity index 100% rename from gdal/frmts/zarr/zarr_array.cpp rename to frmts/zarr/zarr_array.cpp diff --git a/gdal/frmts/zarr/zarr_attribute.cpp b/frmts/zarr/zarr_attribute.cpp similarity index 100% rename from gdal/frmts/zarr/zarr_attribute.cpp rename to frmts/zarr/zarr_attribute.cpp diff --git a/gdal/frmts/zarr/zarr_group.cpp b/frmts/zarr/zarr_group.cpp similarity index 100% rename from gdal/frmts/zarr/zarr_group.cpp rename to frmts/zarr/zarr_group.cpp diff --git a/gdal/frmts/zarr/zarrdriver.cpp b/frmts/zarr/zarrdriver.cpp similarity index 100% rename from gdal/frmts/zarr/zarrdriver.cpp rename to frmts/zarr/zarrdriver.cpp diff --git a/gdal/frmts/zlib/CMakeLists.txt b/frmts/zlib/CMakeLists.txt similarity index 100% rename from gdal/frmts/zlib/CMakeLists.txt rename to frmts/zlib/CMakeLists.txt diff --git a/gdal/frmts/zlib/GNUmakefile b/frmts/zlib/GNUmakefile similarity index 100% rename from gdal/frmts/zlib/GNUmakefile rename to frmts/zlib/GNUmakefile diff --git a/gdal/frmts/zlib/README b/frmts/zlib/README similarity index 100% rename from gdal/frmts/zlib/README rename to frmts/zlib/README diff --git a/gdal/frmts/zlib/adler32.c b/frmts/zlib/adler32.c similarity index 100% rename from gdal/frmts/zlib/adler32.c rename to frmts/zlib/adler32.c diff --git a/gdal/frmts/zlib/compress.c b/frmts/zlib/compress.c similarity index 100% rename from gdal/frmts/zlib/compress.c rename to frmts/zlib/compress.c diff --git a/gdal/frmts/zlib/crc32.c b/frmts/zlib/crc32.c similarity index 100% rename from gdal/frmts/zlib/crc32.c rename to frmts/zlib/crc32.c diff --git a/gdal/frmts/zlib/crc32.h b/frmts/zlib/crc32.h similarity index 100% rename from gdal/frmts/zlib/crc32.h rename to frmts/zlib/crc32.h diff --git a/gdal/frmts/zlib/deflate.c b/frmts/zlib/deflate.c similarity index 100% rename from gdal/frmts/zlib/deflate.c rename to frmts/zlib/deflate.c diff --git a/gdal/frmts/zlib/deflate.h b/frmts/zlib/deflate.h similarity index 100% rename from gdal/frmts/zlib/deflate.h rename to frmts/zlib/deflate.h diff --git a/gdal/frmts/zlib/gzio.c b/frmts/zlib/gzio.c similarity index 100% rename from gdal/frmts/zlib/gzio.c rename to frmts/zlib/gzio.c diff --git a/gdal/frmts/zlib/infback.c b/frmts/zlib/infback.c similarity index 100% rename from gdal/frmts/zlib/infback.c rename to frmts/zlib/infback.c diff --git a/gdal/frmts/zlib/inffast.c b/frmts/zlib/inffast.c similarity index 100% rename from gdal/frmts/zlib/inffast.c rename to frmts/zlib/inffast.c diff --git a/gdal/frmts/zlib/inffast.h b/frmts/zlib/inffast.h similarity index 100% rename from gdal/frmts/zlib/inffast.h rename to frmts/zlib/inffast.h diff --git a/gdal/frmts/zlib/inffixed.h b/frmts/zlib/inffixed.h similarity index 100% rename from gdal/frmts/zlib/inffixed.h rename to frmts/zlib/inffixed.h diff --git a/gdal/frmts/zlib/inflate.c b/frmts/zlib/inflate.c similarity index 100% rename from gdal/frmts/zlib/inflate.c rename to frmts/zlib/inflate.c diff --git a/gdal/frmts/zlib/inflate.h b/frmts/zlib/inflate.h similarity index 100% rename from gdal/frmts/zlib/inflate.h rename to frmts/zlib/inflate.h diff --git a/gdal/frmts/zlib/inftrees.c b/frmts/zlib/inftrees.c similarity index 100% rename from gdal/frmts/zlib/inftrees.c rename to frmts/zlib/inftrees.c diff --git a/gdal/frmts/zlib/inftrees.h b/frmts/zlib/inftrees.h similarity index 100% rename from gdal/frmts/zlib/inftrees.h rename to frmts/zlib/inftrees.h diff --git a/gdal/frmts/zlib/makefile.vc b/frmts/zlib/makefile.vc similarity index 100% rename from gdal/frmts/zlib/makefile.vc rename to frmts/zlib/makefile.vc diff --git a/gdal/frmts/zlib/trees.c b/frmts/zlib/trees.c similarity index 100% rename from gdal/frmts/zlib/trees.c rename to frmts/zlib/trees.c diff --git a/gdal/frmts/zlib/trees.h b/frmts/zlib/trees.h similarity index 100% rename from gdal/frmts/zlib/trees.h rename to frmts/zlib/trees.h diff --git a/gdal/frmts/zlib/uncompr.c b/frmts/zlib/uncompr.c similarity index 100% rename from gdal/frmts/zlib/uncompr.c rename to frmts/zlib/uncompr.c diff --git a/gdal/frmts/zlib/zconf.h b/frmts/zlib/zconf.h similarity index 100% rename from gdal/frmts/zlib/zconf.h rename to frmts/zlib/zconf.h diff --git a/gdal/frmts/zlib/zlib.h b/frmts/zlib/zlib.h similarity index 100% rename from gdal/frmts/zlib/zlib.h rename to frmts/zlib/zlib.h diff --git a/gdal/frmts/zlib/zutil.c b/frmts/zlib/zutil.c similarity index 100% rename from gdal/frmts/zlib/zutil.c rename to frmts/zlib/zutil.c diff --git a/gdal/frmts/zlib/zutil.h b/frmts/zlib/zutil.h similarity index 100% rename from gdal/frmts/zlib/zutil.h rename to frmts/zlib/zutil.h diff --git a/gdal/frmts/zmap/CMakeLists.txt b/frmts/zmap/CMakeLists.txt similarity index 100% rename from gdal/frmts/zmap/CMakeLists.txt rename to frmts/zmap/CMakeLists.txt diff --git a/gdal/frmts/zmap/GNUmakefile b/frmts/zmap/GNUmakefile similarity index 100% rename from gdal/frmts/zmap/GNUmakefile rename to frmts/zmap/GNUmakefile diff --git a/gdal/frmts/zmap/makefile.vc b/frmts/zmap/makefile.vc similarity index 100% rename from gdal/frmts/zmap/makefile.vc rename to frmts/zmap/makefile.vc diff --git a/gdal/frmts/zmap/zmapdataset.cpp b/frmts/zmap/zmapdataset.cpp similarity index 100% rename from gdal/frmts/zmap/zmapdataset.cpp rename to frmts/zmap/zmapdataset.cpp diff --git a/gdal/fuzzers/.gitignore b/fuzzers/.gitignore similarity index 100% rename from gdal/fuzzers/.gitignore rename to fuzzers/.gitignore diff --git a/gdal/fuzzers/CMakeLists.txt b/fuzzers/CMakeLists.txt similarity index 100% rename from gdal/fuzzers/CMakeLists.txt rename to fuzzers/CMakeLists.txt diff --git a/gdal/fuzzers/GNUmakefile b/fuzzers/GNUmakefile similarity index 100% rename from gdal/fuzzers/GNUmakefile rename to fuzzers/GNUmakefile diff --git a/gdal/fuzzers/NC4_put_propattr_leak_fix.patch b/fuzzers/NC4_put_propattr_leak_fix.patch similarity index 100% rename from gdal/fuzzers/NC4_put_propattr_leak_fix.patch rename to fuzzers/NC4_put_propattr_leak_fix.patch diff --git a/gdal/fuzzers/README.TXT b/fuzzers/README.TXT similarity index 100% rename from gdal/fuzzers/README.TXT rename to fuzzers/README.TXT diff --git a/gdal/fuzzers/build.sh b/fuzzers/build.sh similarity index 99% rename from gdal/fuzzers/build.sh rename to fuzzers/build.sh index dbc98b751fcf..55dbb1cb10b1 100755 --- a/gdal/fuzzers/build.sh +++ b/fuzzers/build.sh @@ -163,7 +163,6 @@ if [ "$SANITIZER" = "undefined" ]; then CXXFLAGS="$CXXFLAGS -fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow" fi -cd gdal ./autogen.sh export LDFLAGS="${CXXFLAGS}" NETCDF_SWITCH="" diff --git a/gdal/fuzzers/build_google_oss_fuzzers.sh b/fuzzers/build_google_oss_fuzzers.sh similarity index 100% rename from gdal/fuzzers/build_google_oss_fuzzers.sh rename to fuzzers/build_google_oss_fuzzers.sh diff --git a/gdal/fuzzers/build_seed_corpus.sh b/fuzzers/build_seed_corpus.sh similarity index 78% rename from gdal/fuzzers/build_seed_corpus.sh rename to fuzzers/build_seed_corpus.sh index 3e1ec1a6c7d5..538e499fb55c 100755 --- a/gdal/fuzzers/build_seed_corpus.sh +++ b/fuzzers/build_seed_corpus.sh @@ -39,7 +39,7 @@ COMPRESS=NONE 20 ***NEWFILE***:in EOF -cat $(dirname $0)/../../autotest/gcore/data/byte.tif >> test.tar +cat $(dirname $0)/../autotest/gcore/data/byte.tif >> test.tar rm -f $OUT/gdal_translate_fuzzer_seed_corpus.zip zip -r $OUT/gdal_translate_fuzzer_seed_corpus.zip test.tar >/dev/null rm test.tar @@ -75,19 +75,19 @@ rm test.tar echo "Building gtiff_fuzzer_seed_corpus.zip" rm -f $OUT/gtiff_fuzzer_seed_corpus.zip -cd $(dirname $0)/../../autotest/gcore/data +cd $(dirname $0)/../autotest/gcore/data zip -r $OUT/gtiff_fuzzer_seed_corpus.zip ./*.tif >/dev/null cd $OLDPWD -cd $(dirname $0)/../../autotest/gdrivers/data +cd $(dirname $0)/../autotest/gdrivers/data zip -r $OUT/gtiff_fuzzer_seed_corpus.zip ./*.tif >/dev/null cd $OLDPWD echo "Building hfa_fuzzer_seed_corpus.zip" rm -f $OUT/hfa_fuzzer_seed_corpus.zip -cd $(dirname $0)/../../autotest/gcore/data +cd $(dirname $0)/../autotest/gcore/data zip -r $OUT/hfa_fuzzer_seed_corpus.zip ./*.img >/dev/null cd $OLDPWD -cd $(dirname $0)/../../autotest/gdrivers/data/hfa +cd $(dirname $0)/../autotest/gdrivers/data/hfa zip -r $OUT/hfa_fuzzer_seed_corpus.zip ./*.img >/dev/null cd $OLDPWD @@ -95,9 +95,9 @@ echo "Building adrg_fuzzer_seed_corpus.zip" { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:ABCDEF01.GEN\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/adrg/SMALL_ADRG/ABCDEF01.GEN + cat $(dirname $0)/../autotest/gdrivers/data/adrg/SMALL_ADRG/ABCDEF01.GEN printf "***NEWFILE***:ABCDEF01.IMG\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/adrg/SMALL_ADRG/ABCDEF01.IMG + cat $(dirname $0)/../autotest/gdrivers/data/adrg/SMALL_ADRG/ABCDEF01.IMG } > adrg.tar rm -f $OUT/adrg_fuzzer_seed_corpus.zip zip -r $OUT/adrg_fuzzer_seed_corpus.zip adrg.tar >/dev/null @@ -107,11 +107,11 @@ echo "Building srp_fuzzer_seed_corpus.zip" { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:FKUSRP01.GEN\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/srp/USRP_PCB0/FKUSRP01.GEN + cat $(dirname $0)/../autotest/gdrivers/data/srp/USRP_PCB0/FKUSRP01.GEN printf "***NEWFILE***:FKUSRP01.IMG\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/srp/USRP_PCB0/FKUSRP01.IMG + cat $(dirname $0)/../autotest/gdrivers/data/srp/USRP_PCB0/FKUSRP01.IMG printf "***NEWFILE***:FKUSRP01.QAL\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/srp/USRP_PCB0/FKUSRP01.QAL + cat $(dirname $0)/../autotest/gdrivers/data/srp/USRP_PCB0/FKUSRP01.QAL } > srp.tar rm -f $OUT/srp_fuzzer_seed_corpus.zip zip -r $OUT/srp_fuzzer_seed_corpus.zip srp.tar >/dev/null @@ -121,7 +121,7 @@ rm srp.tar echo "Building mrf_fuzzer_seed_corpus.zip" rm -f $OUT/mrf_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/gdrivers/data/mrf +cd $(dirname $0)/../autotest/gdrivers/data/mrf for subdir in *; do (cd $subdir printf "FUZZER_FRIENDLY_ARCHIVE\\n" > $CUR_DIR/mrf_$subdir.tar @@ -141,9 +141,9 @@ rm -f $OUT/envi_fuzzer_seed_corpus.zip { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:my.hdr\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/envi/aea.hdr + cat $(dirname $0)/../autotest/gdrivers/data/envi/aea.hdr printf "***NEWFILE***:my.dat\\n" >> aea.tar - cat $(dirname $0)/../../autotest/gdrivers/data/envi/aea.dat + cat $(dirname $0)/../autotest/gdrivers/data/envi/aea.dat } > aea.tar zip -r $OUT/envi_fuzzer_seed_corpus.zip aea.tar >/dev/null rm aea.tar @@ -151,9 +151,9 @@ rm aea.tar { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:my.hdr\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/envi/aea_compressed.hdr + cat $(dirname $0)/../autotest/gdrivers/data/envi/aea_compressed.hdr printf "***NEWFILE***:my.dat\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/envi/aea_compressed.dat + cat $(dirname $0)/../autotest/gdrivers/data/envi/aea_compressed.dat } > aea_compressed.tar zip -r $OUT/envi_fuzzer_seed_corpus.zip aea_compressed.tar >/dev/null rm aea_compressed.tar @@ -164,9 +164,9 @@ rm -f $OUT/ehdr_fuzzer_seed_corpus.zip { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:my.hdr\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/ehdr/ehdr11.hdr + cat $(dirname $0)/../autotest/gdrivers/data/ehdr/ehdr11.hdr printf "***NEWFILE***:my.dat\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/ehdr/ehdr11.flt + cat $(dirname $0)/../autotest/gdrivers/data/ehdr/ehdr11.flt } > ehdr11.tar zip -r $OUT/ehdr_fuzzer_seed_corpus.zip ehdr11.tar >/dev/null rm ehdr11.tar @@ -177,9 +177,9 @@ rm -f $OUT/genbin_fuzzer_seed_corpus.zip { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:my.hdr\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/genbin/tm4628_96.hdr + cat $(dirname $0)/../autotest/gdrivers/data/genbin/tm4628_96.hdr printf "***NEWFILE***:my.bil\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/genbin/tm4628_96.bil + cat $(dirname $0)/../autotest/gdrivers/data/genbin/tm4628_96.bil } > genbin.tar zip -r $OUT/genbin_fuzzer_seed_corpus.zip genbin.tar >/dev/null rm genbin.tar @@ -190,9 +190,9 @@ rm -f $OUT/isce_fuzzer_seed_corpus.zip { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:isce.slc\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/isce/isce.slc + cat $(dirname $0)/../autotest/gdrivers/data/isce/isce.slc printf "***NEWFILE***:isce.slc.xml\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/isce/isce.slc.xml + cat $(dirname $0)/../autotest/gdrivers/data/isce/isce.slc.xml } > isce.tar zip -r $OUT/isce_fuzzer_seed_corpus.zip isce.tar >/dev/null rm isce.tar @@ -203,9 +203,9 @@ rm -f $OUT/roipac_fuzzer_seed_corpus.zip { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:srtm.dem\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/roipac/srtm.dem + cat $(dirname $0)/../autotest/gdrivers/data/roipac/srtm.dem printf "***NEWFILE***:srtm.dem.rsc\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/roipac/srtm.dem.rsc + cat $(dirname $0)/../autotest/gdrivers/data/roipac/srtm.dem.rsc } > roipac.tar zip -r $OUT/roipac_fuzzer_seed_corpus.zip roipac.tar >/dev/null rm roipac.tar @@ -216,9 +216,9 @@ rm -f $OUT/rraster_fuzzer_seed_corpus.zip { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:my.grd\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/rraster/byte_rraster.grd + cat $(dirname $0)/../autotest/gdrivers/data/rraster/byte_rraster.grd printf "***NEWFILE***:my.gri\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/rraster/byte_rraster.gri + cat $(dirname $0)/../autotest/gdrivers/data/rraster/byte_rraster.gri } > rraster.tar zip -r $OUT/rraster_fuzzer_seed_corpus.zip rraster.tar >/dev/null rm rraster.tar @@ -229,9 +229,9 @@ rm -f $OUT/gdal_vrt_fuzzer_seed_corpus.zip { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:byte.tif\\n" - cat $(dirname $0)/../../autotest/gcore/data/byte.tif + cat $(dirname $0)/../autotest/gcore/data/byte.tif printf "***NEWFILE***:test.vrt\\n" - cat $(dirname $0)/../../autotest/gcore/data/byte.vrt + cat $(dirname $0)/../autotest/gcore/data/byte.vrt } > gdal_vrt.tar zip -r $OUT/gdal_vrt_fuzzer_seed_corpus.zip gdal_vrt.tar >/dev/null rm gdal_vrt.tar @@ -239,9 +239,9 @@ rm gdal_vrt.tar { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:small.raw\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/small.raw + cat $(dirname $0)/../autotest/gdrivers/data/small.raw printf "***NEWFILE***:test.vrt\\n" - cat $(dirname $0)/../../autotest/gdrivers/data/small.vrt + cat $(dirname $0)/../autotest/gdrivers/data/small.vrt } > gdal_vrt_rawlink.tar zip -r $OUT/gdal_vrt_fuzzer_seed_corpus.zip gdal_vrt_rawlink.tar >/dev/null rm gdal_vrt_rawlink.tar @@ -251,7 +251,7 @@ echo "Building aig_fuzzer_seed_corpus.zip" printf "FUZZER_FRIENDLY_ARCHIVE\\n" > aig.tar for x in hdr.adf sta.adf dblbnd.adf vat.adf w001001.adf abc3x1.clr prj.adf w001001x.adf; do printf "***NEWFILE***:%s\\n" "$x" >> aig.tar - cat $(dirname $0)/../../autotest/gdrivers/data/aigrid/abc3x1/$x >> aig.tar + cat $(dirname $0)/../autotest/gdrivers/data/aigrid/abc3x1/$x >> aig.tar done rm -f $OUT/aig_fuzzer_seed_corpus.zip zip -r $OUT/aig_fuzzer_seed_corpus.zip aig.tar >/dev/null @@ -259,17 +259,17 @@ rm aig.tar echo "Building get_jpeg2000_structure_fuzzer_seed_corpus.zip" rm -f $OUT/get_jpeg2000_structure_fuzzer_seed_corpus.zip -cd $(dirname $0)/../../autotest/gdrivers/data/jpeg2000 +cd $(dirname $0)/../autotest/gdrivers/data/jpeg2000 zip -r $OUT/get_jpeg2000_structure_fuzzer_seed_corpus.zip ./*.jp2 ./*.j2k >/dev/null cd $OLDPWD echo "Building gdal_fuzzer_seed_corpus.zip" -cd $(dirname $0)/../../autotest/gcore/data +cd $(dirname $0)/../autotest/gcore/data rm -f $OUT/gdal_fuzzer_seed_corpus.zip find . -type f -exec zip -j $OUT/gdal_fuzzer_seed_corpus.zip {} \; >/dev/null cd $OLDPWD -cd $(dirname $0)/../../autotest/gdrivers/data +cd $(dirname $0)/../autotest/gdrivers/data find . -type f -exec zip -j $OUT/gdal_fuzzer_seed_corpus.zip {} \; >/dev/null cd $OLDPWD @@ -279,7 +279,7 @@ cp $OUT/gdal_fuzzer_seed_corpus.zip $OUT/gdal_filesystem_fuzzer_seed_corpus.zip echo "Building gdal_sdts_fuzzer_seed_corpus.zip" rm -f $OUT/gdal_sdts_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/gdrivers/data/STDS_1107834_truncated +cd $(dirname $0)/../autotest/gdrivers/data/STDS_1107834_truncated printf "FUZZER_FRIENDLY_ARCHIVE\\n" > $CUR_DIR/gdal_sdts.tar for file in *.DDF; do printf "***NEWFILE***:%s\\n" "$file" >> $CUR_DIR/gdal_sdts.tar @@ -293,7 +293,7 @@ rm gdal_sdts.tar echo "Building ers_fuzzer_seed_corpus.zip" rm -f $OUT/ers_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/gdrivers/data/ers +cd $(dirname $0)/../autotest/gdrivers/data/ers { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:%s\\n" "test.ers" @@ -317,7 +317,7 @@ rm srtm.tar ers_dem.tar echo "Building zarr_fuzzer_seed_corups.zip" rm -f $OUT/zarr_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/gdrivers/data/zarr +cd $(dirname $0)/../autotest/gdrivers/data/zarr for dirname in *.zarr v3/*.zr3; do cd $dirname { @@ -337,7 +337,7 @@ rm ./*.zarr.tar ./*.zr3.tar echo "Building dimap_fuzzer_seed_corups.zip" rm -f $OUT/dimap_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/gdrivers/data/dimap2 +cd $(dirname $0)/../autotest/gdrivers/data/dimap2 for dirname in *; do cd $dirname { @@ -357,7 +357,7 @@ rm dimap_*.tar echo "Building ogr_sdts_fuzzer_seed_corpus.zip" rm -f $OUT/ogr_sdts_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/ogr/data/sdts/D3607551_rd0s_1_sdts_truncated +cd $(dirname $0)/../autotest/ogr/data/sdts/D3607551_rd0s_1_sdts_truncated printf "FUZZER_FRIENDLY_ARCHIVE\\n" > $CUR_DIR/ogr_sdts.tar for file in *.DDF; do printf "***NEWFILE***:%s\\n" "$file" >> $CUR_DIR/ogr_sdts.tar @@ -369,19 +369,19 @@ rm ogr_sdts.tar echo "Building ogr_fuzzer_seed_corpus.zip" CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/ogr/data +cd $(dirname $0)/../autotest/ogr/data rm -f $OUT/ogr_fuzzer_seed_corpus.zip find . -type f -exec zip -j $OUT/ogr_fuzzer_seed_corpus.zip {} \; >/dev/null cd $CUR_DIR echo "Building cad_fuzzer_seed_corpus.zip" -cd $(dirname $0)/../../autotest/ogr/data/cad +cd $(dirname $0)/../autotest/ogr/data/cad rm -f $OUT/cad_fuzzer_seed_corpus.zip zip -r $OUT/cad_fuzzer_seed_corpus.zip . >/dev/null cd $OLDPWD echo "Building csv_fuzzer_seed_corpus.zip" -cd $(dirname $0)/../../autotest/ogr/data/csv +cd $(dirname $0)/../autotest/ogr/data/csv rm -f $OUT/csv_fuzzer_seed_corpus.zip zip -r $OUT/csv_fuzzer_seed_corpus.zip ./*.csv >/dev/null cd $OLDPWD @@ -389,7 +389,7 @@ cd $OLDPWD echo "Building xlsx_fuzzer_seed_corpus.zip" rm -f $OUT/xlsx_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/ogr/data/xlsx +cd $(dirname $0)/../autotest/ogr/data/xlsx for filename in *.xlsx; do mkdir tmpxlsx (cd tmpxlsx @@ -409,7 +409,7 @@ rm xlsx_*.tar echo "Building ods_fuzzer_seed_corpus.zip" rm -f $OUT/ods_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/ogr/data/ods +cd $(dirname $0)/../autotest/ogr/data/ods for filename in *.ods; do mkdir tmpods unzip -d tmpods $filename >/dev/null @@ -426,7 +426,7 @@ rm ods_*.tar echo "Building rec_fuzzer_seed_corpus.zip" -cd $(dirname $0)/../../autotest/ogr/data/rec +cd $(dirname $0)/../autotest/ogr/data/rec rm -f $OUT/rec_fuzzer_seed_corpus.zip zip -r $OUT/rec_fuzzer_seed_corpus.zip ./*.rec >/dev/null cd $OLDPWD @@ -435,13 +435,13 @@ echo "Building shape_fuzzer_seed_corpus.zip" { printf "FUZZER_FRIENDLY_ARCHIVE\\n" > poly_shp.tar printf "***NEWFILE***:my.shp\\n" >> poly_shp.tar - cat $(dirname $0)/../../autotest/ogr/data/poly.shp + cat $(dirname $0)/../autotest/ogr/data/poly.shp printf "***NEWFILE***:my.shx\\n" - cat $(dirname $0)/../../autotest/ogr/data/poly.shx + cat $(dirname $0)/../autotest/ogr/data/poly.shx printf "***NEWFILE***:my.dbf\\n" - cat $(dirname $0)/../../autotest/ogr/data/poly.dbf + cat $(dirname $0)/../autotest/ogr/data/poly.dbf printf "***NEWFILE***:my.prj\\n" - cat $(dirname $0)/../../autotest/ogr/data/poly.PRJ + cat $(dirname $0)/../autotest/ogr/data/poly.PRJ } > poly_shp.tar rm -f $OUT/shape_fuzzer_seed_corpus.zip zip -r $OUT/shape_fuzzer_seed_corpus.zip poly_shp.tar >/dev/null @@ -452,25 +452,25 @@ echo "Building mitab_tab_fuzzer_seed_corpus.zip" printf "FUZZER_FRIENDLY_ARCHIVE\\n" > all_geoms_tab.tar for ext in tab map dat id; do printf "***NEWFILE***:my.%s\\n" "$ext" >> all_geoms_tab.tar - cat $(dirname $0)/../../autotest/ogr/data/mitab/all_geoms.$ext >> all_geoms_tab.tar + cat $(dirname $0)/../autotest/ogr/data/mitab/all_geoms.$ext >> all_geoms_tab.tar done printf "FUZZER_FRIENDLY_ARCHIVE\\n" > poly_indexed.tar for ext in tab map dat id; do printf "***NEWFILE***:my.%s\\n" "$ext" >> poly_indexed.tar - cat $(dirname $0)/../../autotest/ogr/data/mitab/poly_indexed.$ext >> poly_indexed.tar + cat $(dirname $0)/../autotest/ogr/data/mitab/poly_indexed.$ext >> poly_indexed.tar done printf "FUZZER_FRIENDLY_ARCHIVE\\n" > view.tar printf "***NEWFILE***:my.tab\\n" >> view.tar -cat $(dirname $0)/../../autotest/ogr/data/mitab/view_first_table_second_table.tab >> view.tar +cat $(dirname $0)/../autotest/ogr/data/mitab/view_first_table_second_table.tab >> view.tar for ext in tab map dat id ind; do printf "***NEWFILE***:first_table.%s\\n" "$ext" >> view.tar - cat $(dirname $0)/../../autotest/ogr/data/mitab/first_table.$ext >> view.tar + cat $(dirname $0)/../autotest/ogr/data/mitab/first_table.$ext >> view.tar done for ext in tab map dat id ind; do printf "***NEWFILE***:second_table.%s\\n" "$ext" >> view.tar - cat $(dirname $0)/../../autotest/ogr/data/mitab/second_table.$ext >> view.tar + cat $(dirname $0)/../autotest/ogr/data/mitab/second_table.$ext >> view.tar done rm -f $OUT/mitab_tab_fuzzer_seed_corpus.zip @@ -481,9 +481,9 @@ echo "Building mitab_mif_fuzzer_seed_corpus.zip" { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:my.mif\\n" - cat $(dirname $0)/../../autotest/ogr/data/mitab/small.mif + cat $(dirname $0)/../autotest/ogr/data/mitab/small.mif printf "***NEWFILE***:my.mid\\n" >> small_mif.tar - cat $(dirname $0)/../../autotest/ogr/data/mitab/small.mid + cat $(dirname $0)/../autotest/ogr/data/mitab/small.mid } > small_mif.tar rm -f $OUT/mitab_mif_fuzzer_seed_corpus.zip zip -r $OUT/mitab_mif_fuzzer_seed_corpus.zip small_mif.tar >/dev/null @@ -491,7 +491,7 @@ rm small_mif.tar echo "Building openfilegdb_fuzzer_seed_corpus.zip" rm -rf testopenfilegdb.gdb -unzip $(dirname $0)/../../autotest/ogr/data/filegdb/testopenfilegdb.gdb.zip >/dev/null +unzip $(dirname $0)/../autotest/ogr/data/filegdb/testopenfilegdb.gdb.zip >/dev/null printf "FUZZER_FRIENDLY_ARCHIVE\\n" > testopenfilegdb.gdb.tar for f in testopenfilegdb.gdb/*; do printf "***NEWFILE***:%s\\n" "$f" >> testopenfilegdb.gdb.tar @@ -499,7 +499,7 @@ for f in testopenfilegdb.gdb/*; do done rm -rf testopenfilegdb92.gdb -unzip $(dirname $0)/../../autotest/ogr/data/filegdb/testopenfilegdb92.gdb.zip >/dev/null +unzip $(dirname $0)/../autotest/ogr/data/filegdb/testopenfilegdb92.gdb.zip >/dev/null printf "FUZZER_FRIENDLY_ARCHIVE\\n" > testopenfilegdb92.gdb.tar for f in testopenfilegdb92.gdb/*; do printf "***NEWFILE***:%s\\n" "$f" >> testopenfilegdb92.gdb.tar @@ -516,7 +516,7 @@ rm testopenfilegdb92.gdb.tar echo "Building avcbin_fuzzer_seed_corpus.zip" rm -f $OUT/avcbin_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/ogr/data/avc/testavc +cd $(dirname $0)/../autotest/ogr/data/avc/testavc printf "FUZZER_FRIENDLY_ARCHIVE\\n" > $CUR_DIR/avcbin.tar find . -type f | while read -r f ; do printf "***NEWFILE***:%s\\n" "$f" >> $CUR_DIR/avcbin.tar @@ -527,7 +527,7 @@ zip -r $OUT/avcbin_fuzzer_seed_corpus.zip avcbin.tar >/dev/null rm avcbin.tar echo "Building avce00_fuzzer_seed_corpus.zip" -cd $(dirname $0)/../../autotest/ogr/data/avc +cd $(dirname $0)/../autotest/ogr/data/avc rm -f $OUT/avce00_fuzzer_seed_corpus.zip zip -r $OUT/avce00_fuzzer_seed_corpus.zip ./*.e00 >/dev/null cd $OLDPWD @@ -537,23 +537,23 @@ rm -f $OUT/gml_fuzzer_seed_corpus.zip { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:test.gml\\n" - cat $(dirname $0)/../../autotest/ogr/data/gml/archsites.gml + cat $(dirname $0)/../autotest/ogr/data/gml/archsites.gml printf "***NEWFILE***:test.xsd\\n" - cat $(dirname $0)/../../autotest/ogr/data/gml/archsites.xsd + cat $(dirname $0)/../autotest/ogr/data/gml/archsites.xsd } > $CUR_DIR/archsites_gml.tar { printf "FUZZER_FRIENDLY_ARCHIVE\\n" printf "***NEWFILE***:test.gml\\n" - sed "s/expected_gml_gml32/test/" < $(dirname $0)/../../autotest/ogr/data/gml/expected_gml_gml32.gml + sed "s/expected_gml_gml32/test/" < $(dirname $0)/../autotest/ogr/data/gml/expected_gml_gml32.gml printf "***NEWFILE***:test.xsd\\n" - cat $(dirname $0)/../../autotest/ogr/data/gml/expected_gml_gml32.xsd + cat $(dirname $0)/../autotest/ogr/data/gml/expected_gml_gml32.xsd } > $CUR_DIR/expected_gml_gml32.tar zip -r $OUT/gml_fuzzer_seed_corpus.zip archsites_gml.tar expected_gml_gml32.tar >/dev/null echo "Building gmlas_fuzzer_seed_corpus.zip" rm -f $OUT/gmlas_fuzzer_seed_corpus.zip CUR_DIR=$PWD -cd $(dirname $0)/../../autotest/ogr/data/gmlas +cd $(dirname $0)/../autotest/ogr/data/gmlas for filename in *.xml *.gml; do BASENAME=$(echo $filename | cut -d. -f1) TARNAME="$CUR_DIR/gmlas_${BASENAME}.tar" @@ -572,13 +572,13 @@ rm archsites_gml.tar expected_gml_gml32.tar gmlas_*.tar echo "Building fgb_fuzzer_seed_corpus.zip" -cd $(dirname $0)/../../autotest/ogr/data/testfgb +cd $(dirname $0)/../autotest/ogr/data/testfgb rm -f $OUT/fgb_fuzzer_seed_corpus.zip zip -r $OUT/fgb_fuzzer_seed_corpus.zip ./*.fgb >/dev/null cd $OLDPWD echo "Building lvbag_fuzzer_seed_corpus.zip" -cd $(dirname $0)/../../autotest/ogr/data/lvbag +cd $(dirname $0)/../autotest/ogr/data/lvbag rm -f $OUT/lvbag_fuzzer_seed_corpus.zip zip -r $OUT/lvbag_fuzzer_seed_corpus.zip ./*.xml >/dev/null cd $OLDPWD diff --git a/gdal/fuzzers/fix_stack_read_overflow_ncindexlookup.patch b/fuzzers/fix_stack_read_overflow_ncindexlookup.patch similarity index 100% rename from gdal/fuzzers/fix_stack_read_overflow_ncindexlookup.patch rename to fuzzers/fix_stack_read_overflow_ncindexlookup.patch diff --git a/gdal/fuzzers/fuzzingengine.cpp b/fuzzers/fuzzingengine.cpp similarity index 100% rename from gdal/fuzzers/fuzzingengine.cpp rename to fuzzers/fuzzingengine.cpp diff --git a/gdal/fuzzers/gdal_fuzzer.cpp b/fuzzers/gdal_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/gdal_fuzzer.cpp rename to fuzzers/gdal_fuzzer.cpp diff --git a/gdal/fuzzers/gdal_translate_fuzzer.cpp b/fuzzers/gdal_translate_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/gdal_translate_fuzzer.cpp rename to fuzzers/gdal_translate_fuzzer.cpp diff --git a/gdal/fuzzers/gdal_vector_translate_fuzzer.cpp b/fuzzers/gdal_vector_translate_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/gdal_vector_translate_fuzzer.cpp rename to fuzzers/gdal_vector_translate_fuzzer.cpp diff --git a/gdal/fuzzers/get_jpeg2000_structure_fuzzer.cpp b/fuzzers/get_jpeg2000_structure_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/get_jpeg2000_structure_fuzzer.cpp rename to fuzzers/get_jpeg2000_structure_fuzzer.cpp diff --git a/gdal/fuzzers/gml_geom_import_fuzzer.cpp b/fuzzers/gml_geom_import_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/gml_geom_import_fuzzer.cpp rename to fuzzers/gml_geom_import_fuzzer.cpp diff --git a/gdal/fuzzers/libnetcdf_fix_undefined_left_shift_in_ncx_get_size_t.patch b/fuzzers/libnetcdf_fix_undefined_left_shift_in_ncx_get_size_t.patch similarity index 100% rename from gdal/fuzzers/libnetcdf_fix_undefined_left_shift_in_ncx_get_size_t.patch rename to fuzzers/libnetcdf_fix_undefined_left_shift_in_ncx_get_size_t.patch diff --git a/gdal/fuzzers/ogr_fuzzer.cpp b/fuzzers/ogr_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/ogr_fuzzer.cpp rename to fuzzers/ogr_fuzzer.cpp diff --git a/gdal/fuzzers/osr_set_from_user_input_fuzzer.cpp b/fuzzers/osr_set_from_user_input_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/osr_set_from_user_input_fuzzer.cpp rename to fuzzers/osr_set_from_user_input_fuzzer.cpp diff --git a/gdal/fuzzers/spatialite_geom_import_fuzzer.cpp b/fuzzers/spatialite_geom_import_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/spatialite_geom_import_fuzzer.cpp rename to fuzzers/spatialite_geom_import_fuzzer.cpp diff --git a/gdal/fuzzers/tests/CMakeLists.txt b/fuzzers/tests/CMakeLists.txt similarity index 100% rename from gdal/fuzzers/tests/CMakeLists.txt rename to fuzzers/tests/CMakeLists.txt diff --git a/gdal/fuzzers/tests/GNUmakefile b/fuzzers/tests/GNUmakefile similarity index 100% rename from gdal/fuzzers/tests/GNUmakefile rename to fuzzers/tests/GNUmakefile diff --git a/gdal/fuzzers/tests/test_gdal_fuzzer.cpp b/fuzzers/tests/test_gdal_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/tests/test_gdal_fuzzer.cpp rename to fuzzers/tests/test_gdal_fuzzer.cpp diff --git a/gdal/fuzzers/tests/test_ogr_fuzzer.cpp b/fuzzers/tests/test_ogr_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/tests/test_ogr_fuzzer.cpp rename to fuzzers/tests/test_ogr_fuzzer.cpp diff --git a/gdal/fuzzers/tests/test_osr_set_from_user_input_fuzzer.cpp b/fuzzers/tests/test_osr_set_from_user_input_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/tests/test_osr_set_from_user_input_fuzzer.cpp rename to fuzzers/tests/test_osr_set_from_user_input_fuzzer.cpp diff --git a/gdal/fuzzers/tests/test_wkb_import_fuzzer.cpp b/fuzzers/tests/test_wkb_import_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/tests/test_wkb_import_fuzzer.cpp rename to fuzzers/tests/test_wkb_import_fuzzer.cpp diff --git a/gdal/fuzzers/tests/test_wkt_import_fuzzer.cpp b/fuzzers/tests/test_wkt_import_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/tests/test_wkt_import_fuzzer.cpp rename to fuzzers/tests/test_wkt_import_fuzzer.cpp diff --git a/gdal/fuzzers/wkb_import_fuzzer.cpp b/fuzzers/wkb_import_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/wkb_import_fuzzer.cpp rename to fuzzers/wkb_import_fuzzer.cpp diff --git a/gdal/fuzzers/wkt_import_fuzzer.cpp b/fuzzers/wkt_import_fuzzer.cpp similarity index 100% rename from gdal/fuzzers/wkt_import_fuzzer.cpp rename to fuzzers/wkt_import_fuzzer.cpp diff --git a/gdal/gcore/CMakeLists.txt b/gcore/CMakeLists.txt similarity index 100% rename from gdal/gcore/CMakeLists.txt rename to gcore/CMakeLists.txt diff --git a/gdal/gcore/GNUmakefile b/gcore/GNUmakefile similarity index 100% rename from gdal/gcore/GNUmakefile rename to gcore/GNUmakefile diff --git a/gdal/gcore/Version.rc b/gcore/Version.rc similarity index 100% rename from gdal/gcore/Version.rc rename to gcore/Version.rc diff --git a/gdal/gcore/gdal.h b/gcore/gdal.h similarity index 100% rename from gdal/gcore/gdal.h rename to gcore/gdal.h diff --git a/gdal/gcore/gdal_avx2_emulation.hpp b/gcore/gdal_avx2_emulation.hpp similarity index 100% rename from gdal/gcore/gdal_avx2_emulation.hpp rename to gcore/gdal_avx2_emulation.hpp diff --git a/gdal/gcore/gdal_frmts.h b/gcore/gdal_frmts.h similarity index 100% rename from gdal/gcore/gdal_frmts.h rename to gcore/gdal_frmts.h diff --git a/gdal/gcore/gdal_mdreader.cpp b/gcore/gdal_mdreader.cpp similarity index 100% rename from gdal/gcore/gdal_mdreader.cpp rename to gcore/gdal_mdreader.cpp diff --git a/gdal/gcore/gdal_mdreader.h b/gcore/gdal_mdreader.h similarity index 100% rename from gdal/gcore/gdal_mdreader.h rename to gcore/gdal_mdreader.h diff --git a/gdal/gcore/gdal_misc.cpp b/gcore/gdal_misc.cpp similarity index 100% rename from gdal/gcore/gdal_misc.cpp rename to gcore/gdal_misc.cpp diff --git a/gdal/gcore/gdal_pam.h b/gcore/gdal_pam.h similarity index 100% rename from gdal/gcore/gdal_pam.h rename to gcore/gdal_pam.h diff --git a/gdal/gcore/gdal_priv.h b/gcore/gdal_priv.h similarity index 100% rename from gdal/gcore/gdal_priv.h rename to gcore/gdal_priv.h diff --git a/gdal/gcore/gdal_priv_templates.hpp b/gcore/gdal_priv_templates.hpp similarity index 100% rename from gdal/gcore/gdal_priv_templates.hpp rename to gcore/gdal_priv_templates.hpp diff --git a/gdal/gcore/gdal_proxy.h b/gcore/gdal_proxy.h similarity index 100% rename from gdal/gcore/gdal_proxy.h rename to gcore/gdal_proxy.h diff --git a/gdal/gcore/gdal_rat.cpp b/gcore/gdal_rat.cpp similarity index 100% rename from gdal/gcore/gdal_rat.cpp rename to gcore/gdal_rat.cpp diff --git a/gdal/gcore/gdal_rat.h b/gcore/gdal_rat.h similarity index 100% rename from gdal/gcore/gdal_rat.h rename to gcore/gdal_rat.h diff --git a/gdal/gcore/gdal_thread_pool.cpp b/gcore/gdal_thread_pool.cpp similarity index 100% rename from gdal/gcore/gdal_thread_pool.cpp rename to gcore/gdal_thread_pool.cpp diff --git a/gdal/gcore/gdal_thread_pool.h b/gcore/gdal_thread_pool.h similarity index 100% rename from gdal/gcore/gdal_thread_pool.h rename to gcore/gdal_thread_pool.h diff --git a/gdal/gcore/gdal_version.h.in b/gcore/gdal_version.h.in similarity index 100% rename from gdal/gcore/gdal_version.h.in rename to gcore/gdal_version.h.in diff --git a/gdal/gcore/gdalabstractbandblockcache.cpp b/gcore/gdalabstractbandblockcache.cpp similarity index 100% rename from gdal/gcore/gdalabstractbandblockcache.cpp rename to gcore/gdalabstractbandblockcache.cpp diff --git a/gdal/gcore/gdalallvalidmaskband.cpp b/gcore/gdalallvalidmaskband.cpp similarity index 100% rename from gdal/gcore/gdalallvalidmaskband.cpp rename to gcore/gdalallvalidmaskband.cpp diff --git a/gdal/gcore/gdalarraybandblockcache.cpp b/gcore/gdalarraybandblockcache.cpp similarity index 100% rename from gdal/gcore/gdalarraybandblockcache.cpp rename to gcore/gdalarraybandblockcache.cpp diff --git a/gdal/gcore/gdalcolortable.cpp b/gcore/gdalcolortable.cpp similarity index 100% rename from gdal/gcore/gdalcolortable.cpp rename to gcore/gdalcolortable.cpp diff --git a/gdal/gcore/gdaldataset.cpp b/gcore/gdaldataset.cpp similarity index 100% rename from gdal/gcore/gdaldataset.cpp rename to gcore/gdaldataset.cpp diff --git a/gdal/gcore/gdaldefaultasync.cpp b/gcore/gdaldefaultasync.cpp similarity index 100% rename from gdal/gcore/gdaldefaultasync.cpp rename to gcore/gdaldefaultasync.cpp diff --git a/gdal/gcore/gdaldefaultoverviews.cpp b/gcore/gdaldefaultoverviews.cpp similarity index 100% rename from gdal/gcore/gdaldefaultoverviews.cpp rename to gcore/gdaldefaultoverviews.cpp diff --git a/gdal/gcore/gdaldllmain.cpp b/gcore/gdaldllmain.cpp similarity index 100% rename from gdal/gcore/gdaldllmain.cpp rename to gcore/gdaldllmain.cpp diff --git a/gdal/gcore/gdaldriver.cpp b/gcore/gdaldriver.cpp similarity index 100% rename from gdal/gcore/gdaldriver.cpp rename to gcore/gdaldriver.cpp diff --git a/gdal/gcore/gdaldrivermanager.cpp b/gcore/gdaldrivermanager.cpp similarity index 100% rename from gdal/gcore/gdaldrivermanager.cpp rename to gcore/gdaldrivermanager.cpp diff --git a/gdal/gcore/gdalexif.cpp b/gcore/gdalexif.cpp similarity index 100% rename from gdal/gcore/gdalexif.cpp rename to gcore/gdalexif.cpp diff --git a/gdal/gcore/gdalexif.h b/gcore/gdalexif.h similarity index 100% rename from gdal/gcore/gdalexif.h rename to gcore/gdalexif.h diff --git a/gdal/gcore/gdalgeorefpamdataset.cpp b/gcore/gdalgeorefpamdataset.cpp similarity index 100% rename from gdal/gcore/gdalgeorefpamdataset.cpp rename to gcore/gdalgeorefpamdataset.cpp diff --git a/gdal/gcore/gdalgeorefpamdataset.h b/gcore/gdalgeorefpamdataset.h similarity index 100% rename from gdal/gcore/gdalgeorefpamdataset.h rename to gcore/gdalgeorefpamdataset.h diff --git a/gdal/gcore/gdalhashsetbandblockcache.cpp b/gcore/gdalhashsetbandblockcache.cpp similarity index 100% rename from gdal/gcore/gdalhashsetbandblockcache.cpp rename to gcore/gdalhashsetbandblockcache.cpp diff --git a/gdal/gcore/gdaljp2abstractdataset.cpp b/gcore/gdaljp2abstractdataset.cpp similarity index 100% rename from gdal/gcore/gdaljp2abstractdataset.cpp rename to gcore/gdaljp2abstractdataset.cpp diff --git a/gdal/gcore/gdaljp2abstractdataset.h b/gcore/gdaljp2abstractdataset.h similarity index 100% rename from gdal/gcore/gdaljp2abstractdataset.h rename to gcore/gdaljp2abstractdataset.h diff --git a/gdal/gcore/gdaljp2box.cpp b/gcore/gdaljp2box.cpp similarity index 100% rename from gdal/gcore/gdaljp2box.cpp rename to gcore/gdaljp2box.cpp diff --git a/gdal/gcore/gdaljp2metadata.cpp b/gcore/gdaljp2metadata.cpp similarity index 100% rename from gdal/gcore/gdaljp2metadata.cpp rename to gcore/gdaljp2metadata.cpp diff --git a/gdal/gcore/gdaljp2metadata.h b/gcore/gdaljp2metadata.h similarity index 100% rename from gdal/gcore/gdaljp2metadata.h rename to gcore/gdaljp2metadata.h diff --git a/gdal/gcore/gdaljp2metadatagenerator.cpp b/gcore/gdaljp2metadatagenerator.cpp similarity index 100% rename from gdal/gcore/gdaljp2metadatagenerator.cpp rename to gcore/gdaljp2metadatagenerator.cpp diff --git a/gdal/gcore/gdaljp2metadatagenerator.h b/gcore/gdaljp2metadatagenerator.h similarity index 100% rename from gdal/gcore/gdaljp2metadatagenerator.h rename to gcore/gdaljp2metadatagenerator.h diff --git a/gdal/gcore/gdaljp2structure.cpp b/gcore/gdaljp2structure.cpp similarity index 100% rename from gdal/gcore/gdaljp2structure.cpp rename to gcore/gdaljp2structure.cpp diff --git a/gdal/gcore/gdalmajorobject.cpp b/gcore/gdalmajorobject.cpp similarity index 100% rename from gdal/gcore/gdalmajorobject.cpp rename to gcore/gdalmajorobject.cpp diff --git a/gdal/gcore/gdalmultidim.cpp b/gcore/gdalmultidim.cpp similarity index 100% rename from gdal/gcore/gdalmultidim.cpp rename to gcore/gdalmultidim.cpp diff --git a/gdal/gcore/gdalmultidomainmetadata.cpp b/gcore/gdalmultidomainmetadata.cpp similarity index 100% rename from gdal/gcore/gdalmultidomainmetadata.cpp rename to gcore/gdalmultidomainmetadata.cpp diff --git a/gdal/gcore/gdalnodatamaskband.cpp b/gcore/gdalnodatamaskband.cpp similarity index 100% rename from gdal/gcore/gdalnodatamaskband.cpp rename to gcore/gdalnodatamaskband.cpp diff --git a/gdal/gcore/gdalnodatavaluesmaskband.cpp b/gcore/gdalnodatavaluesmaskband.cpp similarity index 100% rename from gdal/gcore/gdalnodatavaluesmaskband.cpp rename to gcore/gdalnodatavaluesmaskband.cpp diff --git a/gdal/gcore/gdalopeninfo.cpp b/gcore/gdalopeninfo.cpp similarity index 100% rename from gdal/gcore/gdalopeninfo.cpp rename to gcore/gdalopeninfo.cpp diff --git a/gdal/gcore/gdaloverviewdataset.cpp b/gcore/gdaloverviewdataset.cpp similarity index 100% rename from gdal/gcore/gdaloverviewdataset.cpp rename to gcore/gdaloverviewdataset.cpp diff --git a/gdal/gcore/gdalpamdataset.cpp b/gcore/gdalpamdataset.cpp similarity index 100% rename from gdal/gcore/gdalpamdataset.cpp rename to gcore/gdalpamdataset.cpp diff --git a/gdal/gcore/gdalpamproxydb.cpp b/gcore/gdalpamproxydb.cpp similarity index 100% rename from gdal/gcore/gdalpamproxydb.cpp rename to gcore/gdalpamproxydb.cpp diff --git a/gdal/gcore/gdalpamrasterband.cpp b/gcore/gdalpamrasterband.cpp similarity index 100% rename from gdal/gcore/gdalpamrasterband.cpp rename to gcore/gdalpamrasterband.cpp diff --git a/gdal/gcore/gdalproxydataset.cpp b/gcore/gdalproxydataset.cpp similarity index 100% rename from gdal/gcore/gdalproxydataset.cpp rename to gcore/gdalproxydataset.cpp diff --git a/gdal/gcore/gdalproxypool.cpp b/gcore/gdalproxypool.cpp similarity index 100% rename from gdal/gcore/gdalproxypool.cpp rename to gcore/gdalproxypool.cpp diff --git a/gdal/gcore/gdalpython.cpp b/gcore/gdalpython.cpp similarity index 100% rename from gdal/gcore/gdalpython.cpp rename to gcore/gdalpython.cpp diff --git a/gdal/gcore/gdalpython.h b/gcore/gdalpython.h similarity index 100% rename from gdal/gcore/gdalpython.h rename to gcore/gdalpython.h diff --git a/gdal/gcore/gdalpythondriverloader.cpp b/gcore/gdalpythondriverloader.cpp similarity index 100% rename from gdal/gcore/gdalpythondriverloader.cpp rename to gcore/gdalpythondriverloader.cpp diff --git a/gdal/gcore/gdalrasterband.cpp b/gcore/gdalrasterband.cpp similarity index 100% rename from gdal/gcore/gdalrasterband.cpp rename to gcore/gdalrasterband.cpp diff --git a/gdal/gcore/gdalrasterblock.cpp b/gcore/gdalrasterblock.cpp similarity index 100% rename from gdal/gcore/gdalrasterblock.cpp rename to gcore/gdalrasterblock.cpp diff --git a/gdal/gcore/gdalrescaledalphaband.cpp b/gcore/gdalrescaledalphaband.cpp similarity index 100% rename from gdal/gcore/gdalrescaledalphaband.cpp rename to gcore/gdalrescaledalphaband.cpp diff --git a/gdal/gcore/gdalsse_priv.h b/gcore/gdalsse_priv.h similarity index 100% rename from gdal/gcore/gdalsse_priv.h rename to gcore/gdalsse_priv.h diff --git a/gdal/gcore/gdalvirtualmem.cpp b/gcore/gdalvirtualmem.cpp similarity index 100% rename from gdal/gcore/gdalvirtualmem.cpp rename to gcore/gdalvirtualmem.cpp diff --git a/gdal/gcore/generate_gdal_version_h.sh b/gcore/generate_gdal_version_h.sh similarity index 100% rename from gdal/gcore/generate_gdal_version_h.sh rename to gcore/generate_gdal_version_h.sh diff --git a/gdal/gcore/makefile.vc b/gcore/makefile.vc similarity index 100% rename from gdal/gcore/makefile.vc rename to gcore/makefile.vc diff --git a/gdal/gcore/mdreader/CMakeLists.txt b/gcore/mdreader/CMakeLists.txt similarity index 100% rename from gdal/gcore/mdreader/CMakeLists.txt rename to gcore/mdreader/CMakeLists.txt diff --git a/gdal/gcore/mdreader/GNUmakefile b/gcore/mdreader/GNUmakefile similarity index 100% rename from gdal/gcore/mdreader/GNUmakefile rename to gcore/mdreader/GNUmakefile diff --git a/gdal/gcore/mdreader/makefile.vc b/gcore/mdreader/makefile.vc similarity index 100% rename from gdal/gcore/mdreader/makefile.vc rename to gcore/mdreader/makefile.vc diff --git a/gdal/gcore/mdreader/reader_alos.cpp b/gcore/mdreader/reader_alos.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_alos.cpp rename to gcore/mdreader/reader_alos.cpp diff --git a/gdal/gcore/mdreader/reader_alos.h b/gcore/mdreader/reader_alos.h similarity index 100% rename from gdal/gcore/mdreader/reader_alos.h rename to gcore/mdreader/reader_alos.h diff --git a/gdal/gcore/mdreader/reader_digital_globe.cpp b/gcore/mdreader/reader_digital_globe.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_digital_globe.cpp rename to gcore/mdreader/reader_digital_globe.cpp diff --git a/gdal/gcore/mdreader/reader_digital_globe.h b/gcore/mdreader/reader_digital_globe.h similarity index 100% rename from gdal/gcore/mdreader/reader_digital_globe.h rename to gcore/mdreader/reader_digital_globe.h diff --git a/gdal/gcore/mdreader/reader_eros.cpp b/gcore/mdreader/reader_eros.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_eros.cpp rename to gcore/mdreader/reader_eros.cpp diff --git a/gdal/gcore/mdreader/reader_eros.h b/gcore/mdreader/reader_eros.h similarity index 100% rename from gdal/gcore/mdreader/reader_eros.h rename to gcore/mdreader/reader_eros.h diff --git a/gdal/gcore/mdreader/reader_geo_eye.cpp b/gcore/mdreader/reader_geo_eye.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_geo_eye.cpp rename to gcore/mdreader/reader_geo_eye.cpp diff --git a/gdal/gcore/mdreader/reader_geo_eye.h b/gcore/mdreader/reader_geo_eye.h similarity index 100% rename from gdal/gcore/mdreader/reader_geo_eye.h rename to gcore/mdreader/reader_geo_eye.h diff --git a/gdal/gcore/mdreader/reader_kompsat.cpp b/gcore/mdreader/reader_kompsat.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_kompsat.cpp rename to gcore/mdreader/reader_kompsat.cpp diff --git a/gdal/gcore/mdreader/reader_kompsat.h b/gcore/mdreader/reader_kompsat.h similarity index 100% rename from gdal/gcore/mdreader/reader_kompsat.h rename to gcore/mdreader/reader_kompsat.h diff --git a/gdal/gcore/mdreader/reader_landsat.cpp b/gcore/mdreader/reader_landsat.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_landsat.cpp rename to gcore/mdreader/reader_landsat.cpp diff --git a/gdal/gcore/mdreader/reader_landsat.h b/gcore/mdreader/reader_landsat.h similarity index 100% rename from gdal/gcore/mdreader/reader_landsat.h rename to gcore/mdreader/reader_landsat.h diff --git a/gdal/gcore/mdreader/reader_orb_view.cpp b/gcore/mdreader/reader_orb_view.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_orb_view.cpp rename to gcore/mdreader/reader_orb_view.cpp diff --git a/gdal/gcore/mdreader/reader_orb_view.h b/gcore/mdreader/reader_orb_view.h similarity index 100% rename from gdal/gcore/mdreader/reader_orb_view.h rename to gcore/mdreader/reader_orb_view.h diff --git a/gdal/gcore/mdreader/reader_pleiades.cpp b/gcore/mdreader/reader_pleiades.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_pleiades.cpp rename to gcore/mdreader/reader_pleiades.cpp diff --git a/gdal/gcore/mdreader/reader_pleiades.h b/gcore/mdreader/reader_pleiades.h similarity index 100% rename from gdal/gcore/mdreader/reader_pleiades.h rename to gcore/mdreader/reader_pleiades.h diff --git a/gdal/gcore/mdreader/reader_rapid_eye.cpp b/gcore/mdreader/reader_rapid_eye.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_rapid_eye.cpp rename to gcore/mdreader/reader_rapid_eye.cpp diff --git a/gdal/gcore/mdreader/reader_rapid_eye.h b/gcore/mdreader/reader_rapid_eye.h similarity index 100% rename from gdal/gcore/mdreader/reader_rapid_eye.h rename to gcore/mdreader/reader_rapid_eye.h diff --git a/gdal/gcore/mdreader/reader_rdk1.cpp b/gcore/mdreader/reader_rdk1.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_rdk1.cpp rename to gcore/mdreader/reader_rdk1.cpp diff --git a/gdal/gcore/mdreader/reader_rdk1.h b/gcore/mdreader/reader_rdk1.h similarity index 100% rename from gdal/gcore/mdreader/reader_rdk1.h rename to gcore/mdreader/reader_rdk1.h diff --git a/gdal/gcore/mdreader/reader_spot.cpp b/gcore/mdreader/reader_spot.cpp similarity index 100% rename from gdal/gcore/mdreader/reader_spot.cpp rename to gcore/mdreader/reader_spot.cpp diff --git a/gdal/gcore/mdreader/reader_spot.h b/gcore/mdreader/reader_spot.h similarity index 100% rename from gdal/gcore/mdreader/reader_spot.h rename to gcore/mdreader/reader_spot.h diff --git a/gdal/gcore/nasakeywordhandler.cpp b/gcore/nasakeywordhandler.cpp similarity index 100% rename from gdal/gcore/nasakeywordhandler.cpp rename to gcore/nasakeywordhandler.cpp diff --git a/gdal/gcore/nasakeywordhandler.h b/gcore/nasakeywordhandler.h similarity index 100% rename from gdal/gcore/nasakeywordhandler.h rename to gcore/nasakeywordhandler.h diff --git a/gdal/gcore/overview.cpp b/gcore/overview.cpp similarity index 100% rename from gdal/gcore/overview.cpp rename to gcore/overview.cpp diff --git a/gdal/gcore/rasterio.cpp b/gcore/rasterio.cpp similarity index 100% rename from gdal/gcore/rasterio.cpp rename to gcore/rasterio.cpp diff --git a/gdal/gcore/rasterio_ssse3.cpp b/gcore/rasterio_ssse3.cpp similarity index 100% rename from gdal/gcore/rasterio_ssse3.cpp rename to gcore/rasterio_ssse3.cpp diff --git a/gdal/gcore/rawdataset.cpp b/gcore/rawdataset.cpp similarity index 100% rename from gdal/gcore/rawdataset.cpp rename to gcore/rawdataset.cpp diff --git a/gdal/gcore/rawdataset.h b/gcore/rawdataset.h similarity index 100% rename from gdal/gcore/rawdataset.h rename to gcore/rawdataset.h diff --git a/gdal/gcore/statistics.txt b/gcore/statistics.txt similarity index 100% rename from gdal/gcore/statistics.txt rename to gcore/statistics.txt diff --git a/gdal/gcore/tilematrixset.cpp b/gcore/tilematrixset.cpp similarity index 100% rename from gdal/gcore/tilematrixset.cpp rename to gcore/tilematrixset.cpp diff --git a/gdal/gcore/tilematrixset.hpp b/gcore/tilematrixset.hpp similarity index 100% rename from gdal/gcore/tilematrixset.hpp rename to gcore/tilematrixset.hpp diff --git a/gdal/CMakeLists.txt b/gdal.cmake similarity index 98% rename from gdal/CMakeLists.txt rename to gdal.cmake index 5724b605376f..d35b764bfeca 100644 --- a/gdal/CMakeLists.txt +++ b/gdal.cmake @@ -153,8 +153,8 @@ endif () add_subdirectory(gcore) # Raster/Vector drivers (built-in and plugins) -set(GDAL_RASTER_FORMAT_SOURCE_DIR "${CMAKE_SOURCE_DIR}/gdal/frmts") -set(GDAL_VECTOR_FORMAT_SOURCE_DIR "${CMAKE_SOURCE_DIR}/gdal/ogr/ogrsf_frmts") +set(GDAL_RASTER_FORMAT_SOURCE_DIR "${CMAKE_SOURCE_DIR}/frmts") +set(GDAL_VECTOR_FORMAT_SOURCE_DIR "${CMAKE_SOURCE_DIR}/ogr/ogrsf_frmts") add_subdirectory(frmts) add_subdirectory(ogr/ogrsf_frmts) diff --git a/gdal/gdal.pc.in b/gdal.pc.in similarity index 100% rename from gdal/gdal.pc.in rename to gdal.pc.in diff --git a/gdal/.gitignore b/gdal/.gitignore deleted file mode 100644 index 2ef22a177e28..000000000000 --- a/gdal/.gitignore +++ /dev/null @@ -1,143 +0,0 @@ -GDALmake.opt -autom4te.cache -detectavx.dSYM -detectsse.dSYM -gdal.pc -config.log -config.status -configure -aclocal.m4 -libtool -cpl_config.h -clean_main_build_output.bat -*.o -*.res -*.obj -*.lib -*.exe -*.exe.manifest -*.dll -*.pdb -*.idb -*.ilk -*.dll.manifest -*.exp -*.lo -*.la -.libs -*.pyc -*.sdf -*.sln -*.vcxproj -*.vcxproj.filters -*.vcxproj.user -*.VC.db -*.VC.opendb -/[Dd]ebug -/[Rr]elease -/x64 -/.vs -/.vscode -/nbproject -frmts/jpipkak/kdu_cache.cpp -frmts/jpipkak/kdu_cache_wrapper.h -frmts/msg/PublicDecompWT/ -frmts/msg/PublicDecompWT_all.h -frmts/jpeg/libjpeg12/*.c -frmts/jpeg/libjpeg12/*.h -gcore/gdal_version.h -libgdal.a -libgdal.so -libgdal.so.* -apps/gdal-config -apps/gdal-config-inst -apps/gdal_contour -apps/gdal_grid -apps/gdal_rasterize -apps/gdal_translate -apps/gdal_viewshed -apps/gdaladdo -apps/gdalbuildvrt -apps/gdaldem -apps/gdalenhance -apps/gdalinfo -apps/gdalmdiminfo -apps/gdalmdimtranslate -apps/gdallocationinfo -apps/gdalmanage -apps/gdalsrsinfo -apps/gdaltindex -apps/gdaltransform -apps/gdalwarp -apps/gnmanalyse -apps/gnmmanage -apps/nearblack -apps/ogr2ogr -apps/ogrinfo -apps/ogrlineref -apps/ogrtindex -apps/testepsg -apps/gdalserver -apps/test_ogrsf -apps/dumpoverviews -apps/gdalwarpsimple -apps/multireadtest -apps/gdal_create -port/dllbuild.prev -port/prev_dllbuild.bat -swig/java/build -swig/java/gdal.jar -swig/java/gdal_wrap.cpp -swig/java/gdalconst_wrap.c -swig/java/libgdalconstjni.so -swig/java/libgdaljni.so -swig/java/libogrjni.so -swig/java/libosrjni.so -swig/java/ogr_wrap.cpp -swig/java/org/ -swig/java/osr_wrap.cpp -swig/java/gnm_wrap.cpp -swig/python/build -swig/python/setup_vars.ini -swig/python/record.txt -swig/perl/Const.bs -swig/perl/GDAL.bs -swig/perl/Makefile_Geo__GDAL -swig/perl/Makefile_Geo__GDAL__Const -swig/perl/Makefile_Geo__OGR -swig/perl/Makefile_Geo__OSR -swig/perl/OGR.bs -swig/perl/OSR.bs -swig/perl/blib/ -swig/perl/lib/Geo/GDAL/*.pm -swig/perl/lib/Geo/*.pm -swig/perl/gdal_wrap.cpp -swig/perl/gdalconst_wrap.c -swig/perl/ogr_wrap.cpp -swig/perl/osr_wrap.cpp -swig/perl/pm_to_blib -swig/perl/GNM.bs -swig/perl/MYMETA.json -swig/perl/MYMETA.yml -swig/perl/Makefile_Geo__GNM -swig/perl/gnm_wrap.cpp -swig/csharp/*.cpp -swig/csharp/*.c -swig/csharp/*.mdb -swig/csharp/*.config -swig/csharp/osr -swig/csharp/ogr -swig/csharp/gdal -swig/csharp/const -fuzzers/libFuzzingEngine.a -fuzzers/tests/test_gdal_fuzzer -fuzzers/tests/test_ogr_fuzzer -fuzzers/tests/test_osr_set_from_user_input_fuzzer -fuzzers/tests/test_wkb_import_fuzzer -fuzzers/tests/test_wkt_import_fuzzer -man/ -html/ -nmake.local* -*~ -*tmp -.python-version diff --git a/gdal/ci/travis/csa_part_1/install.sh b/gdal/ci/travis/csa_part_1/install.sh deleted file mode 100755 index 15d0d5c9b425..000000000000 --- a/gdal/ci/travis/csa_part_1/install.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -# shellcheck source=gdal/ci/travis/csa_common/install.sh -. $(dirname $0)/../csa_common/install.sh - -GDAL_TOPDIR=$PWD/gdal - -for dirname in gdal/port gdal/gcore gdal/frmts gdal/alg gdal/gnm ; do - (cd $dirname; scan-build -o $GDAL_TOPDIR/scanbuildoutput -sarif -v -enable-checker alpha.unix.cstring.OutOfBounds,alpha.unix.cstring.BufferOverlap,optin.cplusplus.VirtualCall,optin.cplusplus.UninitializedObject make -j4) -done - -(cd gdal/apps; scan-build -o $GDAL_TOPDIR/scanbuildoutput -sarif -v -enable-checker alpha.unix.cstring.OutOfBounds,alpha.unix.cstring.BufferOverlap,optin.cplusplus.VirtualCall,optin.cplusplus.UninitializedObject make -j4 appslib) diff --git a/gdal/ci/travis/csa_part_2/install.sh b/gdal/ci/travis/csa_part_2/install.sh deleted file mode 100755 index afff28334235..000000000000 --- a/gdal/ci/travis/csa_part_2/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -# shellcheck source=gdal/ci/travis/csa_common/install.sh -. $(dirname $0)/../csa_common/install.sh - -GDAL_TOPDIR=$PWD/gdal - -(cd gdal && - make generate_gdal_version_h - (cd ogr && scan-build -o $GDAL_TOPDIR/scanbuildoutput -sarif -v -enable-checker alpha.unix.cstring.OutOfBounds,alpha.unix.cstring.BufferOverlap,alpha.unix.cstring.BufferOverlap,optin.cplusplus.VirtualCall,optin.cplusplus.UninitializedObject make -j4) -) diff --git a/gdal/generate_vcxproj.bat b/generate_vcxproj.bat similarity index 100% rename from gdal/generate_vcxproj.bat rename to generate_vcxproj.bat diff --git a/gdal/gnm/CMakeLists.txt b/gnm/CMakeLists.txt similarity index 100% rename from gdal/gnm/CMakeLists.txt rename to gnm/CMakeLists.txt diff --git a/gdal/gnm/GNUmakefile b/gnm/GNUmakefile similarity index 100% rename from gdal/gnm/GNUmakefile rename to gnm/GNUmakefile diff --git a/gdal/gnm/gnm.h b/gnm/gnm.h similarity index 100% rename from gdal/gnm/gnm.h rename to gnm/gnm.h diff --git a/gdal/gnm/gnm_api.h b/gnm/gnm_api.h similarity index 100% rename from gdal/gnm/gnm_api.h rename to gnm/gnm_api.h diff --git a/gdal/gnm/gnm_frmts/CMakeLists.txt b/gnm/gnm_frmts/CMakeLists.txt similarity index 100% rename from gdal/gnm/gnm_frmts/CMakeLists.txt rename to gnm/gnm_frmts/CMakeLists.txt diff --git a/gdal/gnm/gnm_frmts/GNUmakefile b/gnm/gnm_frmts/GNUmakefile similarity index 100% rename from gdal/gnm/gnm_frmts/GNUmakefile rename to gnm/gnm_frmts/GNUmakefile diff --git a/gdal/gnm/gnm_frmts/db/CMakeLists.txt b/gnm/gnm_frmts/db/CMakeLists.txt similarity index 100% rename from gdal/gnm/gnm_frmts/db/CMakeLists.txt rename to gnm/gnm_frmts/db/CMakeLists.txt diff --git a/gdal/gnm/gnm_frmts/db/GNUmakefile b/gnm/gnm_frmts/db/GNUmakefile similarity index 100% rename from gdal/gnm/gnm_frmts/db/GNUmakefile rename to gnm/gnm_frmts/db/GNUmakefile diff --git a/gdal/gnm/gnm_frmts/db/gnmdb.h b/gnm/gnm_frmts/db/gnmdb.h similarity index 100% rename from gdal/gnm/gnm_frmts/db/gnmdb.h rename to gnm/gnm_frmts/db/gnmdb.h diff --git a/gdal/gnm/gnm_frmts/db/gnmdbdriver.cpp b/gnm/gnm_frmts/db/gnmdbdriver.cpp similarity index 100% rename from gdal/gnm/gnm_frmts/db/gnmdbdriver.cpp rename to gnm/gnm_frmts/db/gnmdbdriver.cpp diff --git a/gdal/gnm/gnm_frmts/db/gnmdbnetwork.cpp b/gnm/gnm_frmts/db/gnmdbnetwork.cpp similarity index 100% rename from gdal/gnm/gnm_frmts/db/gnmdbnetwork.cpp rename to gnm/gnm_frmts/db/gnmdbnetwork.cpp diff --git a/gdal/gnm/gnm_frmts/db/makefile.vc b/gnm/gnm_frmts/db/makefile.vc similarity index 100% rename from gdal/gnm/gnm_frmts/db/makefile.vc rename to gnm/gnm_frmts/db/makefile.vc diff --git a/gdal/gnm/gnm_frmts/file/CMakeLists.txt b/gnm/gnm_frmts/file/CMakeLists.txt similarity index 100% rename from gdal/gnm/gnm_frmts/file/CMakeLists.txt rename to gnm/gnm_frmts/file/CMakeLists.txt diff --git a/gdal/gnm/gnm_frmts/file/GNUmakefile b/gnm/gnm_frmts/file/GNUmakefile similarity index 100% rename from gdal/gnm/gnm_frmts/file/GNUmakefile rename to gnm/gnm_frmts/file/GNUmakefile diff --git a/gdal/gnm/gnm_frmts/file/gnmfile.h b/gnm/gnm_frmts/file/gnmfile.h similarity index 100% rename from gdal/gnm/gnm_frmts/file/gnmfile.h rename to gnm/gnm_frmts/file/gnmfile.h diff --git a/gdal/gnm/gnm_frmts/file/gnmfiledriver.cpp b/gnm/gnm_frmts/file/gnmfiledriver.cpp similarity index 100% rename from gdal/gnm/gnm_frmts/file/gnmfiledriver.cpp rename to gnm/gnm_frmts/file/gnmfiledriver.cpp diff --git a/gdal/gnm/gnm_frmts/file/gnmfilenetwork.cpp b/gnm/gnm_frmts/file/gnmfilenetwork.cpp similarity index 100% rename from gdal/gnm/gnm_frmts/file/gnmfilenetwork.cpp rename to gnm/gnm_frmts/file/gnmfilenetwork.cpp diff --git a/gdal/gnm/gnm_frmts/file/makefile.vc b/gnm/gnm_frmts/file/makefile.vc similarity index 100% rename from gdal/gnm/gnm_frmts/file/makefile.vc rename to gnm/gnm_frmts/file/makefile.vc diff --git a/gdal/gnm/gnm_frmts/gnm_frmts.h b/gnm/gnm_frmts/gnm_frmts.h similarity index 100% rename from gdal/gnm/gnm_frmts/gnm_frmts.h rename to gnm/gnm_frmts/gnm_frmts.h diff --git a/gdal/gnm/gnm_frmts/gnmregisterall.cpp b/gnm/gnm_frmts/gnmregisterall.cpp similarity index 100% rename from gdal/gnm/gnm_frmts/gnmregisterall.cpp rename to gnm/gnm_frmts/gnmregisterall.cpp diff --git a/gdal/gnm/gnm_frmts/makefile.vc b/gnm/gnm_frmts/makefile.vc similarity index 100% rename from gdal/gnm/gnm_frmts/makefile.vc rename to gnm/gnm_frmts/makefile.vc diff --git a/gdal/gnm/gnm_frmts/o/README.TXT b/gnm/gnm_frmts/o/README.TXT similarity index 100% rename from gdal/gnm/gnm_frmts/o/README.TXT rename to gnm/gnm_frmts/o/README.TXT diff --git a/gdal/gnm/gnm_priv.h b/gnm/gnm_priv.h similarity index 100% rename from gdal/gnm/gnm_priv.h rename to gnm/gnm_priv.h diff --git a/gdal/gnm/gnmgenericnetwork.cpp b/gnm/gnmgenericnetwork.cpp similarity index 100% rename from gdal/gnm/gnmgenericnetwork.cpp rename to gnm/gnmgenericnetwork.cpp diff --git a/gdal/gnm/gnmgraph.cpp b/gnm/gnmgraph.cpp similarity index 100% rename from gdal/gnm/gnmgraph.cpp rename to gnm/gnmgraph.cpp diff --git a/gdal/gnm/gnmgraph.h b/gnm/gnmgraph.h similarity index 100% rename from gdal/gnm/gnmgraph.h rename to gnm/gnmgraph.h diff --git a/gdal/gnm/gnmlayer.cpp b/gnm/gnmlayer.cpp similarity index 100% rename from gdal/gnm/gnmlayer.cpp rename to gnm/gnmlayer.cpp diff --git a/gdal/gnm/gnmnetwork.cpp b/gnm/gnmnetwork.cpp similarity index 100% rename from gdal/gnm/gnmnetwork.cpp rename to gnm/gnmnetwork.cpp diff --git a/gdal/gnm/gnmresultlayer.cpp b/gnm/gnmresultlayer.cpp similarity index 100% rename from gdal/gnm/gnmresultlayer.cpp rename to gnm/gnmresultlayer.cpp diff --git a/gdal/gnm/gnmrule.cpp b/gnm/gnmrule.cpp similarity index 100% rename from gdal/gnm/gnmrule.cpp rename to gnm/gnmrule.cpp diff --git a/gdal/gnm/makefile.vc b/gnm/makefile.vc similarity index 100% rename from gdal/gnm/makefile.vc rename to gnm/makefile.vc diff --git a/gdal/install-sh b/install-sh similarity index 100% rename from gdal/install-sh rename to install-sh diff --git a/gdal/ltmain.sh b/ltmain.sh similarity index 100% rename from gdal/ltmain.sh rename to ltmain.sh diff --git a/gdal/m4/acinclude.m4 b/m4/acinclude.m4 similarity index 100% rename from gdal/m4/acinclude.m4 rename to m4/acinclude.m4 diff --git a/gdal/m4/ax_cflags_warn_all.m4 b/m4/ax_cflags_warn_all.m4 similarity index 100% rename from gdal/m4/ax_cflags_warn_all.m4 rename to m4/ax_cflags_warn_all.m4 diff --git a/gdal/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 similarity index 100% rename from gdal/m4/ax_check_compile_flag.m4 rename to m4/ax_check_compile_flag.m4 diff --git a/gdal/m4/ax_compiler_vendor.m4 b/m4/ax_compiler_vendor.m4 similarity index 100% rename from gdal/m4/ax_compiler_vendor.m4 rename to m4/ax_compiler_vendor.m4 diff --git a/gdal/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 similarity index 100% rename from gdal/m4/ax_cxx_compile_stdcxx.m4 rename to m4/ax_cxx_compile_stdcxx.m4 diff --git a/gdal/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 similarity index 100% rename from gdal/m4/ax_cxx_compile_stdcxx_11.m4 rename to m4/ax_cxx_compile_stdcxx_11.m4 diff --git a/gdal/m4/ax_lib_expat.m4 b/m4/ax_lib_expat.m4 similarity index 100% rename from gdal/m4/ax_lib_expat.m4 rename to m4/ax_lib_expat.m4 diff --git a/gdal/m4/ax_lib_libkml.m4 b/m4/ax_lib_libkml.m4 similarity index 100% rename from gdal/m4/ax_lib_libkml.m4 rename to m4/ax_lib_libkml.m4 diff --git a/gdal/m4/ax_lib_sqlite3.m4 b/m4/ax_lib_sqlite3.m4 similarity index 100% rename from gdal/m4/ax_lib_sqlite3.m4 rename to m4/ax_lib_sqlite3.m4 diff --git a/gdal/m4/ax_lib_xerces.m4 b/m4/ax_lib_xerces.m4 similarity index 100% rename from gdal/m4/ax_lib_xerces.m4 rename to m4/ax_lib_xerces.m4 diff --git a/gdal/m4/ax_oracle_oci.m4 b/m4/ax_oracle_oci.m4 similarity index 100% rename from gdal/m4/ax_oracle_oci.m4 rename to m4/ax_oracle_oci.m4 diff --git a/gdal/m4/ax_prepend_flag.m4 b/m4/ax_prepend_flag.m4 similarity index 100% rename from gdal/m4/ax_prepend_flag.m4 rename to m4/ax_prepend_flag.m4 diff --git a/gdal/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4 similarity index 100% rename from gdal/m4/ax_require_defined.m4 rename to m4/ax_require_defined.m4 diff --git a/gdal/m4/geos.m4 b/m4/geos.m4 similarity index 100% rename from gdal/m4/geos.m4 rename to m4/geos.m4 diff --git a/gdal/m4/iconv.m4 b/m4/iconv.m4 similarity index 100% rename from gdal/m4/iconv.m4 rename to m4/iconv.m4 diff --git a/gdal/m4/lib-ld.m4 b/m4/lib-ld.m4 similarity index 100% rename from gdal/m4/lib-ld.m4 rename to m4/lib-ld.m4 diff --git a/gdal/m4/lib-link.m4 b/m4/lib-link.m4 similarity index 100% rename from gdal/m4/lib-link.m4 rename to m4/lib-link.m4 diff --git a/gdal/m4/lib-prefix.m4 b/m4/lib-prefix.m4 similarity index 100% rename from gdal/m4/lib-prefix.m4 rename to m4/lib-prefix.m4 diff --git a/gdal/m4/libtool.m4 b/m4/libtool.m4 similarity index 100% rename from gdal/m4/libtool.m4 rename to m4/libtool.m4 diff --git a/gdal/m4/ltoptions.m4 b/m4/ltoptions.m4 similarity index 100% rename from gdal/m4/ltoptions.m4 rename to m4/ltoptions.m4 diff --git a/gdal/m4/ltsugar.m4 b/m4/ltsugar.m4 similarity index 100% rename from gdal/m4/ltsugar.m4 rename to m4/ltsugar.m4 diff --git a/gdal/m4/ltversion.m4 b/m4/ltversion.m4 similarity index 100% rename from gdal/m4/ltversion.m4 rename to m4/ltversion.m4 diff --git a/gdal/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 similarity index 100% rename from gdal/m4/lt~obsolete.m4 rename to m4/lt~obsolete.m4 diff --git a/gdal/m4/pkg.m4 b/m4/pkg.m4 similarity index 100% rename from gdal/m4/pkg.m4 rename to m4/pkg.m4 diff --git a/gdal/m4/sfcgal.m4 b/m4/sfcgal.m4 similarity index 100% rename from gdal/m4/sfcgal.m4 rename to m4/sfcgal.m4 diff --git a/gdal/makefile.vc b/makefile.vc similarity index 100% rename from gdal/makefile.vc rename to makefile.vc diff --git a/gdal/mkgdaldist.sh b/mkgdaldist.sh similarity index 81% rename from gdal/mkgdaldist.sh rename to mkgdaldist.sh index 3ced4d919c23..9730bbae08b8 100755 --- a/gdal/mkgdaldist.sh +++ b/mkgdaldist.sh @@ -115,13 +115,14 @@ fi if test "$forcedate" != "no" ; then echo "* Updating release date..." echo "Forcing Date To: $forcedate" - rm -f gdal/gcore/gdal_new.h - sed -e "/define GDAL_RELEASE_DATE/s/20[0-9][0-9][0-9][0-9][0-9][0-9]/$forcedate/" gdal/gcore/gdal.h > gdal/gcore/gdal_new.h - mv gdal/gcore/gdal_new.h gdal/gcore/gdal.h + rm -f gcore/gdal_new.h + sed -e "/define GDAL_RELEASE_DATE/s/20[0-9][0-9][0-9][0-9][0-9][0-9]/$forcedate/" gcore/gdal.h > gcore/gdal_new.h + mv gcore/gdal_new.h gcore/gdal.h fi -echo "* Cleaning .gitignore under $PWD..." -rm -f gdal/.gitignore +echo "* Cleaning .git and .gitignore under $PWD..." +rm -rf .git +rm -f .gitignore echo "* Substituting \$Id\$..." find . -name "*.h" -o -name "*.c" -o -name "*.cpp" -o -name "*.dox" \ @@ -135,7 +136,6 @@ done CWD=${PWD} -cd gdal # # Generate ./configure @@ -178,7 +178,7 @@ echo "SWIG C# interfaces *NOT* generated !" # #echo "* Generating SWIG C# interfaces..." #CWD=${PWD} -#cd gdal/swig/csharp +#cd swig/csharp #./mkinterface.sh #cd ${CWD} @@ -188,38 +188,39 @@ echo "SWIG C# interfaces *NOT* generated !" echo "* Generating SWIG Perl interfaces..." CWD=${PWD} -rm -f gdal/swig/perl/*wrap* -touch gdal/GDALmake.opt -(cd gdal/swig/perl && make generate) -rm gdal/GDALmake.opt +rm -f swig/perl/*wrap* +touch GDALmake.opt +(cd swig/perl && make generate) +rm GDALmake.opt # # Make distribution packages # echo "* Making distribution packages..." -rm -f gdal/VERSION -echo "$GDAL_VERSION" > gdal/VERSION +rm -f VERSION +echo "$GDAL_VERSION" > VERSION +cd .. +mv gdal/autotest "gdalautotest-${GDAL_VERSION}" mv gdal "gdal-${GDAL_VERSION}" -rm -f "../../gdal-${GDAL_VERSION}${RC}.tar.gz" "../../gdal${COMPRESSED_VERSION}${RC}.zip" +rm -f "../gdal-${GDAL_VERSION}${RC}.tar.xz" "../gdal-${GDAL_VERSION}${RC}.tar.gz" "../gdal${COMPRESSED_VERSION}${RC}.zip" -tar cf "../../gdal-${GDAL_VERSION}${RC}.tar" "gdal-${GDAL_VERSION}" -xz -k9e "../../gdal-${GDAL_VERSION}${RC}.tar" -gzip -9 "../../gdal-${GDAL_VERSION}${RC}.tar" -zip -qr "../../gdal${COMPRESSED_VERSION}${RC}.zip" "gdal-${GDAL_VERSION}" +tar cf "../gdal-${GDAL_VERSION}${RC}.tar" "gdal-${GDAL_VERSION}" +xz -k9e "../gdal-${GDAL_VERSION}${RC}.tar" +gzip -9 "../gdal-${GDAL_VERSION}${RC}.tar" +zip -qr "../gdal${COMPRESSED_VERSION}${RC}.zip" "gdal-${GDAL_VERSION}" -mv autotest "gdalautotest-${GDAL_VERSION}" -rm -f "../../gdalautotest-${GDAL_VERSION}${RC}.tar.gz" -rm -f "../../gdalautotest-${GDAL_VERSION}${RC}.zip" -tar cf "../../gdalautotest-${GDAL_VERSION}${RC}.tar.gz" "gdalautotest-${GDAL_VERSION}" -zip -qr "../../gdalautotest-${GDAL_VERSION}${RC}.zip" "gdalautotest-${GDAL_VERSION}" +rm -f "../gdalautotest-${GDAL_VERSION}${RC}.tar.gz" +rm -f "../gdalautotest-${GDAL_VERSION}${RC}.zip" +tar cf "../gdalautotest-${GDAL_VERSION}${RC}.tar.gz" "gdalautotest-${GDAL_VERSION}" +zip -qr "../gdalautotest-${GDAL_VERSION}${RC}.zip" "gdalautotest-${GDAL_VERSION}" cd "gdal-${GDAL_VERSION}" echo "GDAL_VER=${GDAL_VERSION}" > GDALmake.opt cd frmts/grass make dist -mv ./*.tar.gz ../../../../.. +mv ./*.tar.gz ../../../.. cd ../../.. echo "* Generating MD5 sums ..." @@ -231,7 +232,7 @@ else MD5=md5sum fi -cd ../.. +cd .. $MD5 "gdal-${GDAL_VERSION}${RC}.tar.xz" > "gdal-${GDAL_VERSION}${RC}.tar.xz.md5" $MD5 "gdal-${GDAL_VERSION}${RC}.tar.gz" > "gdal-${GDAL_VERSION}${RC}.tar.gz.md5" $MD5 "gdal${COMPRESSED_VERSION}${RC}.zip" > "gdal${COMPRESSED_VERSION}${RC}.zip.md5" diff --git a/gdal/nmake.opt b/nmake.opt similarity index 100% rename from gdal/nmake.opt rename to nmake.opt diff --git a/gdal/ogr/CMakeLists.txt b/ogr/CMakeLists.txt similarity index 100% rename from gdal/ogr/CMakeLists.txt rename to ogr/CMakeLists.txt diff --git a/gdal/ogr/Doxyfile b/ogr/Doxyfile similarity index 100% rename from gdal/ogr/Doxyfile rename to ogr/Doxyfile diff --git a/gdal/ogr/GNUmakefile b/ogr/GNUmakefile similarity index 100% rename from gdal/ogr/GNUmakefile rename to ogr/GNUmakefile diff --git a/gdal/ogr/file.lst b/ogr/file.lst similarity index 100% rename from gdal/ogr/file.lst rename to ogr/file.lst diff --git a/gdal/ogr/generate_encoding_table.c b/ogr/generate_encoding_table.c similarity index 100% rename from gdal/ogr/generate_encoding_table.c rename to ogr/generate_encoding_table.c diff --git a/gdal/ogr/gml2ogrgeometry.cpp b/ogr/gml2ogrgeometry.cpp similarity index 100% rename from gdal/ogr/gml2ogrgeometry.cpp rename to ogr/gml2ogrgeometry.cpp diff --git a/gdal/ogr/makefile.vc b/ogr/makefile.vc similarity index 100% rename from gdal/ogr/makefile.vc rename to ogr/makefile.vc diff --git a/gdal/ogr/ogr2gmlgeometry.cpp b/ogr/ogr2gmlgeometry.cpp similarity index 100% rename from gdal/ogr/ogr2gmlgeometry.cpp rename to ogr/ogr2gmlgeometry.cpp diff --git a/gdal/ogr/ogr_api.cpp b/ogr/ogr_api.cpp similarity index 100% rename from gdal/ogr/ogr_api.cpp rename to ogr/ogr_api.cpp diff --git a/gdal/ogr/ogr_api.h b/ogr/ogr_api.h similarity index 100% rename from gdal/ogr/ogr_api.h rename to ogr/ogr_api.h diff --git a/gdal/ogr/ogr_capi_test.c b/ogr/ogr_capi_test.c similarity index 100% rename from gdal/ogr/ogr_capi_test.c rename to ogr/ogr_capi_test.c diff --git a/gdal/ogr/ogr_core.h b/ogr/ogr_core.h similarity index 100% rename from gdal/ogr/ogr_core.h rename to ogr/ogr_core.h diff --git a/gdal/ogr/ogr_expat.cpp b/ogr/ogr_expat.cpp similarity index 100% rename from gdal/ogr/ogr_expat.cpp rename to ogr/ogr_expat.cpp diff --git a/gdal/ogr/ogr_expat.h b/ogr/ogr_expat.h similarity index 100% rename from gdal/ogr/ogr_expat.h rename to ogr/ogr_expat.h diff --git a/gdal/ogr/ogr_feature.h b/ogr/ogr_feature.h similarity index 100% rename from gdal/ogr/ogr_feature.h rename to ogr/ogr_feature.h diff --git a/gdal/ogr/ogr_featurestyle.h b/ogr/ogr_featurestyle.h similarity index 100% rename from gdal/ogr/ogr_featurestyle.h rename to ogr/ogr_featurestyle.h diff --git a/gdal/ogr/ogr_fromepsg.cpp b/ogr/ogr_fromepsg.cpp similarity index 100% rename from gdal/ogr/ogr_fromepsg.cpp rename to ogr/ogr_fromepsg.cpp diff --git a/gdal/ogr/ogr_geo_utils.cpp b/ogr/ogr_geo_utils.cpp similarity index 100% rename from gdal/ogr/ogr_geo_utils.cpp rename to ogr/ogr_geo_utils.cpp diff --git a/gdal/ogr/ogr_geo_utils.h b/ogr/ogr_geo_utils.h similarity index 100% rename from gdal/ogr/ogr_geo_utils.h rename to ogr/ogr_geo_utils.h diff --git a/gdal/ogr/ogr_geocoding.cpp b/ogr/ogr_geocoding.cpp similarity index 100% rename from gdal/ogr/ogr_geocoding.cpp rename to ogr/ogr_geocoding.cpp diff --git a/gdal/ogr/ogr_geocoding.h b/ogr/ogr_geocoding.h similarity index 100% rename from gdal/ogr/ogr_geocoding.h rename to ogr/ogr_geocoding.h diff --git a/gdal/ogr/ogr_geometry.h b/ogr/ogr_geometry.h similarity index 100% rename from gdal/ogr/ogr_geometry.h rename to ogr/ogr_geometry.h diff --git a/gdal/ogr/ogr_geos.h b/ogr/ogr_geos.h similarity index 100% rename from gdal/ogr/ogr_geos.h rename to ogr/ogr_geos.h diff --git a/gdal/ogr/ogr_libs.h b/ogr/ogr_libs.h similarity index 100% rename from gdal/ogr/ogr_libs.h rename to ogr/ogr_libs.h diff --git a/gdal/ogr/ogr_p.h b/ogr/ogr_p.h similarity index 100% rename from gdal/ogr/ogr_p.h rename to ogr/ogr_p.h diff --git a/gdal/ogr/ogr_proj_p.cpp b/ogr/ogr_proj_p.cpp similarity index 100% rename from gdal/ogr/ogr_proj_p.cpp rename to ogr/ogr_proj_p.cpp diff --git a/gdal/ogr/ogr_proj_p.h b/ogr/ogr_proj_p.h similarity index 100% rename from gdal/ogr/ogr_proj_p.h rename to ogr/ogr_proj_p.h diff --git a/gdal/ogr/ogr_sfcgal.h b/ogr/ogr_sfcgal.h similarity index 100% rename from gdal/ogr/ogr_sfcgal.h rename to ogr/ogr_sfcgal.h diff --git a/gdal/ogr/ogr_spatialref.h b/ogr/ogr_spatialref.h similarity index 100% rename from gdal/ogr/ogr_spatialref.h rename to ogr/ogr_spatialref.h diff --git a/gdal/ogr/ogr_srs_api.h b/ogr/ogr_srs_api.h similarity index 100% rename from gdal/ogr/ogr_srs_api.h rename to ogr/ogr_srs_api.h diff --git a/gdal/ogr/ogr_srs_dict.cpp b/ogr/ogr_srs_dict.cpp similarity index 100% rename from gdal/ogr/ogr_srs_dict.cpp rename to ogr/ogr_srs_dict.cpp diff --git a/gdal/ogr/ogr_srs_erm.cpp b/ogr/ogr_srs_erm.cpp similarity index 100% rename from gdal/ogr/ogr_srs_erm.cpp rename to ogr/ogr_srs_erm.cpp diff --git a/gdal/ogr/ogr_srs_esri.cpp b/ogr/ogr_srs_esri.cpp similarity index 100% rename from gdal/ogr/ogr_srs_esri.cpp rename to ogr/ogr_srs_esri.cpp diff --git a/gdal/ogr/ogr_srs_esri_names.h b/ogr/ogr_srs_esri_names.h similarity index 100% rename from gdal/ogr/ogr_srs_esri_names.h rename to ogr/ogr_srs_esri_names.h diff --git a/gdal/ogr/ogr_srs_ozi.cpp b/ogr/ogr_srs_ozi.cpp similarity index 100% rename from gdal/ogr/ogr_srs_ozi.cpp rename to ogr/ogr_srs_ozi.cpp diff --git a/gdal/ogr/ogr_srs_panorama.cpp b/ogr/ogr_srs_panorama.cpp similarity index 100% rename from gdal/ogr/ogr_srs_panorama.cpp rename to ogr/ogr_srs_panorama.cpp diff --git a/gdal/ogr/ogr_srs_pci.cpp b/ogr/ogr_srs_pci.cpp similarity index 100% rename from gdal/ogr/ogr_srs_pci.cpp rename to ogr/ogr_srs_pci.cpp diff --git a/gdal/ogr/ogr_srs_usgs.cpp b/ogr/ogr_srs_usgs.cpp similarity index 100% rename from gdal/ogr/ogr_srs_usgs.cpp rename to ogr/ogr_srs_usgs.cpp diff --git a/gdal/ogr/ogr_srs_xml.cpp b/ogr/ogr_srs_xml.cpp similarity index 100% rename from gdal/ogr/ogr_srs_xml.cpp rename to ogr/ogr_srs_xml.cpp diff --git a/gdal/ogr/ogr_srsnode.cpp b/ogr/ogr_srsnode.cpp similarity index 100% rename from gdal/ogr/ogr_srsnode.cpp rename to ogr/ogr_srsnode.cpp diff --git a/gdal/ogr/ogr_swq.h b/ogr/ogr_swq.h similarity index 100% rename from gdal/ogr/ogr_swq.h rename to ogr/ogr_swq.h diff --git a/gdal/ogr/ogr_xerces.cpp b/ogr/ogr_xerces.cpp similarity index 100% rename from gdal/ogr/ogr_xerces.cpp rename to ogr/ogr_xerces.cpp diff --git a/gdal/ogr/ogr_xerces.h b/ogr/ogr_xerces.h similarity index 100% rename from gdal/ogr/ogr_xerces.h rename to ogr/ogr_xerces.h diff --git a/gdal/ogr/ogr_xerces_headers.h b/ogr/ogr_xerces_headers.h similarity index 100% rename from gdal/ogr/ogr_xerces_headers.h rename to ogr/ogr_xerces_headers.h diff --git a/gdal/ogr/ograpispy.cpp b/ogr/ograpispy.cpp similarity index 100% rename from gdal/ogr/ograpispy.cpp rename to ogr/ograpispy.cpp diff --git a/gdal/ogr/ograpispy.h b/ogr/ograpispy.h similarity index 100% rename from gdal/ogr/ograpispy.h rename to ogr/ograpispy.h diff --git a/gdal/ogr/ograssemblepolygon.cpp b/ogr/ograssemblepolygon.cpp similarity index 100% rename from gdal/ogr/ograssemblepolygon.cpp rename to ogr/ograssemblepolygon.cpp diff --git a/gdal/ogr/ogrcircularstring.cpp b/ogr/ogrcircularstring.cpp similarity index 100% rename from gdal/ogr/ogrcircularstring.cpp rename to ogr/ogrcircularstring.cpp diff --git a/gdal/ogr/ogrcompoundcurve.cpp b/ogr/ogrcompoundcurve.cpp similarity index 100% rename from gdal/ogr/ogrcompoundcurve.cpp rename to ogr/ogrcompoundcurve.cpp diff --git a/gdal/ogr/ogrct.cpp b/ogr/ogrct.cpp similarity index 100% rename from gdal/ogr/ogrct.cpp rename to ogr/ogrct.cpp diff --git a/gdal/ogr/ogrcurve.cpp b/ogr/ogrcurve.cpp similarity index 100% rename from gdal/ogr/ogrcurve.cpp rename to ogr/ogrcurve.cpp diff --git a/gdal/ogr/ogrcurvecollection.cpp b/ogr/ogrcurvecollection.cpp similarity index 100% rename from gdal/ogr/ogrcurvecollection.cpp rename to ogr/ogrcurvecollection.cpp diff --git a/gdal/ogr/ogrcurvepolygon.cpp b/ogr/ogrcurvepolygon.cpp similarity index 100% rename from gdal/ogr/ogrcurvepolygon.cpp rename to ogr/ogrcurvepolygon.cpp diff --git a/gdal/ogr/ogrfeature.cpp b/ogr/ogrfeature.cpp similarity index 100% rename from gdal/ogr/ogrfeature.cpp rename to ogr/ogrfeature.cpp diff --git a/gdal/ogr/ogrfeaturedefn.cpp b/ogr/ogrfeaturedefn.cpp similarity index 100% rename from gdal/ogr/ogrfeaturedefn.cpp rename to ogr/ogrfeaturedefn.cpp diff --git a/gdal/ogr/ogrfeaturequery.cpp b/ogr/ogrfeaturequery.cpp similarity index 100% rename from gdal/ogr/ogrfeaturequery.cpp rename to ogr/ogrfeaturequery.cpp diff --git a/gdal/ogr/ogrfeaturestyle.cpp b/ogr/ogrfeaturestyle.cpp similarity index 100% rename from gdal/ogr/ogrfeaturestyle.cpp rename to ogr/ogrfeaturestyle.cpp diff --git a/gdal/ogr/ogrfielddefn.cpp b/ogr/ogrfielddefn.cpp similarity index 100% rename from gdal/ogr/ogrfielddefn.cpp rename to ogr/ogrfielddefn.cpp diff --git a/gdal/ogr/ogrgeomediageometry.cpp b/ogr/ogrgeomediageometry.cpp similarity index 100% rename from gdal/ogr/ogrgeomediageometry.cpp rename to ogr/ogrgeomediageometry.cpp diff --git a/gdal/ogr/ogrgeomediageometry.h b/ogr/ogrgeomediageometry.h similarity index 100% rename from gdal/ogr/ogrgeomediageometry.h rename to ogr/ogrgeomediageometry.h diff --git a/gdal/ogr/ogrgeometry.cpp b/ogr/ogrgeometry.cpp similarity index 100% rename from gdal/ogr/ogrgeometry.cpp rename to ogr/ogrgeometry.cpp diff --git a/gdal/ogr/ogrgeometrycollection.cpp b/ogr/ogrgeometrycollection.cpp similarity index 100% rename from gdal/ogr/ogrgeometrycollection.cpp rename to ogr/ogrgeometrycollection.cpp diff --git a/gdal/ogr/ogrgeometryfactory.cpp b/ogr/ogrgeometryfactory.cpp similarity index 100% rename from gdal/ogr/ogrgeometryfactory.cpp rename to ogr/ogrgeometryfactory.cpp diff --git a/gdal/ogr/ogrgeomfielddefn.cpp b/ogr/ogrgeomfielddefn.cpp similarity index 100% rename from gdal/ogr/ogrgeomfielddefn.cpp rename to ogr/ogrgeomfielddefn.cpp diff --git a/gdal/ogr/ogrlinearring.cpp b/ogr/ogrlinearring.cpp similarity index 100% rename from gdal/ogr/ogrlinearring.cpp rename to ogr/ogrlinearring.cpp diff --git a/gdal/ogr/ogrlinestring.cpp b/ogr/ogrlinestring.cpp similarity index 100% rename from gdal/ogr/ogrlinestring.cpp rename to ogr/ogrlinestring.cpp diff --git a/gdal/ogr/ogrmulticurve.cpp b/ogr/ogrmulticurve.cpp similarity index 100% rename from gdal/ogr/ogrmulticurve.cpp rename to ogr/ogrmulticurve.cpp diff --git a/gdal/ogr/ogrmultilinestring.cpp b/ogr/ogrmultilinestring.cpp similarity index 100% rename from gdal/ogr/ogrmultilinestring.cpp rename to ogr/ogrmultilinestring.cpp diff --git a/gdal/ogr/ogrmultipoint.cpp b/ogr/ogrmultipoint.cpp similarity index 100% rename from gdal/ogr/ogrmultipoint.cpp rename to ogr/ogrmultipoint.cpp diff --git a/gdal/ogr/ogrmultipolygon.cpp b/ogr/ogrmultipolygon.cpp similarity index 100% rename from gdal/ogr/ogrmultipolygon.cpp rename to ogr/ogrmultipolygon.cpp diff --git a/gdal/ogr/ogrmultisurface.cpp b/ogr/ogrmultisurface.cpp similarity index 100% rename from gdal/ogr/ogrmultisurface.cpp rename to ogr/ogrmultisurface.cpp diff --git a/gdal/ogr/ogrpgeogeometry.cpp b/ogr/ogrpgeogeometry.cpp similarity index 100% rename from gdal/ogr/ogrpgeogeometry.cpp rename to ogr/ogrpgeogeometry.cpp diff --git a/gdal/ogr/ogrpgeogeometry.h b/ogr/ogrpgeogeometry.h similarity index 100% rename from gdal/ogr/ogrpgeogeometry.h rename to ogr/ogrpgeogeometry.h diff --git a/gdal/ogr/ogrpoint.cpp b/ogr/ogrpoint.cpp similarity index 100% rename from gdal/ogr/ogrpoint.cpp rename to ogr/ogrpoint.cpp diff --git a/gdal/ogr/ogrpolygon.cpp b/ogr/ogrpolygon.cpp similarity index 100% rename from gdal/ogr/ogrpolygon.cpp rename to ogr/ogrpolygon.cpp diff --git a/gdal/ogr/ogrpolyhedralsurface.cpp b/ogr/ogrpolyhedralsurface.cpp similarity index 100% rename from gdal/ogr/ogrpolyhedralsurface.cpp rename to ogr/ogrpolyhedralsurface.cpp diff --git a/gdal/ogr/ogrsf_frmts/CMakeLists.txt b/ogr/ogrsf_frmts/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/CMakeLists.txt rename to ogr/ogrsf_frmts/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/GNUmakefile b/ogr/ogrsf_frmts/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/GNUmakefile rename to ogr/ogrsf_frmts/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/CMakeLists.txt b/ogr/ogrsf_frmts/amigocloud/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/CMakeLists.txt rename to ogr/ogrsf_frmts/amigocloud/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/GNUmakefile b/ogr/ogrsf_frmts/amigocloud/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/GNUmakefile rename to ogr/ogrsf_frmts/amigocloud/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/makefile.vc b/ogr/ogrsf_frmts/amigocloud/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/makefile.vc rename to ogr/ogrsf_frmts/amigocloud/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h b/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h rename to ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp rename to ogr/ogrsf_frmts/amigocloud/ogramigoclouddatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp rename to ogr/ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp rename to ogr/ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/ogramigocloudresultlayer.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigocloudresultlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/ogramigocloudresultlayer.cpp rename to ogr/ogrsf_frmts/amigocloud/ogramigocloudresultlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/ogramigocloudtablelayer.cpp b/ogr/ogrsf_frmts/amigocloud/ogramigocloudtablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/ogramigocloudtablelayer.cpp rename to ogr/ogrsf_frmts/amigocloud/ogramigocloudtablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/pkg/Makefile.in b/ogr/ogrsf_frmts/amigocloud/pkg/Makefile.in similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/pkg/Makefile.in rename to ogr/ogrsf_frmts/amigocloud/pkg/Makefile.in diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/pkg/configure b/ogr/ogrsf_frmts/amigocloud/pkg/configure similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/pkg/configure rename to ogr/ogrsf_frmts/amigocloud/pkg/configure diff --git a/gdal/ogr/ogrsf_frmts/amigocloud/pkg/configure.in b/ogr/ogrsf_frmts/amigocloud/pkg/configure.in similarity index 100% rename from gdal/ogr/ogrsf_frmts/amigocloud/pkg/configure.in rename to ogr/ogrsf_frmts/amigocloud/pkg/configure.in diff --git a/gdal/ogr/ogrsf_frmts/arcgen/CMakeLists.txt b/ogr/ogrsf_frmts/arcgen/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcgen/CMakeLists.txt rename to ogr/ogrsf_frmts/arcgen/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/arcgen/GNUmakefile b/ogr/ogrsf_frmts/arcgen/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcgen/GNUmakefile rename to ogr/ogrsf_frmts/arcgen/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/arcgen/makefile.vc b/ogr/ogrsf_frmts/arcgen/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcgen/makefile.vc rename to ogr/ogrsf_frmts/arcgen/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/arcgen/ogr_arcgen.h b/ogr/ogrsf_frmts/arcgen/ogr_arcgen.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcgen/ogr_arcgen.h rename to ogr/ogrsf_frmts/arcgen/ogr_arcgen.h diff --git a/gdal/ogr/ogrsf_frmts/arcgen/ograrcgendatasource.cpp b/ogr/ogrsf_frmts/arcgen/ograrcgendatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcgen/ograrcgendatasource.cpp rename to ogr/ogrsf_frmts/arcgen/ograrcgendatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/arcgen/ograrcgendriver.cpp b/ogr/ogrsf_frmts/arcgen/ograrcgendriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcgen/ograrcgendriver.cpp rename to ogr/ogrsf_frmts/arcgen/ograrcgendriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/arcgen/ograrcgenlayer.cpp b/ogr/ogrsf_frmts/arcgen/ograrcgenlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcgen/ograrcgenlayer.cpp rename to ogr/ogrsf_frmts/arcgen/ograrcgenlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/CMakeLists.txt b/ogr/ogrsf_frmts/arcobjects/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/CMakeLists.txt rename to ogr/ogrsf_frmts/arcobjects/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/GNUmakefile b/ogr/ogrsf_frmts/arcobjects/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/GNUmakefile rename to ogr/ogrsf_frmts/arcobjects/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/aodatasource.cpp b/ogr/ogrsf_frmts/arcobjects/aodatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/aodatasource.cpp rename to ogr/ogrsf_frmts/arcobjects/aodatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/aodriver.cpp b/ogr/ogrsf_frmts/arcobjects/aodriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/aodriver.cpp rename to ogr/ogrsf_frmts/arcobjects/aodriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/aolayer.cpp b/ogr/ogrsf_frmts/arcobjects/aolayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/aolayer.cpp rename to ogr/ogrsf_frmts/arcobjects/aolayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/aoutils.cpp b/ogr/ogrsf_frmts/arcobjects/aoutils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/aoutils.cpp rename to ogr/ogrsf_frmts/arcobjects/aoutils.cpp diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/aoutils.h b/ogr/ogrsf_frmts/arcobjects/aoutils.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/aoutils.h rename to ogr/ogrsf_frmts/arcobjects/aoutils.h diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/makefile.vc b/ogr/ogrsf_frmts/arcobjects/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/makefile.vc rename to ogr/ogrsf_frmts/arcobjects/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/arcobjects/ogr_ao.h b/ogr/ogrsf_frmts/arcobjects/ogr_ao.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/arcobjects/ogr_ao.h rename to ogr/ogrsf_frmts/arcobjects/ogr_ao.h diff --git a/gdal/ogr/ogrsf_frmts/avc/CMakeLists.txt b/ogr/ogrsf_frmts/avc/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/CMakeLists.txt rename to ogr/ogrsf_frmts/avc/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/avc/GNUmakefile b/ogr/ogrsf_frmts/avc/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/GNUmakefile rename to ogr/ogrsf_frmts/avc/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/avc/HISTORY.TXT b/ogr/ogrsf_frmts/avc/HISTORY.TXT similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/HISTORY.TXT rename to ogr/ogrsf_frmts/avc/HISTORY.TXT diff --git a/gdal/ogr/ogrsf_frmts/avc/avc.h b/ogr/ogrsf_frmts/avc/avc.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc.h rename to ogr/ogrsf_frmts/avc/avc.h diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_bin.cpp b/ogr/ogrsf_frmts/avc/avc_bin.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_bin.cpp rename to ogr/ogrsf_frmts/avc/avc_bin.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_binwr.cpp b/ogr/ogrsf_frmts/avc/avc_binwr.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_binwr.cpp rename to ogr/ogrsf_frmts/avc/avc_binwr.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_e00gen.cpp b/ogr/ogrsf_frmts/avc/avc_e00gen.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_e00gen.cpp rename to ogr/ogrsf_frmts/avc/avc_e00gen.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_e00parse.cpp b/ogr/ogrsf_frmts/avc/avc_e00parse.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_e00parse.cpp rename to ogr/ogrsf_frmts/avc/avc_e00parse.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_e00read.cpp b/ogr/ogrsf_frmts/avc/avc_e00read.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_e00read.cpp rename to ogr/ogrsf_frmts/avc/avc_e00read.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_e00write.cpp b/ogr/ogrsf_frmts/avc/avc_e00write.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_e00write.cpp rename to ogr/ogrsf_frmts/avc/avc_e00write.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_mbyte.cpp b/ogr/ogrsf_frmts/avc/avc_mbyte.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_mbyte.cpp rename to ogr/ogrsf_frmts/avc/avc_mbyte.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_mbyte.h b/ogr/ogrsf_frmts/avc/avc_mbyte.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_mbyte.h rename to ogr/ogrsf_frmts/avc/avc_mbyte.h diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_misc.cpp b/ogr/ogrsf_frmts/avc/avc_misc.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_misc.cpp rename to ogr/ogrsf_frmts/avc/avc_misc.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/avc_rawbin.cpp b/ogr/ogrsf_frmts/avc/avc_rawbin.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/avc_rawbin.cpp rename to ogr/ogrsf_frmts/avc/avc_rawbin.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/makefile.vc b/ogr/ogrsf_frmts/avc/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/makefile.vc rename to ogr/ogrsf_frmts/avc/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/avc/ogr_avc.h b/ogr/ogrsf_frmts/avc/ogr_avc.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogr_avc.h rename to ogr/ogrsf_frmts/avc/ogr_avc.h diff --git a/gdal/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp b/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp rename to ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/ogravcbindriver.cpp b/ogr/ogrsf_frmts/avc/ogravcbindriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogravcbindriver.cpp rename to ogr/ogrsf_frmts/avc/ogravcbindriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/ogravcbinlayer.cpp b/ogr/ogrsf_frmts/avc/ogravcbinlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogravcbinlayer.cpp rename to ogr/ogrsf_frmts/avc/ogravcbinlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/ogravcdatasource.cpp b/ogr/ogrsf_frmts/avc/ogravcdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogravcdatasource.cpp rename to ogr/ogrsf_frmts/avc/ogravcdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp b/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp rename to ogr/ogrsf_frmts/avc/ogravce00datasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/ogravce00driver.cpp b/ogr/ogrsf_frmts/avc/ogravce00driver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogravce00driver.cpp rename to ogr/ogrsf_frmts/avc/ogravce00driver.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/ogravce00layer.cpp b/ogr/ogrsf_frmts/avc/ogravce00layer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogravce00layer.cpp rename to ogr/ogrsf_frmts/avc/ogravce00layer.cpp diff --git a/gdal/ogr/ogrsf_frmts/avc/ogravclayer.cpp b/ogr/ogrsf_frmts/avc/ogravclayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/avc/ogravclayer.cpp rename to ogr/ogrsf_frmts/avc/ogravclayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/CMakeLists.txt b/ogr/ogrsf_frmts/cad/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/CMakeLists.txt rename to ogr/ogrsf_frmts/cad/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/cad/GNUmakefile b/ogr/ogrsf_frmts/cad/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/GNUmakefile rename to ogr/ogrsf_frmts/cad/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/cad/gdalcaddataset.cpp b/ogr/ogrsf_frmts/cad/gdalcaddataset.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/gdalcaddataset.cpp rename to ogr/ogrsf_frmts/cad/gdalcaddataset.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/CMakeLists.txt b/ogr/ogrsf_frmts/cad/libopencad/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/CMakeLists.txt rename to ogr/ogrsf_frmts/cad/libopencad/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/GNUmakefile b/ogr/ogrsf_frmts/cad/libopencad/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/GNUmakefile rename to ogr/ogrsf_frmts/cad/libopencad/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadclasses.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadclasses.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadclasses.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadclasses.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadclasses.h b/ogr/ogrsf_frmts/cad/libopencad/cadclasses.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadclasses.h rename to ogr/ogrsf_frmts/cad/libopencad/cadclasses.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadcolors.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadcolors.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadcolors.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadcolors.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadcolors.h b/ogr/ogrsf_frmts/cad/libopencad/cadcolors.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadcolors.h rename to ogr/ogrsf_frmts/cad/libopencad/cadcolors.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/caddictionary.cpp b/ogr/ogrsf_frmts/cad/libopencad/caddictionary.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/caddictionary.cpp rename to ogr/ogrsf_frmts/cad/libopencad/caddictionary.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/caddictionary.h b/ogr/ogrsf_frmts/cad/libopencad/caddictionary.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/caddictionary.h rename to ogr/ogrsf_frmts/cad/libopencad/caddictionary.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadfile.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadfile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadfile.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadfile.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadfile.h b/ogr/ogrsf_frmts/cad/libopencad/cadfile.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadfile.h rename to ogr/ogrsf_frmts/cad/libopencad/cadfile.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadfileio.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadfileio.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadfileio.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadfileio.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadfileio.h b/ogr/ogrsf_frmts/cad/libopencad/cadfileio.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadfileio.h rename to ogr/ogrsf_frmts/cad/libopencad/cadfileio.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.h b/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.h rename to ogr/ogrsf_frmts/cad/libopencad/cadfilestreamio.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadgeometry.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h b/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h rename to ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadheader.h b/ogr/ogrsf_frmts/cad/libopencad/cadheader.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadheader.h rename to ogr/ogrsf_frmts/cad/libopencad/cadheader.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadlayer.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadlayer.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadlayer.h b/ogr/ogrsf_frmts/cad/libopencad/cadlayer.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadlayer.h rename to ogr/ogrsf_frmts/cad/libopencad/cadlayer.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.h b/ogr/ogrsf_frmts/cad/libopencad/cadobjects.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.h rename to ogr/ogrsf_frmts/cad/libopencad/cadobjects.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp b/ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp rename to ogr/ogrsf_frmts/cad/libopencad/cadtables.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadtables.h b/ogr/ogrsf_frmts/cad/libopencad/cadtables.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/cadtables.h rename to ogr/ogrsf_frmts/cad/libopencad/cadtables.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/CMakeLists.txt b/ogr/ogrsf_frmts/cad/libopencad/dwg/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/CMakeLists.txt rename to ogr/ogrsf_frmts/cad/libopencad/dwg/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/GNUmakefile b/ogr/ogrsf_frmts/cad/libopencad/dwg/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/GNUmakefile rename to ogr/ogrsf_frmts/cad/libopencad/dwg/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp rename to ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h b/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h rename to ogr/ogrsf_frmts/cad/libopencad/dwg/io.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/makefile.vc b/ogr/ogrsf_frmts/cad/libopencad/dwg/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/makefile.vc rename to ogr/ogrsf_frmts/cad/libopencad/dwg/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp rename to ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.h b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.h rename to ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/makefile.vc b/ogr/ogrsf_frmts/cad/libopencad/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/makefile.vc rename to ogr/ogrsf_frmts/cad/libopencad/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/opencad.cpp b/ogr/ogrsf_frmts/cad/libopencad/opencad.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/opencad.cpp rename to ogr/ogrsf_frmts/cad/libopencad/opencad.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/opencad.h b/ogr/ogrsf_frmts/cad/libopencad/opencad.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/opencad.h rename to ogr/ogrsf_frmts/cad/libopencad/opencad.h diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/opencad_api.h b/ogr/ogrsf_frmts/cad/libopencad/opencad_api.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/libopencad/opencad_api.h rename to ogr/ogrsf_frmts/cad/libopencad/opencad_api.h diff --git a/gdal/ogr/ogrsf_frmts/cad/makefile.vc b/ogr/ogrsf_frmts/cad/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/makefile.vc rename to ogr/ogrsf_frmts/cad/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/cad/ogr_cad.h b/ogr/ogrsf_frmts/cad/ogr_cad.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/ogr_cad.h rename to ogr/ogrsf_frmts/cad/ogr_cad.h diff --git a/gdal/ogr/ogrsf_frmts/cad/ogrcaddriver.cpp b/ogr/ogrsf_frmts/cad/ogrcaddriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/ogrcaddriver.cpp rename to ogr/ogrsf_frmts/cad/ogrcaddriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp b/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/ogrcadlayer.cpp rename to ogr/ogrsf_frmts/cad/ogrcadlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/vsilfileio.cpp b/ogr/ogrsf_frmts/cad/vsilfileio.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/vsilfileio.cpp rename to ogr/ogrsf_frmts/cad/vsilfileio.cpp diff --git a/gdal/ogr/ogrsf_frmts/cad/vsilfileio.h b/ogr/ogrsf_frmts/cad/vsilfileio.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cad/vsilfileio.h rename to ogr/ogrsf_frmts/cad/vsilfileio.h diff --git a/gdal/ogr/ogrsf_frmts/carto/CMakeLists.txt b/ogr/ogrsf_frmts/carto/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/CMakeLists.txt rename to ogr/ogrsf_frmts/carto/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/carto/GNUmakefile b/ogr/ogrsf_frmts/carto/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/GNUmakefile rename to ogr/ogrsf_frmts/carto/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/carto/makefile.vc b/ogr/ogrsf_frmts/carto/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/makefile.vc rename to ogr/ogrsf_frmts/carto/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/carto/ogr_carto.h b/ogr/ogrsf_frmts/carto/ogr_carto.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/ogr_carto.h rename to ogr/ogrsf_frmts/carto/ogr_carto.h diff --git a/gdal/ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp b/ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp rename to ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp b/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp rename to ogr/ogrsf_frmts/carto/ogrcartodriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/carto/ogrcartolayer.cpp b/ogr/ogrsf_frmts/carto/ogrcartolayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/ogrcartolayer.cpp rename to ogr/ogrsf_frmts/carto/ogrcartolayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp b/ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp rename to ogr/ogrsf_frmts/carto/ogrcartoresultlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp b/ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp rename to ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/cloudant/CMakeLists.txt b/ogr/ogrsf_frmts/cloudant/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/cloudant/CMakeLists.txt rename to ogr/ogrsf_frmts/cloudant/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/cloudant/GNUmakefile b/ogr/ogrsf_frmts/cloudant/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/cloudant/GNUmakefile rename to ogr/ogrsf_frmts/cloudant/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/cloudant/makefile.vc b/ogr/ogrsf_frmts/cloudant/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/cloudant/makefile.vc rename to ogr/ogrsf_frmts/cloudant/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/cloudant/ogr_cloudant.h b/ogr/ogrsf_frmts/cloudant/ogr_cloudant.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/cloudant/ogr_cloudant.h rename to ogr/ogrsf_frmts/cloudant/ogr_cloudant.h diff --git a/gdal/ogr/ogrsf_frmts/cloudant/ogrcloudantdatasource.cpp b/ogr/ogrsf_frmts/cloudant/ogrcloudantdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cloudant/ogrcloudantdatasource.cpp rename to ogr/ogrsf_frmts/cloudant/ogrcloudantdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/cloudant/ogrcloudantdriver.cpp b/ogr/ogrsf_frmts/cloudant/ogrcloudantdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cloudant/ogrcloudantdriver.cpp rename to ogr/ogrsf_frmts/cloudant/ogrcloudantdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/cloudant/ogrcloudanttablelayer.cpp b/ogr/ogrsf_frmts/cloudant/ogrcloudanttablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/cloudant/ogrcloudanttablelayer.cpp rename to ogr/ogrsf_frmts/cloudant/ogrcloudanttablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/couchdb/CMakeLists.txt b/ogr/ogrsf_frmts/couchdb/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/CMakeLists.txt rename to ogr/ogrsf_frmts/couchdb/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/couchdb/GNUmakefile b/ogr/ogrsf_frmts/couchdb/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/GNUmakefile rename to ogr/ogrsf_frmts/couchdb/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/couchdb/makefile.vc b/ogr/ogrsf_frmts/couchdb/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/makefile.vc rename to ogr/ogrsf_frmts/couchdb/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/couchdb/ogr_couchdb.h b/ogr/ogrsf_frmts/couchdb/ogr_couchdb.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/ogr_couchdb.h rename to ogr/ogrsf_frmts/couchdb/ogr_couchdb.h diff --git a/gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp b/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp rename to ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbdriver.cpp b/ogr/ogrsf_frmts/couchdb/ogrcouchdbdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbdriver.cpp rename to ogr/ogrsf_frmts/couchdb/ogrcouchdbdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdblayer.cpp b/ogr/ogrsf_frmts/couchdb/ogrcouchdblayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdblayer.cpp rename to ogr/ogrsf_frmts/couchdb/ogrcouchdblayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbrowslayer.cpp b/ogr/ogrsf_frmts/couchdb/ogrcouchdbrowslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbrowslayer.cpp rename to ogr/ogrsf_frmts/couchdb/ogrcouchdbrowslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbtablelayer.cpp b/ogr/ogrsf_frmts/couchdb/ogrcouchdbtablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbtablelayer.cpp rename to ogr/ogrsf_frmts/couchdb/ogrcouchdbtablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/csv/CMakeLists.txt b/ogr/ogrsf_frmts/csv/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/csv/CMakeLists.txt rename to ogr/ogrsf_frmts/csv/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/csv/GNUmakefile b/ogr/ogrsf_frmts/csv/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/csv/GNUmakefile rename to ogr/ogrsf_frmts/csv/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/csv/makefile.vc b/ogr/ogrsf_frmts/csv/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/csv/makefile.vc rename to ogr/ogrsf_frmts/csv/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/csv/ogr_csv.h b/ogr/ogrsf_frmts/csv/ogr_csv.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/csv/ogr_csv.h rename to ogr/ogrsf_frmts/csv/ogr_csv.h diff --git a/gdal/ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp b/ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp rename to ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp b/ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp rename to ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp b/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp rename to ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/csw/CMakeLists.txt b/ogr/ogrsf_frmts/csw/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/csw/CMakeLists.txt rename to ogr/ogrsf_frmts/csw/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/csw/GNUmakefile b/ogr/ogrsf_frmts/csw/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/csw/GNUmakefile rename to ogr/ogrsf_frmts/csw/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/csw/makefile.vc b/ogr/ogrsf_frmts/csw/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/csw/makefile.vc rename to ogr/ogrsf_frmts/csw/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp b/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp rename to ogr/ogrsf_frmts/csw/ogrcswdataset.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/CMakeLists.txt b/ogr/ogrsf_frmts/db2/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/CMakeLists.txt rename to ogr/ogrsf_frmts/db2/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/db2/GNUmakefile b/ogr/ogrsf_frmts/db2/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/GNUmakefile rename to ogr/ogrsf_frmts/db2/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/db2/gdaldb2rasterband.cpp b/ogr/ogrsf_frmts/db2/gdaldb2rasterband.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/gdaldb2rasterband.cpp rename to ogr/ogrsf_frmts/db2/gdaldb2rasterband.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/makefile.vc b/ogr/ogrsf_frmts/db2/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/makefile.vc rename to ogr/ogrsf_frmts/db2/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/db2/makeplugin.vc b/ogr/ogrsf_frmts/db2/makeplugin.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/makeplugin.vc rename to ogr/ogrsf_frmts/db2/makeplugin.vc diff --git a/gdal/ogr/ogrsf_frmts/db2/ogr_db2.h b/ogr/ogrsf_frmts/db2/ogr_db2.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogr_db2.h rename to ogr/ogrsf_frmts/db2/ogr_db2.h diff --git a/gdal/ogr/ogrsf_frmts/db2/ogrdb2cli.cpp b/ogr/ogrsf_frmts/db2/ogrdb2cli.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogrdb2cli.cpp rename to ogr/ogrsf_frmts/db2/ogrdb2cli.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/ogrdb2datasource.cpp b/ogr/ogrsf_frmts/db2/ogrdb2datasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogrdb2datasource.cpp rename to ogr/ogrsf_frmts/db2/ogrdb2datasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/ogrdb2datasourcemd.cpp b/ogr/ogrsf_frmts/db2/ogrdb2datasourcemd.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogrdb2datasourcemd.cpp rename to ogr/ogrsf_frmts/db2/ogrdb2datasourcemd.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/ogrdb2driver.cpp b/ogr/ogrsf_frmts/db2/ogrdb2driver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogrdb2driver.cpp rename to ogr/ogrsf_frmts/db2/ogrdb2driver.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/ogrdb2geometryvalidator.cpp b/ogr/ogrsf_frmts/db2/ogrdb2geometryvalidator.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogrdb2geometryvalidator.cpp rename to ogr/ogrsf_frmts/db2/ogrdb2geometryvalidator.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/ogrdb2layer.cpp b/ogr/ogrsf_frmts/db2/ogrdb2layer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogrdb2layer.cpp rename to ogr/ogrsf_frmts/db2/ogrdb2layer.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/ogrdb2selectlayer.cpp b/ogr/ogrsf_frmts/db2/ogrdb2selectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogrdb2selectlayer.cpp rename to ogr/ogrsf_frmts/db2/ogrdb2selectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/db2/ogrdb2tablelayer.cpp b/ogr/ogrsf_frmts/db2/ogrdb2tablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/db2/ogrdb2tablelayer.cpp rename to ogr/ogrsf_frmts/db2/ogrdb2tablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/CMakeLists.txt b/ogr/ogrsf_frmts/dgn/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/CMakeLists.txt rename to ogr/ogrsf_frmts/dgn/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/dgn/Doxyfile b/ogr/ogrsf_frmts/dgn/Doxyfile similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/Doxyfile rename to ogr/ogrsf_frmts/dgn/Doxyfile diff --git a/gdal/ogr/ogrsf_frmts/dgn/GNUmakefile b/ogr/ogrsf_frmts/dgn/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/GNUmakefile rename to ogr/ogrsf_frmts/dgn/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgndump.cpp b/ogr/ogrsf_frmts/dgn/dgndump.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgndump.cpp rename to ogr/ogrsf_frmts/dgn/dgndump.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnhelp.cpp b/ogr/ogrsf_frmts/dgn/dgnhelp.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgnhelp.cpp rename to ogr/ogrsf_frmts/dgn/dgnhelp.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnlib.h b/ogr/ogrsf_frmts/dgn/dgnlib.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgnlib.h rename to ogr/ogrsf_frmts/dgn/dgnlib.h diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnlibp.h b/ogr/ogrsf_frmts/dgn/dgnlibp.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgnlibp.h rename to ogr/ogrsf_frmts/dgn/dgnlibp.h diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnopen.cpp b/ogr/ogrsf_frmts/dgn/dgnopen.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgnopen.cpp rename to ogr/ogrsf_frmts/dgn/dgnopen.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnread.cpp b/ogr/ogrsf_frmts/dgn/dgnread.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgnread.cpp rename to ogr/ogrsf_frmts/dgn/dgnread.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnstroke.cpp b/ogr/ogrsf_frmts/dgn/dgnstroke.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgnstroke.cpp rename to ogr/ogrsf_frmts/dgn/dgnstroke.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnwrite.cpp b/ogr/ogrsf_frmts/dgn/dgnwrite.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgnwrite.cpp rename to ogr/ogrsf_frmts/dgn/dgnwrite.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp b/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dgnwritetest.cpp rename to ogr/ogrsf_frmts/dgn/dgnwritetest.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/dist/Makefile b/ogr/ogrsf_frmts/dgn/dist/Makefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dist/Makefile rename to ogr/ogrsf_frmts/dgn/dist/Makefile diff --git a/gdal/ogr/ogrsf_frmts/dgn/dist/Makefile.vc b/ogr/ogrsf_frmts/dgn/dist/Makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dist/Makefile.vc rename to ogr/ogrsf_frmts/dgn/dist/Makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/dgn/dist/README b/ogr/ogrsf_frmts/dgn/dist/README similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dist/README rename to ogr/ogrsf_frmts/dgn/dist/README diff --git a/gdal/ogr/ogrsf_frmts/dgn/dist/cpl_config.h b/ogr/ogrsf_frmts/dgn/dist/cpl_config.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/dist/cpl_config.h rename to ogr/ogrsf_frmts/dgn/dist/cpl_config.h diff --git a/gdal/ogr/ogrsf_frmts/dgn/makefile.vc b/ogr/ogrsf_frmts/dgn/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/makefile.vc rename to ogr/ogrsf_frmts/dgn/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/dgn/ogr_dgn.h b/ogr/ogrsf_frmts/dgn/ogr_dgn.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/ogr_dgn.h rename to ogr/ogrsf_frmts/dgn/ogr_dgn.h diff --git a/gdal/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp b/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp rename to ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp b/ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp rename to ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp b/ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp rename to ogr/ogrsf_frmts/dgn/ogrdgnlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dgn/web/index.html b/ogr/ogrsf_frmts/dgn/web/index.html similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/web/index.html rename to ogr/ogrsf_frmts/dgn/web/index.html diff --git a/gdal/ogr/ogrsf_frmts/dgn/web/representation.html b/ogr/ogrsf_frmts/dgn/web/representation.html similarity index 100% rename from gdal/ogr/ogrsf_frmts/dgn/web/representation.html rename to ogr/ogrsf_frmts/dgn/web/representation.html diff --git a/gdal/ogr/ogrsf_frmts/dods/C0101.met.raw.nc.das b/ogr/ogrsf_frmts/dods/C0101.met.raw.nc.das similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/C0101.met.raw.nc.das rename to ogr/ogrsf_frmts/dods/C0101.met.raw.nc.das diff --git a/gdal/ogr/ogrsf_frmts/dods/CMakeLists.txt b/ogr/ogrsf_frmts/dods/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/CMakeLists.txt rename to ogr/ogrsf_frmts/dods/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/dods/GNUmakefile b/ogr/ogrsf_frmts/dods/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/GNUmakefile rename to ogr/ogrsf_frmts/dods/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/dods/bbhenv.dat.das b/ogr/ogrsf_frmts/dods/bbhenv.dat.das similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/bbhenv.dat.das rename to ogr/ogrsf_frmts/dods/bbhenv.dat.das diff --git a/gdal/ogr/ogrsf_frmts/dods/libdap_headers.h b/ogr/ogrsf_frmts/dods/libdap_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/libdap_headers.h rename to ogr/ogrsf_frmts/dods/libdap_headers.h diff --git a/gdal/ogr/ogrsf_frmts/dods/makefile.vc b/ogr/ogrsf_frmts/dods/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/makefile.vc rename to ogr/ogrsf_frmts/dods/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/dods/natl_prof_bot.cdp.das b/ogr/ogrsf_frmts/dods/natl_prof_bot.cdp.das similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/natl_prof_bot.cdp.das rename to ogr/ogrsf_frmts/dods/natl_prof_bot.cdp.das diff --git a/gdal/ogr/ogrsf_frmts/dods/ogr_ais_eg.xml b/ogr/ogrsf_frmts/dods/ogr_ais_eg.xml similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/ogr_ais_eg.xml rename to ogr/ogrsf_frmts/dods/ogr_ais_eg.xml diff --git a/gdal/ogr/ogrsf_frmts/dods/ogr_dods.h b/ogr/ogrsf_frmts/dods/ogr_dods.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/ogr_dods.h rename to ogr/ogrsf_frmts/dods/ogr_dods.h diff --git a/gdal/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp b/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp rename to ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/dods/ogrdodsdriver.cpp b/ogr/ogrsf_frmts/dods/ogrdodsdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/ogrdodsdriver.cpp rename to ogr/ogrsf_frmts/dods/ogrdodsdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/dods/ogrdodsfielddefn.cpp b/ogr/ogrsf_frmts/dods/ogrdodsfielddefn.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/ogrdodsfielddefn.cpp rename to ogr/ogrsf_frmts/dods/ogrdodsfielddefn.cpp diff --git a/gdal/ogr/ogrsf_frmts/dods/ogrdodsgrid.cpp b/ogr/ogrsf_frmts/dods/ogrdodsgrid.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/ogrdodsgrid.cpp rename to ogr/ogrsf_frmts/dods/ogrdodsgrid.cpp diff --git a/gdal/ogr/ogrsf_frmts/dods/ogrdodslayer.cpp b/ogr/ogrsf_frmts/dods/ogrdodslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/ogrdodslayer.cpp rename to ogr/ogrsf_frmts/dods/ogrdodslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dods/ogrdodssequencelayer.cpp b/ogr/ogrsf_frmts/dods/ogrdodssequencelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dods/ogrdodssequencelayer.cpp rename to ogr/ogrsf_frmts/dods/ogrdodssequencelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/CMakeLists.txt b/ogr/ogrsf_frmts/dwg/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/CMakeLists.txt rename to ogr/ogrsf_frmts/dwg/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/dwg/GNUmakefile b/ogr/ogrsf_frmts/dwg/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/GNUmakefile rename to ogr/ogrsf_frmts/dwg/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/dwg/createdgnv8testfile.cpp b/ogr/ogrsf_frmts/dwg/createdgnv8testfile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/createdgnv8testfile.cpp rename to ogr/ogrsf_frmts/dwg/createdgnv8testfile.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/createdgnv8testfile_headers.h b/ogr/ogrsf_frmts/dwg/createdgnv8testfile_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/createdgnv8testfile_headers.h rename to ogr/ogrsf_frmts/dwg/createdgnv8testfile_headers.h diff --git a/gdal/ogr/ogrsf_frmts/dwg/dgnv8_headers.h b/ogr/ogrsf_frmts/dwg/dgnv8_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/dgnv8_headers.h rename to ogr/ogrsf_frmts/dwg/dgnv8_headers.h diff --git a/gdal/ogr/ogrsf_frmts/dwg/dwg_headers.h b/ogr/ogrsf_frmts/dwg/dwg_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/dwg_headers.h rename to ogr/ogrsf_frmts/dwg/dwg_headers.h diff --git a/gdal/ogr/ogrsf_frmts/dwg/makefile.vc b/ogr/ogrsf_frmts/dwg/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/makefile.vc rename to ogr/ogrsf_frmts/dwg/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogr_dgnv8.h b/ogr/ogrsf_frmts/dwg/ogr_dgnv8.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogr_dgnv8.h rename to ogr/ogrsf_frmts/dwg/ogr_dgnv8.h diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogr_dwg.h b/ogr/ogrsf_frmts/dwg/ogr_dwg.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogr_dwg.h rename to ogr/ogrsf_frmts/dwg/ogr_dwg.h diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdgnv8datasource.cpp b/ogr/ogrsf_frmts/dwg/ogrdgnv8datasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdgnv8datasource.cpp rename to ogr/ogrsf_frmts/dwg/ogrdgnv8datasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp b/ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp rename to ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp b/ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp rename to ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp b/ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp rename to ogr/ogrsf_frmts/dwg/ogrdwg_blockmap.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp b/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp rename to ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdwg_hatch.cpp b/ogr/ogrsf_frmts/dwg/ogrdwg_hatch.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdwg_hatch.cpp rename to ogr/ogrsf_frmts/dwg/ogrdwg_hatch.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdwgblockslayer.cpp b/ogr/ogrsf_frmts/dwg/ogrdwgblockslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdwgblockslayer.cpp rename to ogr/ogrsf_frmts/dwg/ogrdwgblockslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp b/ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp rename to ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp b/ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp rename to ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp b/ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp rename to ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrteigha.cpp b/ogr/ogrsf_frmts/dwg/ogrteigha.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrteigha.cpp rename to ogr/ogrsf_frmts/dwg/ogrteigha.cpp diff --git a/gdal/ogr/ogrsf_frmts/dwg/ogrteigha.h b/ogr/ogrsf_frmts/dwg/ogrteigha.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dwg/ogrteigha.h rename to ogr/ogrsf_frmts/dwg/ogrteigha.h diff --git a/gdal/ogr/ogrsf_frmts/dxf/CMakeLists.txt b/ogr/ogrsf_frmts/dxf/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/CMakeLists.txt rename to ogr/ogrsf_frmts/dxf/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/dxf/GNUmakefile b/ogr/ogrsf_frmts/dxf/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/GNUmakefile rename to ogr/ogrsf_frmts/dxf/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/dxf/KNOWN_ISSUES.md b/ogr/ogrsf_frmts/dxf/KNOWN_ISSUES.md similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/KNOWN_ISSUES.md rename to ogr/ogrsf_frmts/dxf/KNOWN_ISSUES.md diff --git a/gdal/ogr/ogrsf_frmts/dxf/intronurbs.cpp b/ogr/ogrsf_frmts/dxf/intronurbs.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/intronurbs.cpp rename to ogr/ogrsf_frmts/dxf/intronurbs.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/makefile.vc b/ogr/ogrsf_frmts/dxf/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/makefile.vc rename to ogr/ogrsf_frmts/dxf/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp b/ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp rename to ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h b/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogr_autocad_services.h rename to ogr/ogrsf_frmts/dxf/ogr_autocad_services.h diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogr_dxf.h b/ogr/ogrsf_frmts/dxf/ogr_dxf.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogr_dxf.h rename to ogr/ogrsf_frmts/dxf/ogr_dxf.h diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_feature.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_feature.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxf_feature.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxf_feature.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.h b/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.h rename to ogr/ogrsf_frmts/dxf/ogrdxf_polyline_smooth.h diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfblockslayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfblockslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxfblockslayer.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxfblockslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfblockswriterlayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfblockswriterlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxfblockswriterlayer.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxfblockswriterlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp diff --git a/gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp rename to ogr/ogrsf_frmts/dxf/ogrdxfwriterlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/edigeo/CMakeLists.txt b/ogr/ogrsf_frmts/edigeo/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/edigeo/CMakeLists.txt rename to ogr/ogrsf_frmts/edigeo/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/edigeo/GNUmakefile b/ogr/ogrsf_frmts/edigeo/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/edigeo/GNUmakefile rename to ogr/ogrsf_frmts/edigeo/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/edigeo/makefile.vc b/ogr/ogrsf_frmts/edigeo/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/edigeo/makefile.vc rename to ogr/ogrsf_frmts/edigeo/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h b/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/edigeo/ogr_edigeo.h rename to ogr/ogrsf_frmts/edigeo/ogr_edigeo.h diff --git a/gdal/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp b/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp rename to ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp b/ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp rename to ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/edigeo/ogredigeolayer.cpp b/ogr/ogrsf_frmts/edigeo/ogredigeolayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/edigeo/ogredigeolayer.cpp rename to ogr/ogrsf_frmts/edigeo/ogredigeolayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/elastic/CMakeLists.txt b/ogr/ogrsf_frmts/elastic/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/elastic/CMakeLists.txt rename to ogr/ogrsf_frmts/elastic/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/elastic/GNUmakefile b/ogr/ogrsf_frmts/elastic/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/elastic/GNUmakefile rename to ogr/ogrsf_frmts/elastic/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/elastic/makefile.vc b/ogr/ogrsf_frmts/elastic/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/elastic/makefile.vc rename to ogr/ogrsf_frmts/elastic/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogr_elastic.h b/ogr/ogrsf_frmts/elastic/ogr_elastic.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/elastic/ogr_elastic.h rename to ogr/ogrsf_frmts/elastic/ogr_elastic.h diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp rename to ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp rename to ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp rename to ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/filegdb/CMakeLists.txt b/ogr/ogrsf_frmts/filegdb/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/CMakeLists.txt rename to ogr/ogrsf_frmts/filegdb/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp b/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp rename to ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp b/ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp rename to ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp rename to ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp b/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp rename to ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp b/ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp rename to ogr/ogrsf_frmts/filegdb/FGdbUtils.cpp diff --git a/gdal/ogr/ogrsf_frmts/filegdb/FGdbUtils.h b/ogr/ogrsf_frmts/filegdb/FGdbUtils.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/FGdbUtils.h rename to ogr/ogrsf_frmts/filegdb/FGdbUtils.h diff --git a/gdal/ogr/ogrsf_frmts/filegdb/GNUmakefile b/ogr/ogrsf_frmts/filegdb/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/GNUmakefile rename to ogr/ogrsf_frmts/filegdb/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/filegdb/filegdbsdk_headers.h b/ogr/ogrsf_frmts/filegdb/filegdbsdk_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/filegdbsdk_headers.h rename to ogr/ogrsf_frmts/filegdb/filegdbsdk_headers.h diff --git a/gdal/ogr/ogrsf_frmts/filegdb/makefile.vc b/ogr/ogrsf_frmts/filegdb/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/makefile.vc rename to ogr/ogrsf_frmts/filegdb/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h b/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h rename to ogr/ogrsf_frmts/filegdb/ogr_fgdb.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt b/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt rename to ogr/ogrsf_frmts/flatgeobuf/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/GNUmakefile b/ogr/ogrsf_frmts/flatgeobuf/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/GNUmakefile rename to ogr/ogrsf_frmts/flatgeobuf/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/LICENSE b/ogr/ogrsf_frmts/flatgeobuf/LICENSE similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/LICENSE rename to ogr/ogrsf_frmts/flatgeobuf/LICENSE diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/cplerrors.h b/ogr/ogrsf_frmts/flatgeobuf/cplerrors.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/cplerrors.h rename to ogr/ogrsf_frmts/flatgeobuf/cplerrors.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/feature_generated.h b/ogr/ogrsf_frmts/flatgeobuf/feature_generated.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/feature_generated.h rename to ogr/ogrsf_frmts/flatgeobuf/feature_generated.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/LICENSE b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/LICENSE similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/LICENSE rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/LICENSE diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/code_generators.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/code_generators.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/code_generators.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/code_generators.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatbuffers.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatbuffers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatbuffers.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatbuffers.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatc.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatc.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatc.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatc.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flexbuffers.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flexbuffers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flexbuffers.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flexbuffers.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/grpc.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/grpc.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/grpc.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/grpc.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/hash.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/hash.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/hash.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/hash.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/idl.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/idl.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/idl.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/idl.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/minireflect.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/minireflect.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/minireflect.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/minireflect.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/flatc_pch.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/flatc_pch.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/flatc_pch.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/flatc_pch.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/pch.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/pch.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/pch.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/pch.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/reflection.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/reflection.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/reflection.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/reflection.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/reflection_generated.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/reflection_generated.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/reflection_generated.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/reflection_generated.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/registry.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/registry.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/registry.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/registry.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/stl_emulation.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/stl_emulation.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/stl_emulation.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/stl_emulation.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/util.h b/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/util.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/util.h rename to ogr/ogrsf_frmts/flatgeobuf/flatbuffers/util.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/geometryreader.cpp b/ogr/ogrsf_frmts/flatgeobuf/geometryreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/geometryreader.cpp rename to ogr/ogrsf_frmts/flatgeobuf/geometryreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/geometryreader.h b/ogr/ogrsf_frmts/flatgeobuf/geometryreader.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/geometryreader.h rename to ogr/ogrsf_frmts/flatgeobuf/geometryreader.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp b/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp rename to ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h b/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h rename to ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/header_generated.h b/ogr/ogrsf_frmts/flatgeobuf/header_generated.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/header_generated.h rename to ogr/ogrsf_frmts/flatgeobuf/header_generated.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/makefile.vc b/ogr/ogrsf_frmts/flatgeobuf/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/makefile.vc rename to ogr/ogrsf_frmts/flatgeobuf/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h b/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h rename to ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufdataset.cpp b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufdataset.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufdataset.cpp rename to ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufdataset.cpp diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp rename to ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp b/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp rename to ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp b/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp rename to ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/packedrtree.h b/ogr/ogrsf_frmts/flatgeobuf/packedrtree.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/flatgeobuf/packedrtree.h rename to ogr/ogrsf_frmts/flatgeobuf/packedrtree.h diff --git a/gdal/ogr/ogrsf_frmts/fme/CMakeLists.txt b/ogr/ogrsf_frmts/fme/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/CMakeLists.txt rename to ogr/ogrsf_frmts/fme/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/fme/GNUmakefile b/ogr/ogrsf_frmts/fme/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/GNUmakefile rename to ogr/ogrsf_frmts/fme/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/fme/fme2ogr.h b/ogr/ogrsf_frmts/fme/fme2ogr.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/fme2ogr.h rename to ogr/ogrsf_frmts/fme/fme2ogr.h diff --git a/gdal/ogr/ogrsf_frmts/fme/fme2ogr_utils.cpp b/ogr/ogrsf_frmts/fme/fme2ogr_utils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/fme2ogr_utils.cpp rename to ogr/ogrsf_frmts/fme/fme2ogr_utils.cpp diff --git a/gdal/ogr/ogrsf_frmts/fme/makefile.vc b/ogr/ogrsf_frmts/fme/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/makefile.vc rename to ogr/ogrsf_frmts/fme/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/fme/ogrfmecacheindex.cpp b/ogr/ogrsf_frmts/fme/ogrfmecacheindex.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/ogrfmecacheindex.cpp rename to ogr/ogrsf_frmts/fme/ogrfmecacheindex.cpp diff --git a/gdal/ogr/ogrsf_frmts/fme/ogrfmedatasource.cpp b/ogr/ogrsf_frmts/fme/ogrfmedatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/ogrfmedatasource.cpp rename to ogr/ogrsf_frmts/fme/ogrfmedatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/fme/ogrfmedriver.cpp b/ogr/ogrsf_frmts/fme/ogrfmedriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/ogrfmedriver.cpp rename to ogr/ogrsf_frmts/fme/ogrfmedriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/fme/ogrfmelayer.cpp b/ogr/ogrsf_frmts/fme/ogrfmelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/ogrfmelayer.cpp rename to ogr/ogrsf_frmts/fme/ogrfmelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/fme/ogrfmelayercached.cpp b/ogr/ogrsf_frmts/fme/ogrfmelayercached.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/ogrfmelayercached.cpp rename to ogr/ogrsf_frmts/fme/ogrfmelayercached.cpp diff --git a/gdal/ogr/ogrsf_frmts/fme/ogrfmelayerdb.cpp b/ogr/ogrsf_frmts/fme/ogrfmelayerdb.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/fme/ogrfmelayerdb.cpp rename to ogr/ogrsf_frmts/fme/ogrfmelayerdb.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/CMakeLists.txt b/ogr/ogrsf_frmts/generic/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/CMakeLists.txt rename to ogr/ogrsf_frmts/generic/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/generic/GNUmakefile b/ogr/ogrsf_frmts/generic/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/GNUmakefile rename to ogr/ogrsf_frmts/generic/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/generic/makefile.vc b/ogr/ogrsf_frmts/generic/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/makefile.vc rename to ogr/ogrsf_frmts/generic/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/generic/ogr_attrind.cpp b/ogr/ogrsf_frmts/generic/ogr_attrind.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogr_attrind.cpp rename to ogr/ogrsf_frmts/generic/ogr_attrind.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.cpp b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogr_gensql.cpp rename to ogr/ogrsf_frmts/generic/ogr_gensql.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.h b/ogr/ogrsf_frmts/generic/ogr_gensql.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogr_gensql.h rename to ogr/ogrsf_frmts/generic/ogr_gensql.h diff --git a/gdal/ogr/ogrsf_frmts/generic/ogr_miattrind.cpp b/ogr/ogrsf_frmts/generic/ogr_miattrind.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogr_miattrind.cpp rename to ogr/ogrsf_frmts/generic/ogr_miattrind.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrdatasource.cpp b/ogr/ogrsf_frmts/generic/ogrdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrdatasource.cpp rename to ogr/ogrsf_frmts/generic/ogrdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogreditablelayer.cpp b/ogr/ogrsf_frmts/generic/ogreditablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogreditablelayer.cpp rename to ogr/ogrsf_frmts/generic/ogreditablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogreditablelayer.h b/ogr/ogrsf_frmts/generic/ogreditablelayer.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogreditablelayer.h rename to ogr/ogrsf_frmts/generic/ogreditablelayer.h diff --git a/gdal/ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp b/ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp rename to ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h b/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogremulatedtransaction.h rename to ogr/ogrsf_frmts/generic/ogremulatedtransaction.h diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrlayer.cpp b/ogr/ogrsf_frmts/generic/ogrlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrlayer.cpp rename to ogr/ogrsf_frmts/generic/ogrlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrlayerdecorator.cpp b/ogr/ogrsf_frmts/generic/ogrlayerdecorator.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrlayerdecorator.cpp rename to ogr/ogrsf_frmts/generic/ogrlayerdecorator.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h b/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrlayerdecorator.h rename to ogr/ogrsf_frmts/generic/ogrlayerdecorator.h diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrlayerpool.cpp b/ogr/ogrsf_frmts/generic/ogrlayerpool.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrlayerpool.cpp rename to ogr/ogrsf_frmts/generic/ogrlayerpool.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrlayerpool.h b/ogr/ogrsf_frmts/generic/ogrlayerpool.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrlayerpool.h rename to ogr/ogrsf_frmts/generic/ogrlayerpool.h diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp b/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp rename to ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h b/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h rename to ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp b/ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp rename to ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h b/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrmutexedlayer.h rename to ogr/ogrsf_frmts/generic/ogrmutexedlayer.h diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrregisterall.cpp b/ogr/ogrsf_frmts/generic/ogrregisterall.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrregisterall.cpp rename to ogr/ogrsf_frmts/generic/ogrregisterall.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrsfdriver.cpp b/ogr/ogrsf_frmts/generic/ogrsfdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrsfdriver.cpp rename to ogr/ogrsf_frmts/generic/ogrsfdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp b/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp rename to ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp b/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp rename to ogr/ogrsf_frmts/generic/ogrunionlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrunionlayer.h b/ogr/ogrsf_frmts/generic/ogrunionlayer.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrunionlayer.h rename to ogr/ogrsf_frmts/generic/ogrunionlayer.h diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrwarpedlayer.cpp b/ogr/ogrsf_frmts/generic/ogrwarpedlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrwarpedlayer.cpp rename to ogr/ogrsf_frmts/generic/ogrwarpedlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h b/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/generic/ogrwarpedlayer.h rename to ogr/ogrsf_frmts/generic/ogrwarpedlayer.h diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/CMakeLists.txt b/ogr/ogrsf_frmts/geoconcept/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/CMakeLists.txt rename to ogr/ogrsf_frmts/geoconcept/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/GNUmakefile b/ogr/ogrsf_frmts/geoconcept/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/GNUmakefile rename to ogr/ogrsf_frmts/geoconcept/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/geoconcept.c b/ogr/ogrsf_frmts/geoconcept/geoconcept.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/geoconcept.c rename to ogr/ogrsf_frmts/geoconcept/geoconcept.c diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/geoconcept.h b/ogr/ogrsf_frmts/geoconcept/geoconcept.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/geoconcept.h rename to ogr/ogrsf_frmts/geoconcept/geoconcept.h diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c b/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c rename to ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.h b/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.h rename to ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.h diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/makefile.vc b/ogr/ogrsf_frmts/geoconcept/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/makefile.vc rename to ogr/ogrsf_frmts/geoconcept/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.cpp b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.cpp rename to ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.h b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.h rename to ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdatasource.h diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp rename to ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.h b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.h rename to ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.h diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp rename to ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h b/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h rename to ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/CMakeLists.txt b/ogr/ogrsf_frmts/geojson/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/CMakeLists.txt rename to ogr/ogrsf_frmts/geojson/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/geojson/GNUmakefile b/ogr/ogrsf_frmts/geojson/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/GNUmakefile rename to ogr/ogrsf_frmts/geojson/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp b/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp rename to ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/AUTHORS b/ogr/ogrsf_frmts/geojson/libjson/AUTHORS similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/AUTHORS rename to ogr/ogrsf_frmts/geojson/libjson/AUTHORS diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/CMakeLists.txt b/ogr/ogrsf_frmts/geojson/libjson/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/CMakeLists.txt rename to ogr/ogrsf_frmts/geojson/libjson/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/COPYING b/ogr/ogrsf_frmts/geojson/libjson/COPYING similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/COPYING rename to ogr/ogrsf_frmts/geojson/libjson/COPYING diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/ChangeLog b/ogr/ogrsf_frmts/geojson/libjson/ChangeLog similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/ChangeLog rename to ogr/ogrsf_frmts/geojson/libjson/ChangeLog diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/GNUmakefile b/ogr/ogrsf_frmts/geojson/libjson/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/GNUmakefile rename to ogr/ogrsf_frmts/geojson/libjson/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/README b/ogr/ogrsf_frmts/geojson/libjson/README similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/README rename to ogr/ogrsf_frmts/geojson/libjson/README diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/README.html b/ogr/ogrsf_frmts/geojson/libjson/README.html similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/README.html rename to ogr/ogrsf_frmts/geojson/libjson/README.html diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/arraylist.c b/ogr/ogrsf_frmts/geojson/libjson/arraylist.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/arraylist.c rename to ogr/ogrsf_frmts/geojson/libjson/arraylist.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/arraylist.h b/ogr/ogrsf_frmts/geojson/libjson/arraylist.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/arraylist.h rename to ogr/ogrsf_frmts/geojson/libjson/arraylist.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/bits.h b/ogr/ogrsf_frmts/geojson/libjson/bits.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/bits.h rename to ogr/ogrsf_frmts/geojson/libjson/bits.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/config.h b/ogr/ogrsf_frmts/geojson/libjson/config.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/config.h rename to ogr/ogrsf_frmts/geojson/libjson/config.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/debug.c b/ogr/ogrsf_frmts/geojson/libjson/debug.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/debug.c rename to ogr/ogrsf_frmts/geojson/libjson/debug.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/debug.h b/ogr/ogrsf_frmts/geojson/libjson/debug.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/debug.h rename to ogr/ogrsf_frmts/geojson/libjson/debug.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/dump_symbols.sh b/ogr/ogrsf_frmts/geojson/libjson/dump_symbols.sh similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/dump_symbols.sh rename to ogr/ogrsf_frmts/geojson/libjson/dump_symbols.sh diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json.h b/ogr/ogrsf_frmts/geojson/libjson/json.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json.h rename to ogr/ogrsf_frmts/geojson/libjson/json.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_c_version.c b/ogr/ogrsf_frmts/geojson/libjson/json_c_version.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_c_version.c rename to ogr/ogrsf_frmts/geojson/libjson/json_c_version.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_c_version.h b/ogr/ogrsf_frmts/geojson/libjson/json_c_version.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_c_version.h rename to ogr/ogrsf_frmts/geojson/libjson/json_c_version.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_config.h b/ogr/ogrsf_frmts/geojson/libjson/json_config.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_config.h rename to ogr/ogrsf_frmts/geojson/libjson/json_config.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_inttypes.h b/ogr/ogrsf_frmts/geojson/libjson/json_inttypes.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_inttypes.h rename to ogr/ogrsf_frmts/geojson/libjson/json_inttypes.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_object.c b/ogr/ogrsf_frmts/geojson/libjson/json_object.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_object.c rename to ogr/ogrsf_frmts/geojson/libjson/json_object.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_object.h b/ogr/ogrsf_frmts/geojson/libjson/json_object.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_object.h rename to ogr/ogrsf_frmts/geojson/libjson/json_object.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_object_iterator.c b/ogr/ogrsf_frmts/geojson/libjson/json_object_iterator.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_object_iterator.c rename to ogr/ogrsf_frmts/geojson/libjson/json_object_iterator.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_object_iterator.h b/ogr/ogrsf_frmts/geojson/libjson/json_object_iterator.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_object_iterator.h rename to ogr/ogrsf_frmts/geojson/libjson/json_object_iterator.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_object_private.h b/ogr/ogrsf_frmts/geojson/libjson/json_object_private.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_object_private.h rename to ogr/ogrsf_frmts/geojson/libjson/json_object_private.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c b/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.c rename to ogr/ogrsf_frmts/geojson/libjson/json_tokener.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.h b/ogr/ogrsf_frmts/geojson/libjson/json_tokener.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_tokener.h rename to ogr/ogrsf_frmts/geojson/libjson/json_tokener.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_util.c b/ogr/ogrsf_frmts/geojson/libjson/json_util.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_util.c rename to ogr/ogrsf_frmts/geojson/libjson/json_util.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/json_util.h b/ogr/ogrsf_frmts/geojson/libjson/json_util.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/json_util.h rename to ogr/ogrsf_frmts/geojson/libjson/json_util.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/linkhash.c b/ogr/ogrsf_frmts/geojson/libjson/linkhash.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/linkhash.c rename to ogr/ogrsf_frmts/geojson/libjson/linkhash.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/linkhash.h b/ogr/ogrsf_frmts/geojson/libjson/linkhash.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/linkhash.h rename to ogr/ogrsf_frmts/geojson/libjson/linkhash.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/makefile.vc b/ogr/ogrsf_frmts/geojson/libjson/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/makefile.vc rename to ogr/ogrsf_frmts/geojson/libjson/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/printbuf.c b/ogr/ogrsf_frmts/geojson/libjson/printbuf.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/printbuf.c rename to ogr/ogrsf_frmts/geojson/libjson/printbuf.c diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/printbuf.h b/ogr/ogrsf_frmts/geojson/libjson/printbuf.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/printbuf.h rename to ogr/ogrsf_frmts/geojson/libjson/printbuf.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/libjson/symbol_renames.h b/ogr/ogrsf_frmts/geojson/libjson/symbol_renames.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/libjson/symbol_renames.h rename to ogr/ogrsf_frmts/geojson/libjson/symbol_renames.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/makefile.vc b/ogr/ogrsf_frmts/geojson/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/makefile.vc rename to ogr/ogrsf_frmts/geojson/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogr_geojson.h b/ogr/ogrsf_frmts/geojson/ogr_geojson.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogr_geojson.h rename to ogr/ogrsf_frmts/geojson/ogr_geojson.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp b/ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp rename to ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp b/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp rename to ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp rename to ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp rename to ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp rename to ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp rename to ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h rename to ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp rename to ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp rename to ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h b/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h rename to ogr/ogrsf_frmts/geojson/ogrgeojsonutils.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp rename to ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp rename to ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h b/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h rename to ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp b/ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp rename to ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp b/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp rename to ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/geomedia/CMakeLists.txt b/ogr/ogrsf_frmts/geomedia/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/CMakeLists.txt rename to ogr/ogrsf_frmts/geomedia/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/geomedia/GNUmakefile b/ogr/ogrsf_frmts/geomedia/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/GNUmakefile rename to ogr/ogrsf_frmts/geomedia/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/geomedia/makefile.vc b/ogr/ogrsf_frmts/geomedia/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/makefile.vc rename to ogr/ogrsf_frmts/geomedia/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/geomedia/ogr_geomedia.h b/ogr/ogrsf_frmts/geomedia/ogr_geomedia.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/ogr_geomedia.h rename to ogr/ogrsf_frmts/geomedia/ogr_geomedia.h diff --git a/gdal/ogr/ogrsf_frmts/geomedia/ogrgeomediadatasource.cpp b/ogr/ogrsf_frmts/geomedia/ogrgeomediadatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/ogrgeomediadatasource.cpp rename to ogr/ogrsf_frmts/geomedia/ogrgeomediadatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/geomedia/ogrgeomediadriver.cpp b/ogr/ogrsf_frmts/geomedia/ogrgeomediadriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/ogrgeomediadriver.cpp rename to ogr/ogrsf_frmts/geomedia/ogrgeomediadriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/geomedia/ogrgeomedialayer.cpp b/ogr/ogrsf_frmts/geomedia/ogrgeomedialayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/ogrgeomedialayer.cpp rename to ogr/ogrsf_frmts/geomedia/ogrgeomedialayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/geomedia/ogrgeomediaselectlayer.cpp b/ogr/ogrsf_frmts/geomedia/ogrgeomediaselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/ogrgeomediaselectlayer.cpp rename to ogr/ogrsf_frmts/geomedia/ogrgeomediaselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/geomedia/ogrgeomediatablelayer.cpp b/ogr/ogrsf_frmts/geomedia/ogrgeomediatablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/geomedia/ogrgeomediatablelayer.cpp rename to ogr/ogrsf_frmts/geomedia/ogrgeomediatablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/georss/CMakeLists.txt b/ogr/ogrsf_frmts/georss/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/georss/CMakeLists.txt rename to ogr/ogrsf_frmts/georss/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/georss/GNUmakefile b/ogr/ogrsf_frmts/georss/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/georss/GNUmakefile rename to ogr/ogrsf_frmts/georss/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/georss/makefile.vc b/ogr/ogrsf_frmts/georss/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/georss/makefile.vc rename to ogr/ogrsf_frmts/georss/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/georss/ogr_georss.h b/ogr/ogrsf_frmts/georss/ogr_georss.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/georss/ogr_georss.h rename to ogr/ogrsf_frmts/georss/ogr_georss.h diff --git a/gdal/ogr/ogrsf_frmts/georss/ogrgeorssdatasource.cpp b/ogr/ogrsf_frmts/georss/ogrgeorssdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/georss/ogrgeorssdatasource.cpp rename to ogr/ogrsf_frmts/georss/ogrgeorssdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp b/ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp rename to ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp b/ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp rename to ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/CMakeLists.txt b/ogr/ogrsf_frmts/gml/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/CMakeLists.txt rename to ogr/ogrsf_frmts/gml/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/gml/GNUmakefile b/ogr/ogrsf_frmts/gml/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/GNUmakefile rename to ogr/ogrsf_frmts/gml/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/gml/gfstemplate.cpp b/ogr/ogrsf_frmts/gml/gfstemplate.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gfstemplate.cpp rename to ogr/ogrsf_frmts/gml/gfstemplate.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlfeature.cpp b/ogr/ogrsf_frmts/gml/gmlfeature.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlfeature.cpp rename to ogr/ogrsf_frmts/gml/gmlfeature.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp b/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp rename to ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp b/ogr/ogrsf_frmts/gml/gmlhandler.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp rename to ogr/ogrsf_frmts/gml/gmlhandler.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlpropertydefn.cpp b/ogr/ogrsf_frmts/gml/gmlpropertydefn.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlpropertydefn.cpp rename to ogr/ogrsf_frmts/gml/gmlpropertydefn.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlreader.cpp b/ogr/ogrsf_frmts/gml/gmlreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlreader.cpp rename to ogr/ogrsf_frmts/gml/gmlreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlreader.h b/ogr/ogrsf_frmts/gml/gmlreader.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlreader.h rename to ogr/ogrsf_frmts/gml/gmlreader.h diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlreaderp.h b/ogr/ogrsf_frmts/gml/gmlreaderp.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlreaderp.h rename to ogr/ogrsf_frmts/gml/gmlreaderp.h diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlreadstate.cpp b/ogr/ogrsf_frmts/gml/gmlreadstate.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlreadstate.cpp rename to ogr/ogrsf_frmts/gml/gmlreadstate.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlregistry.cpp b/ogr/ogrsf_frmts/gml/gmlregistry.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlregistry.cpp rename to ogr/ogrsf_frmts/gml/gmlregistry.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlregistry.h b/ogr/ogrsf_frmts/gml/gmlregistry.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlregistry.h rename to ogr/ogrsf_frmts/gml/gmlregistry.h diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlutils.cpp b/ogr/ogrsf_frmts/gml/gmlutils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlutils.cpp rename to ogr/ogrsf_frmts/gml/gmlutils.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/gmlutils.h b/ogr/ogrsf_frmts/gml/gmlutils.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/gmlutils.h rename to ogr/ogrsf_frmts/gml/gmlutils.h diff --git a/gdal/ogr/ogrsf_frmts/gml/hugefileresolver.cpp b/ogr/ogrsf_frmts/gml/hugefileresolver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/hugefileresolver.cpp rename to ogr/ogrsf_frmts/gml/hugefileresolver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/makefile.vc b/ogr/ogrsf_frmts/gml/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/makefile.vc rename to ogr/ogrsf_frmts/gml/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/gml/ogr_gml.h b/ogr/ogrsf_frmts/gml/ogr_gml.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/ogr_gml.h rename to ogr/ogrsf_frmts/gml/ogr_gml.h diff --git a/gdal/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp b/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp rename to ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp b/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp rename to ogr/ogrsf_frmts/gml/ogrgmldriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp b/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp rename to ogr/ogrsf_frmts/gml/ogrgmllayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp b/ogr/ogrsf_frmts/gml/parsexsd.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp rename to ogr/ogrsf_frmts/gml/parsexsd.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/parsexsd.h b/ogr/ogrsf_frmts/gml/parsexsd.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/parsexsd.h rename to ogr/ogrsf_frmts/gml/parsexsd.h diff --git a/gdal/ogr/ogrsf_frmts/gml/resolvexlinks.cpp b/ogr/ogrsf_frmts/gml/resolvexlinks.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/resolvexlinks.cpp rename to ogr/ogrsf_frmts/gml/resolvexlinks.cpp diff --git a/gdal/ogr/ogrsf_frmts/gml/xercesc_headers.h b/ogr/ogrsf_frmts/gml/xercesc_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gml/xercesc_headers.h rename to ogr/ogrsf_frmts/gml/xercesc_headers.h diff --git a/gdal/ogr/ogrsf_frmts/gmlas/CMakeLists.txt b/ogr/ogrsf_frmts/gmlas/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/CMakeLists.txt rename to ogr/ogrsf_frmts/gmlas/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/gmlas/GNUmakefile b/ogr/ogrsf_frmts/gmlas/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/GNUmakefile rename to ogr/ogrsf_frmts/gmlas/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/gmlas/makefile.vc b/ogr/ogrsf_frmts/gmlas/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/makefile.vc rename to ogr/ogrsf_frmts/gmlas/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h b/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h rename to ogr/ogrsf_frmts/gmlas/ogr_gmlas.h diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h b/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h rename to ogr/ogrsf_frmts/gmlas/ogr_gmlas_consts.h diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp rename to ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmlas/xercesc_headers.h b/ogr/ogrsf_frmts/gmlas/xercesc_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmlas/xercesc_headers.h rename to ogr/ogrsf_frmts/gmlas/xercesc_headers.h diff --git a/gdal/ogr/ogrsf_frmts/gmt/CMakeLists.txt b/ogr/ogrsf_frmts/gmt/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmt/CMakeLists.txt rename to ogr/ogrsf_frmts/gmt/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/gmt/GNUmakefile b/ogr/ogrsf_frmts/gmt/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmt/GNUmakefile rename to ogr/ogrsf_frmts/gmt/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/gmt/makefile.vc b/ogr/ogrsf_frmts/gmt/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmt/makefile.vc rename to ogr/ogrsf_frmts/gmt/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/gmt/ogr_gmt.h b/ogr/ogrsf_frmts/gmt/ogr_gmt.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmt/ogr_gmt.h rename to ogr/ogrsf_frmts/gmt/ogr_gmt.h diff --git a/gdal/ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp b/ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp rename to ogr/ogrsf_frmts/gmt/ogrgmtdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp b/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp rename to ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp b/ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp rename to ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpkg/CMakeLists.txt b/ogr/ogrsf_frmts/gpkg/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/CMakeLists.txt rename to ogr/ogrsf_frmts/gpkg/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/gpkg/GNUmakefile b/ogr/ogrsf_frmts/gpkg/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/GNUmakefile rename to ogr/ogrsf_frmts/gpkg/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp b/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp rename to ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpkg/geopackage_aspatial.md b/ogr/ogrsf_frmts/gpkg/geopackage_aspatial.md similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/geopackage_aspatial.md rename to ogr/ogrsf_frmts/gpkg/geopackage_aspatial.md diff --git a/gdal/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h b/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h rename to ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h diff --git a/gdal/ogr/ogrsf_frmts/gpkg/makefile.vc b/ogr/ogrsf_frmts/gpkg/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/makefile.vc rename to ogr/ogrsf_frmts/gpkg/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h b/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h rename to ogr/ogrsf_frmts/gpkg/ogr_geopackage.h diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp rename to ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp rename to ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp rename to ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackageselectlayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackageselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackageselectlayer.cpp rename to ogr/ogrsf_frmts/gpkg/ogrgeopackageselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp rename to ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp rename to ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h b/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h rename to ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.h diff --git a/gdal/ogr/ogrsf_frmts/gpsbabel/CMakeLists.txt b/ogr/ogrsf_frmts/gpsbabel/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpsbabel/CMakeLists.txt rename to ogr/ogrsf_frmts/gpsbabel/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/gpsbabel/GNUmakefile b/ogr/ogrsf_frmts/gpsbabel/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpsbabel/GNUmakefile rename to ogr/ogrsf_frmts/gpsbabel/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/gpsbabel/makefile.vc b/ogr/ogrsf_frmts/gpsbabel/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpsbabel/makefile.vc rename to ogr/ogrsf_frmts/gpsbabel/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h b/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h rename to ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h diff --git a/gdal/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp rename to ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp rename to ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabelwritedatasource.cpp b/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabelwritedatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpsbabel/ogrgpsbabelwritedatasource.cpp rename to ogr/ogrsf_frmts/gpsbabel/ogrgpsbabelwritedatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpx/CMakeLists.txt b/ogr/ogrsf_frmts/gpx/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpx/CMakeLists.txt rename to ogr/ogrsf_frmts/gpx/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/gpx/GNUmakefile b/ogr/ogrsf_frmts/gpx/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpx/GNUmakefile rename to ogr/ogrsf_frmts/gpx/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/gpx/makefile.vc b/ogr/ogrsf_frmts/gpx/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpx/makefile.vc rename to ogr/ogrsf_frmts/gpx/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/gpx/ogr_gpx.h b/ogr/ogrsf_frmts/gpx/ogr_gpx.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpx/ogr_gpx.h rename to ogr/ogrsf_frmts/gpx/ogr_gpx.h diff --git a/gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp b/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp rename to ogr/ogrsf_frmts/gpx/ogrgpxdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp b/ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp rename to ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp b/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp rename to ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/grass/CMakeLists.txt b/ogr/ogrsf_frmts/grass/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/grass/CMakeLists.txt rename to ogr/ogrsf_frmts/grass/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/grass/GNUmakefile b/ogr/ogrsf_frmts/grass/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/grass/GNUmakefile rename to ogr/ogrsf_frmts/grass/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/grass/ogrgrass.h b/ogr/ogrsf_frmts/grass/ogrgrass.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/grass/ogrgrass.h rename to ogr/ogrsf_frmts/grass/ogrgrass.h diff --git a/gdal/ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp b/ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp rename to ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/grass/ogrgrassdriver.cpp b/ogr/ogrsf_frmts/grass/ogrgrassdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/grass/ogrgrassdriver.cpp rename to ogr/ogrsf_frmts/grass/ogrgrassdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/grass/ogrgrasslayer.cpp b/ogr/ogrsf_frmts/grass/ogrgrasslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/grass/ogrgrasslayer.cpp rename to ogr/ogrsf_frmts/grass/ogrgrasslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gtm/CMakeLists.txt b/ogr/ogrsf_frmts/gtm/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/CMakeLists.txt rename to ogr/ogrsf_frmts/gtm/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/gtm/GNUmakefile b/ogr/ogrsf_frmts/gtm/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/GNUmakefile rename to ogr/ogrsf_frmts/gtm/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/gtm/gtm.cpp b/ogr/ogrsf_frmts/gtm/gtm.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/gtm.cpp rename to ogr/ogrsf_frmts/gtm/gtm.cpp diff --git a/gdal/ogr/ogrsf_frmts/gtm/gtm.h b/ogr/ogrsf_frmts/gtm/gtm.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/gtm.h rename to ogr/ogrsf_frmts/gtm/gtm.h diff --git a/gdal/ogr/ogrsf_frmts/gtm/gtmtracklayer.cpp b/ogr/ogrsf_frmts/gtm/gtmtracklayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/gtmtracklayer.cpp rename to ogr/ogrsf_frmts/gtm/gtmtracklayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gtm/gtmwaypointlayer.cpp b/ogr/ogrsf_frmts/gtm/gtmwaypointlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/gtmwaypointlayer.cpp rename to ogr/ogrsf_frmts/gtm/gtmwaypointlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/gtm/makefile.vc b/ogr/ogrsf_frmts/gtm/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/makefile.vc rename to ogr/ogrsf_frmts/gtm/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/gtm/ogr_gtm.h b/ogr/ogrsf_frmts/gtm/ogr_gtm.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/ogr_gtm.h rename to ogr/ogrsf_frmts/gtm/ogr_gtm.h diff --git a/gdal/ogr/ogrsf_frmts/gtm/ogrgtmdatasource.cpp b/ogr/ogrsf_frmts/gtm/ogrgtmdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/ogrgtmdatasource.cpp rename to ogr/ogrsf_frmts/gtm/ogrgtmdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/gtm/ogrgtmdriver.cpp b/ogr/ogrsf_frmts/gtm/ogrgtmdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/ogrgtmdriver.cpp rename to ogr/ogrsf_frmts/gtm/ogrgtmdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/gtm/ogrgtmlayer.cpp b/ogr/ogrsf_frmts/gtm/ogrgtmlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/gtm/ogrgtmlayer.cpp rename to ogr/ogrsf_frmts/gtm/ogrgtmlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/idb/CMakeLists.txt b/ogr/ogrsf_frmts/idb/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/CMakeLists.txt rename to ogr/ogrsf_frmts/idb/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/idb/GNUmakefile b/ogr/ogrsf_frmts/idb/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/GNUmakefile rename to ogr/ogrsf_frmts/idb/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/idb/idb_headers.h b/ogr/ogrsf_frmts/idb/idb_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/idb_headers.h rename to ogr/ogrsf_frmts/idb/idb_headers.h diff --git a/gdal/ogr/ogrsf_frmts/idb/makefile.vc b/ogr/ogrsf_frmts/idb/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/makefile.vc rename to ogr/ogrsf_frmts/idb/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/idb/ogr_idb.h b/ogr/ogrsf_frmts/idb/ogr_idb.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/ogr_idb.h rename to ogr/ogrsf_frmts/idb/ogr_idb.h diff --git a/gdal/ogr/ogrsf_frmts/idb/ogridbdatasource.cpp b/ogr/ogrsf_frmts/idb/ogridbdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/ogridbdatasource.cpp rename to ogr/ogrsf_frmts/idb/ogridbdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/idb/ogridbdriver.cpp b/ogr/ogrsf_frmts/idb/ogridbdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/ogridbdriver.cpp rename to ogr/ogrsf_frmts/idb/ogridbdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/idb/ogridblayer.cpp b/ogr/ogrsf_frmts/idb/ogridblayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/ogridblayer.cpp rename to ogr/ogrsf_frmts/idb/ogridblayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/idb/ogridbselectlayer.cpp b/ogr/ogrsf_frmts/idb/ogridbselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/ogridbselectlayer.cpp rename to ogr/ogrsf_frmts/idb/ogridbselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/idb/ogridbtablelayer.cpp b/ogr/ogrsf_frmts/idb/ogridbtablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/idb/ogridbtablelayer.cpp rename to ogr/ogrsf_frmts/idb/ogridbtablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/idrisi/CMakeLists.txt b/ogr/ogrsf_frmts/idrisi/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/idrisi/CMakeLists.txt rename to ogr/ogrsf_frmts/idrisi/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/idrisi/GNUmakefile b/ogr/ogrsf_frmts/idrisi/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/idrisi/GNUmakefile rename to ogr/ogrsf_frmts/idrisi/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/idrisi/generate_test_files.c b/ogr/ogrsf_frmts/idrisi/generate_test_files.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/idrisi/generate_test_files.c rename to ogr/ogrsf_frmts/idrisi/generate_test_files.c diff --git a/gdal/ogr/ogrsf_frmts/idrisi/makefile.vc b/ogr/ogrsf_frmts/idrisi/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/idrisi/makefile.vc rename to ogr/ogrsf_frmts/idrisi/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h b/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/idrisi/ogr_idrisi.h rename to ogr/ogrsf_frmts/idrisi/ogr_idrisi.h diff --git a/gdal/ogr/ogrsf_frmts/idrisi/ogridrisidatasource.cpp b/ogr/ogrsf_frmts/idrisi/ogridrisidatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/idrisi/ogridrisidatasource.cpp rename to ogr/ogrsf_frmts/idrisi/ogridrisidatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/idrisi/ogridrisidriver.cpp b/ogr/ogrsf_frmts/idrisi/ogridrisidriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/idrisi/ogridrisidriver.cpp rename to ogr/ogrsf_frmts/idrisi/ogridrisidriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp b/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp rename to ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/CMakeLists.txt b/ogr/ogrsf_frmts/ili/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/CMakeLists.txt rename to ogr/ogrsf_frmts/ili/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/ili/GNUmakefile b/ogr/ogrsf_frmts/ili/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/GNUmakefile rename to ogr/ogrsf_frmts/ili/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/ili/ili1reader.cpp b/ogr/ogrsf_frmts/ili/ili1reader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ili1reader.cpp rename to ogr/ogrsf_frmts/ili/ili1reader.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/ili1reader.h b/ogr/ogrsf_frmts/ili/ili1reader.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ili1reader.h rename to ogr/ogrsf_frmts/ili/ili1reader.h diff --git a/gdal/ogr/ogrsf_frmts/ili/ili1readerp.h b/ogr/ogrsf_frmts/ili/ili1readerp.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ili1readerp.h rename to ogr/ogrsf_frmts/ili/ili1readerp.h diff --git a/gdal/ogr/ogrsf_frmts/ili/ili2handler.cpp b/ogr/ogrsf_frmts/ili/ili2handler.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ili2handler.cpp rename to ogr/ogrsf_frmts/ili/ili2handler.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/ili2reader.cpp b/ogr/ogrsf_frmts/ili/ili2reader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ili2reader.cpp rename to ogr/ogrsf_frmts/ili/ili2reader.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/ili2reader.h b/ogr/ogrsf_frmts/ili/ili2reader.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ili2reader.h rename to ogr/ogrsf_frmts/ili/ili2reader.h diff --git a/gdal/ogr/ogrsf_frmts/ili/ili2readerp.h b/ogr/ogrsf_frmts/ili/ili2readerp.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ili2readerp.h rename to ogr/ogrsf_frmts/ili/ili2readerp.h diff --git a/gdal/ogr/ogrsf_frmts/ili/imdreader.cpp b/ogr/ogrsf_frmts/ili/imdreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/imdreader.cpp rename to ogr/ogrsf_frmts/ili/imdreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/imdreader.h b/ogr/ogrsf_frmts/ili/imdreader.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/imdreader.h rename to ogr/ogrsf_frmts/ili/imdreader.h diff --git a/gdal/ogr/ogrsf_frmts/ili/makefile.vc b/ogr/ogrsf_frmts/ili/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/makefile.vc rename to ogr/ogrsf_frmts/ili/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/ili/ogr_ili1.h b/ogr/ogrsf_frmts/ili/ogr_ili1.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ogr_ili1.h rename to ogr/ogrsf_frmts/ili/ogr_ili1.h diff --git a/gdal/ogr/ogrsf_frmts/ili/ogr_ili2.h b/ogr/ogrsf_frmts/ili/ogr_ili2.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ogr_ili2.h rename to ogr/ogrsf_frmts/ili/ogr_ili2.h diff --git a/gdal/ogr/ogrsf_frmts/ili/ogrili1datasource.cpp b/ogr/ogrsf_frmts/ili/ogrili1datasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ogrili1datasource.cpp rename to ogr/ogrsf_frmts/ili/ogrili1datasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/ogrili1driver.cpp b/ogr/ogrsf_frmts/ili/ogrili1driver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ogrili1driver.cpp rename to ogr/ogrsf_frmts/ili/ogrili1driver.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/ogrili1layer.cpp b/ogr/ogrsf_frmts/ili/ogrili1layer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ogrili1layer.cpp rename to ogr/ogrsf_frmts/ili/ogrili1layer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp b/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp rename to ogr/ogrsf_frmts/ili/ogrili2datasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/ogrili2driver.cpp b/ogr/ogrsf_frmts/ili/ogrili2driver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ogrili2driver.cpp rename to ogr/ogrsf_frmts/ili/ogrili2driver.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/ogrili2layer.cpp b/ogr/ogrsf_frmts/ili/ogrili2layer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/ogrili2layer.cpp rename to ogr/ogrsf_frmts/ili/ogrili2layer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ili/xercesc_headers.h b/ogr/ogrsf_frmts/ili/xercesc_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ili/xercesc_headers.h rename to ogr/ogrsf_frmts/ili/xercesc_headers.h diff --git a/gdal/ogr/ogrsf_frmts/ingres/CMakeLists.txt b/ogr/ogrsf_frmts/ingres/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/CMakeLists.txt rename to ogr/ogrsf_frmts/ingres/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/ingres/GNUmakefile b/ogr/ogrsf_frmts/ingres/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/GNUmakefile rename to ogr/ogrsf_frmts/ingres/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/ingres/ingres.txt b/ogr/ogrsf_frmts/ingres/ingres.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/ingres.txt rename to ogr/ogrsf_frmts/ingres/ingres.txt diff --git a/gdal/ogr/ogrsf_frmts/ingres/makefile.vc b/ogr/ogrsf_frmts/ingres/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/makefile.vc rename to ogr/ogrsf_frmts/ingres/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/ingres/ogr_ingres.h b/ogr/ogrsf_frmts/ingres/ogr_ingres.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/ogr_ingres.h rename to ogr/ogrsf_frmts/ingres/ogr_ingres.h diff --git a/gdal/ogr/ogrsf_frmts/ingres/ogringresdatasource.cpp b/ogr/ogrsf_frmts/ingres/ogringresdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/ogringresdatasource.cpp rename to ogr/ogrsf_frmts/ingres/ogringresdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/ingres/ogringresdriver.cpp b/ogr/ogrsf_frmts/ingres/ogringresdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/ogringresdriver.cpp rename to ogr/ogrsf_frmts/ingres/ogringresdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/ingres/ogringreslayer.cpp b/ogr/ogrsf_frmts/ingres/ogringreslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/ogringreslayer.cpp rename to ogr/ogrsf_frmts/ingres/ogringreslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ingres/ogringresresultlayer.cpp b/ogr/ogrsf_frmts/ingres/ogringresresultlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/ogringresresultlayer.cpp rename to ogr/ogrsf_frmts/ingres/ogringresresultlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ingres/ogringresstatement.cpp b/ogr/ogrsf_frmts/ingres/ogringresstatement.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/ogringresstatement.cpp rename to ogr/ogrsf_frmts/ingres/ogringresstatement.cpp diff --git a/gdal/ogr/ogrsf_frmts/ingres/ogringrestablelayer.cpp b/ogr/ogrsf_frmts/ingres/ogringrestablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/ogringrestablelayer.cpp rename to ogr/ogrsf_frmts/ingres/ogringrestablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ingres/testdata.sql b/ogr/ogrsf_frmts/ingres/testdata.sql similarity index 100% rename from gdal/ogr/ogrsf_frmts/ingres/testdata.sql rename to ogr/ogrsf_frmts/ingres/testdata.sql diff --git a/gdal/ogr/ogrsf_frmts/jml/CMakeLists.txt b/ogr/ogrsf_frmts/jml/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/jml/CMakeLists.txt rename to ogr/ogrsf_frmts/jml/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/jml/GNUmakefile b/ogr/ogrsf_frmts/jml/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/jml/GNUmakefile rename to ogr/ogrsf_frmts/jml/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/jml/makefile.vc b/ogr/ogrsf_frmts/jml/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/jml/makefile.vc rename to ogr/ogrsf_frmts/jml/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/jml/ogr_jml.h b/ogr/ogrsf_frmts/jml/ogr_jml.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/jml/ogr_jml.h rename to ogr/ogrsf_frmts/jml/ogr_jml.h diff --git a/gdal/ogr/ogrsf_frmts/jml/ogrjmldataset.cpp b/ogr/ogrsf_frmts/jml/ogrjmldataset.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/jml/ogrjmldataset.cpp rename to ogr/ogrsf_frmts/jml/ogrjmldataset.cpp diff --git a/gdal/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp b/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/jml/ogrjmllayer.cpp rename to ogr/ogrsf_frmts/jml/ogrjmllayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/jml/ogrjmlwriterlayer.cpp b/ogr/ogrsf_frmts/jml/ogrjmlwriterlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/jml/ogrjmlwriterlayer.cpp rename to ogr/ogrsf_frmts/jml/ogrjmlwriterlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/kml/CMakeLists.txt b/ogr/ogrsf_frmts/kml/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/CMakeLists.txt rename to ogr/ogrsf_frmts/kml/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/kml/GNUmakefile b/ogr/ogrsf_frmts/kml/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/GNUmakefile rename to ogr/ogrsf_frmts/kml/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/kml/kml.cpp b/ogr/ogrsf_frmts/kml/kml.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/kml.cpp rename to ogr/ogrsf_frmts/kml/kml.cpp diff --git a/gdal/ogr/ogrsf_frmts/kml/kml.h b/ogr/ogrsf_frmts/kml/kml.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/kml.h rename to ogr/ogrsf_frmts/kml/kml.h diff --git a/gdal/ogr/ogrsf_frmts/kml/kmlnode.cpp b/ogr/ogrsf_frmts/kml/kmlnode.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/kmlnode.cpp rename to ogr/ogrsf_frmts/kml/kmlnode.cpp diff --git a/gdal/ogr/ogrsf_frmts/kml/kmlnode.h b/ogr/ogrsf_frmts/kml/kmlnode.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/kmlnode.h rename to ogr/ogrsf_frmts/kml/kmlnode.h diff --git a/gdal/ogr/ogrsf_frmts/kml/kmlutility.h b/ogr/ogrsf_frmts/kml/kmlutility.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/kmlutility.h rename to ogr/ogrsf_frmts/kml/kmlutility.h diff --git a/gdal/ogr/ogrsf_frmts/kml/kmlvector.cpp b/ogr/ogrsf_frmts/kml/kmlvector.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/kmlvector.cpp rename to ogr/ogrsf_frmts/kml/kmlvector.cpp diff --git a/gdal/ogr/ogrsf_frmts/kml/kmlvector.h b/ogr/ogrsf_frmts/kml/kmlvector.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/kmlvector.h rename to ogr/ogrsf_frmts/kml/kmlvector.h diff --git a/gdal/ogr/ogrsf_frmts/kml/makefile.vc b/ogr/ogrsf_frmts/kml/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/makefile.vc rename to ogr/ogrsf_frmts/kml/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp b/ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp rename to ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp diff --git a/gdal/ogr/ogrsf_frmts/kml/ogr_kml.h b/ogr/ogrsf_frmts/kml/ogr_kml.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/ogr_kml.h rename to ogr/ogrsf_frmts/kml/ogr_kml.h diff --git a/gdal/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp b/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp rename to ogr/ogrsf_frmts/kml/ogrkmldatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/kml/ogrkmldriver.cpp b/ogr/ogrsf_frmts/kml/ogrkmldriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/ogrkmldriver.cpp rename to ogr/ogrsf_frmts/kml/ogrkmldriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp b/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp rename to ogr/ogrsf_frmts/kml/ogrkmllayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/.indent.pro b/ogr/ogrsf_frmts/libkml/.indent.pro similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/.indent.pro rename to ogr/ogrsf_frmts/libkml/.indent.pro diff --git a/gdal/ogr/ogrsf_frmts/libkml/CMakeLists.txt b/ogr/ogrsf_frmts/libkml/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/CMakeLists.txt rename to ogr/ogrsf_frmts/libkml/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/libkml/GNUmakefile b/ogr/ogrsf_frmts/libkml/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/GNUmakefile rename to ogr/ogrsf_frmts/libkml/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/libkml/libkml_headers.h b/ogr/ogrsf_frmts/libkml/libkml_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/libkml_headers.h rename to ogr/ogrsf_frmts/libkml/libkml_headers.h diff --git a/gdal/ogr/ogrsf_frmts/libkml/makefile.vc b/ogr/ogrsf_frmts/libkml/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/makefile.vc rename to ogr/ogrsf_frmts/libkml/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogr_libkml.h b/ogr/ogrsf_frmts/libkml/ogr_libkml.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogr_libkml.h rename to ogr/ogrsf_frmts/libkml/ogr_libkml.h diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp rename to ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp rename to ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp rename to ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.h rename to ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.h diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp rename to ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.h rename to ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.h diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.cpp rename to ogr/ogrsf_frmts/libkml/ogrlibkmlfield.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlfield.h rename to ogr/ogrsf_frmts/libkml/ogrlibkmlfield.h diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp rename to ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.h rename to ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.h diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp rename to ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp rename to ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.cpp diff --git a/gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.h b/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.h rename to ogr/ogrsf_frmts/libkml/ogrlibkmlstyle.h diff --git a/gdal/ogr/ogrsf_frmts/lvbag/CMakeLists.txt b/ogr/ogrsf_frmts/lvbag/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/lvbag/CMakeLists.txt rename to ogr/ogrsf_frmts/lvbag/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/lvbag/GNUmakefile b/ogr/ogrsf_frmts/lvbag/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/lvbag/GNUmakefile rename to ogr/ogrsf_frmts/lvbag/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/lvbag/makefile.vc b/ogr/ogrsf_frmts/lvbag/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/lvbag/makefile.vc rename to ogr/ogrsf_frmts/lvbag/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/lvbag/ogr_lvbag.h b/ogr/ogrsf_frmts/lvbag/ogr_lvbag.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/lvbag/ogr_lvbag.h rename to ogr/ogrsf_frmts/lvbag/ogr_lvbag.h diff --git a/gdal/ogr/ogrsf_frmts/lvbag/ogrlvbagdatasource.cpp b/ogr/ogrsf_frmts/lvbag/ogrlvbagdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/lvbag/ogrlvbagdatasource.cpp rename to ogr/ogrsf_frmts/lvbag/ogrlvbagdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp b/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp rename to ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp b/ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp rename to ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/makefile.vc b/ogr/ogrsf_frmts/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/makefile.vc rename to ogr/ogrsf_frmts/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mapml/CMakeLists.txt b/ogr/ogrsf_frmts/mapml/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mapml/CMakeLists.txt rename to ogr/ogrsf_frmts/mapml/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mapml/GNUmakefile b/ogr/ogrsf_frmts/mapml/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mapml/GNUmakefile rename to ogr/ogrsf_frmts/mapml/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mapml/makefile.vc b/ogr/ogrsf_frmts/mapml/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/mapml/makefile.vc rename to ogr/ogrsf_frmts/mapml/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp b/ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp rename to ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp diff --git a/gdal/ogr/ogrsf_frmts/mdb/CMakeLists.txt b/ogr/ogrsf_frmts/mdb/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mdb/CMakeLists.txt rename to ogr/ogrsf_frmts/mdb/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mdb/GNUmakefile b/ogr/ogrsf_frmts/mdb/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mdb/GNUmakefile rename to ogr/ogrsf_frmts/mdb/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mdb/ogr_mdb.h b/ogr/ogrsf_frmts/mdb/ogr_mdb.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mdb/ogr_mdb.h rename to ogr/ogrsf_frmts/mdb/ogr_mdb.h diff --git a/gdal/ogr/ogrsf_frmts/mdb/ogrmdbdatasource.cpp b/ogr/ogrsf_frmts/mdb/ogrmdbdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mdb/ogrmdbdatasource.cpp rename to ogr/ogrsf_frmts/mdb/ogrmdbdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/mdb/ogrmdbdriver.cpp b/ogr/ogrsf_frmts/mdb/ogrmdbdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mdb/ogrmdbdriver.cpp rename to ogr/ogrsf_frmts/mdb/ogrmdbdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp b/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp rename to ogr/ogrsf_frmts/mdb/ogrmdbjackcess.cpp diff --git a/gdal/ogr/ogrsf_frmts/mdb/ogrmdblayer.cpp b/ogr/ogrsf_frmts/mdb/ogrmdblayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mdb/ogrmdblayer.cpp rename to ogr/ogrsf_frmts/mdb/ogrmdblayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/mem/CMakeLists.txt b/ogr/ogrsf_frmts/mem/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mem/CMakeLists.txt rename to ogr/ogrsf_frmts/mem/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mem/GNUmakefile b/ogr/ogrsf_frmts/mem/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mem/GNUmakefile rename to ogr/ogrsf_frmts/mem/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mem/makefile.vc b/ogr/ogrsf_frmts/mem/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/mem/makefile.vc rename to ogr/ogrsf_frmts/mem/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mem/ogr_mem.h b/ogr/ogrsf_frmts/mem/ogr_mem.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mem/ogr_mem.h rename to ogr/ogrsf_frmts/mem/ogr_mem.h diff --git a/gdal/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp b/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp rename to ogr/ogrsf_frmts/mem/ogrmemdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp b/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp rename to ogr/ogrsf_frmts/mem/ogrmemdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp b/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp rename to ogr/ogrsf_frmts/mem/ogrmemlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/CMakeLists.txt b/ogr/ogrsf_frmts/mitab/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/CMakeLists.txt rename to ogr/ogrsf_frmts/mitab/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mitab/GNUmakefile b/ogr/ogrsf_frmts/mitab/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/GNUmakefile rename to ogr/ogrsf_frmts/mitab/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mitab/HISTORY.TXT b/ogr/ogrsf_frmts/mitab/HISTORY.TXT similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/HISTORY.TXT rename to ogr/ogrsf_frmts/mitab/HISTORY.TXT diff --git a/gdal/ogr/ogrsf_frmts/mitab/README.TXT b/ogr/ogrsf_frmts/mitab/README.TXT similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/README.TXT rename to ogr/ogrsf_frmts/mitab/README.TXT diff --git a/gdal/ogr/ogrsf_frmts/mitab/TODO.TXT b/ogr/ogrsf_frmts/mitab/TODO.TXT similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/TODO.TXT rename to ogr/ogrsf_frmts/mitab/TODO.TXT diff --git a/gdal/ogr/ogrsf_frmts/mitab/makefile.vc b/ogr/ogrsf_frmts/mitab/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/makefile.vc rename to ogr/ogrsf_frmts/mitab/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab.h b/ogr/ogrsf_frmts/mitab/mitab.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab.h rename to ogr/ogrsf_frmts/mitab/mitab.h diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_bounds.cpp b/ogr/ogrsf_frmts/mitab/mitab_bounds.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_bounds.cpp rename to ogr/ogrsf_frmts/mitab/mitab_bounds.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp b/ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp rename to ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp rename to ogr/ogrsf_frmts/mitab/mitab_datfile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp b/ogr/ogrsf_frmts/mitab/mitab_feature.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp rename to ogr/ogrsf_frmts/mitab/mitab_feature.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp b/ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp rename to ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_geometry.cpp b/ogr/ogrsf_frmts/mitab/mitab_geometry.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_geometry.cpp rename to ogr/ogrsf_frmts/mitab/mitab_geometry.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_geometry.h b/ogr/ogrsf_frmts/mitab/mitab_geometry.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_geometry.h rename to ogr/ogrsf_frmts/mitab/mitab_geometry.h diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_idfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_idfile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_idfile.cpp rename to ogr/ogrsf_frmts/mitab/mitab_idfile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp b/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp rename to ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_indfile.cpp rename to ogr/ogrsf_frmts/mitab/mitab_indfile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp rename to ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp rename to ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp rename to ogr/ogrsf_frmts/mitab/mitab_mapheaderblock.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_mapindexblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapindexblock.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_mapindexblock.cpp rename to ogr/ogrsf_frmts/mitab/mitab_mapindexblock.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp rename to ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_maptoolblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_maptoolblock.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_maptoolblock.cpp rename to ogr/ogrsf_frmts/mitab/mitab_maptoolblock.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp b/ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp rename to ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp b/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp rename to ogr/ogrsf_frmts/mitab/mitab_miffile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp b/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp rename to ogr/ogrsf_frmts/mitab/mitab_ogr_datasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp b/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp rename to ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h b/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h rename to ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h b/ogr/ogrsf_frmts/mitab/mitab_priv.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h rename to ogr/ogrsf_frmts/mitab/mitab_priv.h diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp b/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp rename to ogr/ogrsf_frmts/mitab/mitab_rawbinblock.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp b/ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp rename to ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp rename to ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp b/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp rename to ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_tabview.cpp b/ogr/ogrsf_frmts/mitab/mitab_tabview.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_tabview.cpp rename to ogr/ogrsf_frmts/mitab/mitab_tabview.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_tooldef.cpp b/ogr/ogrsf_frmts/mitab/mitab_tooldef.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_tooldef.cpp rename to ogr/ogrsf_frmts/mitab/mitab_tooldef.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_utils.cpp b/ogr/ogrsf_frmts/mitab/mitab_utils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_utils.cpp rename to ogr/ogrsf_frmts/mitab/mitab_utils.cpp diff --git a/gdal/ogr/ogrsf_frmts/mitab/mitab_utils.h b/ogr/ogrsf_frmts/mitab/mitab_utils.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mitab/mitab_utils.h rename to ogr/ogrsf_frmts/mitab/mitab_utils.h diff --git a/gdal/ogr/ogrsf_frmts/mongodb/CMakeLists.txt b/ogr/ogrsf_frmts/mongodb/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodb/CMakeLists.txt rename to ogr/ogrsf_frmts/mongodb/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mongodb/GNUmakefile b/ogr/ogrsf_frmts/mongodb/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodb/GNUmakefile rename to ogr/ogrsf_frmts/mongodb/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mongodb/makefile.vc b/ogr/ogrsf_frmts/mongodb/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodb/makefile.vc rename to ogr/ogrsf_frmts/mongodb/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mongodb/mongocxx_headers.h b/ogr/ogrsf_frmts/mongodb/mongocxx_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodb/mongocxx_headers.h rename to ogr/ogrsf_frmts/mongodb/mongocxx_headers.h diff --git a/gdal/ogr/ogrsf_frmts/mongodb/ogrmongodbdriver.cpp b/ogr/ogrsf_frmts/mongodb/ogrmongodbdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodb/ogrmongodbdriver.cpp rename to ogr/ogrsf_frmts/mongodb/ogrmongodbdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/mongodbv3/CMakeLists.txt b/ogr/ogrsf_frmts/mongodbv3/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodbv3/CMakeLists.txt rename to ogr/ogrsf_frmts/mongodbv3/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mongodbv3/GNUmakefile b/ogr/ogrsf_frmts/mongodbv3/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodbv3/GNUmakefile rename to ogr/ogrsf_frmts/mongodbv3/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mongodbv3/makefile.vc b/ogr/ogrsf_frmts/mongodbv3/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodbv3/makefile.vc rename to ogr/ogrsf_frmts/mongodbv3/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mongodbv3/mongocxxv3_headers.h b/ogr/ogrsf_frmts/mongodbv3/mongocxxv3_headers.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodbv3/mongocxxv3_headers.h rename to ogr/ogrsf_frmts/mongodbv3/mongocxxv3_headers.h diff --git a/gdal/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp b/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp rename to ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/CMakeLists.txt b/ogr/ogrsf_frmts/mssqlspatial/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/CMakeLists.txt rename to ogr/ogrsf_frmts/mssqlspatial/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/GNUmakefile b/ogr/ogrsf_frmts/mssqlspatial/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/GNUmakefile rename to ogr/ogrsf_frmts/mssqlspatial/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/makefile.vc b/ogr/ogrsf_frmts/mssqlspatial/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/makefile.vc rename to ogr/ogrsf_frmts/mssqlspatial/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h b/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h rename to ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp rename to ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryparser.cpp diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryvalidator.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryvalidator.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryvalidator.cpp rename to ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometryvalidator.cpp diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometrywriter.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometrywriter.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometrywriter.cpp rename to ogr/ogrsf_frmts/mssqlspatial/ogrmssqlgeometrywriter.cpp diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp rename to ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdriver.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdriver.cpp rename to ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp rename to ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatiallayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp rename to ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp b/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp rename to ogr/ogrsf_frmts/mssqlspatial/ogrmssqlspatialtablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/mvt/CMakeLists.txt b/ogr/ogrsf_frmts/mvt/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/CMakeLists.txt rename to ogr/ogrsf_frmts/mvt/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mvt/GNUmakefile b/ogr/ogrsf_frmts/mvt/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/GNUmakefile rename to ogr/ogrsf_frmts/mvt/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mvt/makefile.vc b/ogr/ogrsf_frmts/mvt/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/makefile.vc rename to ogr/ogrsf_frmts/mvt/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mvt/mvt_tile.cpp b/ogr/ogrsf_frmts/mvt/mvt_tile.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/mvt_tile.cpp rename to ogr/ogrsf_frmts/mvt/mvt_tile.cpp diff --git a/gdal/ogr/ogrsf_frmts/mvt/mvt_tile.h b/ogr/ogrsf_frmts/mvt/mvt_tile.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/mvt_tile.h rename to ogr/ogrsf_frmts/mvt/mvt_tile.h diff --git a/gdal/ogr/ogrsf_frmts/mvt/mvt_tile_test.cpp b/ogr/ogrsf_frmts/mvt/mvt_tile_test.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/mvt_tile_test.cpp rename to ogr/ogrsf_frmts/mvt/mvt_tile_test.cpp diff --git a/gdal/ogr/ogrsf_frmts/mvt/mvtutils.cpp b/ogr/ogrsf_frmts/mvt/mvtutils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/mvtutils.cpp rename to ogr/ogrsf_frmts/mvt/mvtutils.cpp diff --git a/gdal/ogr/ogrsf_frmts/mvt/mvtutils.h b/ogr/ogrsf_frmts/mvt/mvtutils.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/mvtutils.h rename to ogr/ogrsf_frmts/mvt/mvtutils.h diff --git a/gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp b/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp rename to ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp diff --git a/gdal/ogr/ogrsf_frmts/mysql/CMakeLists.txt b/ogr/ogrsf_frmts/mysql/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/CMakeLists.txt rename to ogr/ogrsf_frmts/mysql/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/mysql/GNUmakefile b/ogr/ogrsf_frmts/mysql/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/GNUmakefile rename to ogr/ogrsf_frmts/mysql/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/mysql/makefile.vc b/ogr/ogrsf_frmts/mysql/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/makefile.vc rename to ogr/ogrsf_frmts/mysql/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h b/ogr/ogrsf_frmts/mysql/ogr_mysql.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h rename to ogr/ogrsf_frmts/mysql/ogr_mysql.h diff --git a/gdal/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp rename to ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp rename to ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp rename to ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp rename to ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp b/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp rename to ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/nas/CMakeLists.txt b/ogr/ogrsf_frmts/nas/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/CMakeLists.txt rename to ogr/ogrsf_frmts/nas/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/nas/GNUmakefile b/ogr/ogrsf_frmts/nas/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/GNUmakefile rename to ogr/ogrsf_frmts/nas/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/nas/makefile.vc b/ogr/ogrsf_frmts/nas/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/makefile.vc rename to ogr/ogrsf_frmts/nas/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/nas/nashandler.cpp b/ogr/ogrsf_frmts/nas/nashandler.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/nashandler.cpp rename to ogr/ogrsf_frmts/nas/nashandler.cpp diff --git a/gdal/ogr/ogrsf_frmts/nas/nasreader.cpp b/ogr/ogrsf_frmts/nas/nasreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/nasreader.cpp rename to ogr/ogrsf_frmts/nas/nasreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/nas/nasreaderp.h b/ogr/ogrsf_frmts/nas/nasreaderp.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/nasreaderp.h rename to ogr/ogrsf_frmts/nas/nasreaderp.h diff --git a/gdal/ogr/ogrsf_frmts/nas/ogr_nas.h b/ogr/ogrsf_frmts/nas/ogr_nas.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/ogr_nas.h rename to ogr/ogrsf_frmts/nas/ogr_nas.h diff --git a/gdal/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp b/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp rename to ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp b/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp rename to ogr/ogrsf_frmts/nas/ogrnasdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/nas/ogrnaslayer.cpp b/ogr/ogrsf_frmts/nas/ogrnaslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/ogrnaslayer.cpp rename to ogr/ogrsf_frmts/nas/ogrnaslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/nas/ogrnasrelationlayer.cpp b/ogr/ogrsf_frmts/nas/ogrnasrelationlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/nas/ogrnasrelationlayer.cpp rename to ogr/ogrsf_frmts/nas/ogrnasrelationlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ngw/CMakeLists.txt b/ogr/ogrsf_frmts/ngw/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/ngw/CMakeLists.txt rename to ogr/ogrsf_frmts/ngw/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/ngw/GNUmakefile b/ogr/ogrsf_frmts/ngw/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/ngw/GNUmakefile rename to ogr/ogrsf_frmts/ngw/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp b/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp rename to ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp diff --git a/gdal/ogr/ogrsf_frmts/ngw/makefile.vc b/ogr/ogrsf_frmts/ngw/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/ngw/makefile.vc rename to ogr/ogrsf_frmts/ngw/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp b/ogr/ogrsf_frmts/ngw/ngw_api.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ngw/ngw_api.cpp rename to ogr/ogrsf_frmts/ngw/ngw_api.cpp diff --git a/gdal/ogr/ogrsf_frmts/ngw/ogr_ngw.h b/ogr/ogrsf_frmts/ngw/ogr_ngw.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ngw/ogr_ngw.h rename to ogr/ogrsf_frmts/ngw/ogr_ngw.h diff --git a/gdal/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp b/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp rename to ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp b/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp rename to ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/CMakeLists.txt b/ogr/ogrsf_frmts/ntf/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/CMakeLists.txt rename to ogr/ogrsf_frmts/ntf/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/ntf/GNUmakefile b/ogr/ogrsf_frmts/ntf/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/GNUmakefile rename to ogr/ogrsf_frmts/ntf/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/ntf/README.txt b/ogr/ogrsf_frmts/ntf/README.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/README.txt rename to ogr/ogrsf_frmts/ntf/README.txt diff --git a/gdal/ogr/ogrsf_frmts/ntf/makefile.vc b/ogr/ogrsf_frmts/ntf/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/makefile.vc rename to ogr/ogrsf_frmts/ntf/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntf.h b/ogr/ogrsf_frmts/ntf/ntf.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntf.h rename to ogr/ogrsf_frmts/ntf/ntf.h diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntf_codelist.cpp b/ogr/ogrsf_frmts/ntf/ntf_codelist.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntf_codelist.cpp rename to ogr/ogrsf_frmts/ntf/ntf_codelist.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp b/ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp rename to ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntf_generic.cpp b/ogr/ogrsf_frmts/ntf/ntf_generic.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntf_generic.cpp rename to ogr/ogrsf_frmts/ntf/ntf_generic.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntf_raster.cpp b/ogr/ogrsf_frmts/ntf/ntf_raster.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntf_raster.cpp rename to ogr/ogrsf_frmts/ntf/ntf_raster.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntfdump.cpp b/ogr/ogrsf_frmts/ntf/ntfdump.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntfdump.cpp rename to ogr/ogrsf_frmts/ntf/ntfdump.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntffilereader.cpp b/ogr/ogrsf_frmts/ntf/ntffilereader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntffilereader.cpp rename to ogr/ogrsf_frmts/ntf/ntffilereader.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntfrecord.cpp b/ogr/ogrsf_frmts/ntf/ntfrecord.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntfrecord.cpp rename to ogr/ogrsf_frmts/ntf/ntfrecord.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ntfstroke.cpp b/ogr/ogrsf_frmts/ntf/ntfstroke.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ntfstroke.cpp rename to ogr/ogrsf_frmts/ntf/ntfstroke.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp b/ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp rename to ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp b/ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp rename to ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ogrntffeatureclasslayer.cpp b/ogr/ogrsf_frmts/ntf/ogrntffeatureclasslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ogrntffeatureclasslayer.cpp rename to ogr/ogrsf_frmts/ntf/ogrntffeatureclasslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ntf/ogrntflayer.cpp b/ogr/ogrsf_frmts/ntf/ogrntflayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ntf/ogrntflayer.cpp rename to ogr/ogrsf_frmts/ntf/ogrntflayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/o/README.TXT b/ogr/ogrsf_frmts/o/README.TXT similarity index 100% rename from gdal/ogr/ogrsf_frmts/o/README.TXT rename to ogr/ogrsf_frmts/o/README.TXT diff --git a/gdal/ogr/ogrsf_frmts/oci/CMakeLists.txt b/ogr/ogrsf_frmts/oci/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/CMakeLists.txt rename to ogr/ogrsf_frmts/oci/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/oci/GNUmakefile b/ogr/ogrsf_frmts/oci/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/GNUmakefile rename to ogr/ogrsf_frmts/oci/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/oci/fastload.cpp b/ogr/ogrsf_frmts/oci/fastload.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/fastload.cpp rename to ogr/ogrsf_frmts/oci/fastload.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/makefile.vc b/ogr/ogrsf_frmts/oci/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/makefile.vc rename to ogr/ogrsf_frmts/oci/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/oci/oci_utils.cpp b/ogr/ogrsf_frmts/oci/oci_utils.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/oci_utils.cpp rename to ogr/ogrsf_frmts/oci/oci_utils.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ocitest.cpp b/ogr/ogrsf_frmts/oci/ocitest.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ocitest.cpp rename to ogr/ogrsf_frmts/oci/ocitest.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogr_oci.h b/ogr/ogrsf_frmts/oci/ogr_oci.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogr_oci.h rename to ogr/ogrsf_frmts/oci/ogr_oci.h diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrocidatasource.cpp b/ogr/ogrsf_frmts/oci/ogrocidatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrocidatasource.cpp rename to ogr/ogrsf_frmts/oci/ogrocidatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrocidriver.cpp b/ogr/ogrsf_frmts/oci/ogrocidriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrocidriver.cpp rename to ogr/ogrsf_frmts/oci/ogrocidriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrocilayer.cpp b/ogr/ogrsf_frmts/oci/ogrocilayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrocilayer.cpp rename to ogr/ogrsf_frmts/oci/ogrocilayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrociloaderlayer.cpp b/ogr/ogrsf_frmts/oci/ogrociloaderlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrociloaderlayer.cpp rename to ogr/ogrsf_frmts/oci/ogrociloaderlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrociselectlayer.cpp b/ogr/ogrsf_frmts/oci/ogrociselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrociselectlayer.cpp rename to ogr/ogrsf_frmts/oci/ogrociselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrocisession.cpp b/ogr/ogrsf_frmts/oci/ogrocisession.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrocisession.cpp rename to ogr/ogrsf_frmts/oci/ogrocisession.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrocistatement.cpp b/ogr/ogrsf_frmts/oci/ogrocistatement.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrocistatement.cpp rename to ogr/ogrsf_frmts/oci/ogrocistatement.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrocistringbuf.cpp b/ogr/ogrsf_frmts/oci/ogrocistringbuf.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrocistringbuf.cpp rename to ogr/ogrsf_frmts/oci/ogrocistringbuf.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrocistroke.cpp b/ogr/ogrsf_frmts/oci/ogrocistroke.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrocistroke.cpp rename to ogr/ogrsf_frmts/oci/ogrocistroke.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp b/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp rename to ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp b/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp rename to ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/odbc/CMakeLists.txt b/ogr/ogrsf_frmts/odbc/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/CMakeLists.txt rename to ogr/ogrsf_frmts/odbc/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/odbc/GNUmakefile b/ogr/ogrsf_frmts/odbc/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/GNUmakefile rename to ogr/ogrsf_frmts/odbc/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/odbc/makefile.vc b/ogr/ogrsf_frmts/odbc/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/makefile.vc rename to ogr/ogrsf_frmts/odbc/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/odbc/ogr_odbc.h b/ogr/ogrsf_frmts/odbc/ogr_odbc.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/ogr_odbc.h rename to ogr/ogrsf_frmts/odbc/ogr_odbc.h diff --git a/gdal/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp b/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp rename to ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/odbc/ogrodbcdriver.cpp b/ogr/ogrsf_frmts/odbc/ogrodbcdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/ogrodbcdriver.cpp rename to ogr/ogrsf_frmts/odbc/ogrodbcdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp b/ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp rename to ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/odbc/ogrodbcselectlayer.cpp b/ogr/ogrsf_frmts/odbc/ogrodbcselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/ogrodbcselectlayer.cpp rename to ogr/ogrsf_frmts/odbc/ogrodbcselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/odbc/ogrodbctablelayer.cpp b/ogr/ogrsf_frmts/odbc/ogrodbctablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/odbc/ogrodbctablelayer.cpp rename to ogr/ogrsf_frmts/odbc/ogrodbctablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ods/CMakeLists.txt b/ogr/ogrsf_frmts/ods/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/CMakeLists.txt rename to ogr/ogrsf_frmts/ods/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/ods/GNUmakefile b/ogr/ogrsf_frmts/ods/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/GNUmakefile rename to ogr/ogrsf_frmts/ods/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/ods/makefile.vc b/ogr/ogrsf_frmts/ods/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/makefile.vc rename to ogr/ogrsf_frmts/ods/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/ods/ods_formula.cpp b/ogr/ogrsf_frmts/ods/ods_formula.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ods_formula.cpp rename to ogr/ogrsf_frmts/ods/ods_formula.cpp diff --git a/gdal/ogr/ogrsf_frmts/ods/ods_formula.h b/ogr/ogrsf_frmts/ods/ods_formula.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ods_formula.h rename to ogr/ogrsf_frmts/ods/ods_formula.h diff --git a/gdal/ogr/ogrsf_frmts/ods/ods_formula_node.cpp b/ogr/ogrsf_frmts/ods/ods_formula_node.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ods_formula_node.cpp rename to ogr/ogrsf_frmts/ods/ods_formula_node.cpp diff --git a/gdal/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp b/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ods_formula_parser.cpp rename to ogr/ogrsf_frmts/ods/ods_formula_parser.cpp diff --git a/gdal/ogr/ogrsf_frmts/ods/ods_formula_parser.hpp b/ogr/ogrsf_frmts/ods/ods_formula_parser.hpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ods_formula_parser.hpp rename to ogr/ogrsf_frmts/ods/ods_formula_parser.hpp diff --git a/gdal/ogr/ogrsf_frmts/ods/ods_formula_parser.y b/ogr/ogrsf_frmts/ods/ods_formula_parser.y similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ods_formula_parser.y rename to ogr/ogrsf_frmts/ods/ods_formula_parser.y diff --git a/gdal/ogr/ogrsf_frmts/ods/ogr_ods.h b/ogr/ogrsf_frmts/ods/ogr_ods.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ogr_ods.h rename to ogr/ogrsf_frmts/ods/ogr_ods.h diff --git a/gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp b/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp rename to ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/ods/ogrodsdriver.cpp b/ogr/ogrsf_frmts/ods/ogrodsdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/ogrodsdriver.cpp rename to ogr/ogrsf_frmts/ods/ogrodsdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/ods/testparser.cpp b/ogr/ogrsf_frmts/ods/testparser.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ods/testparser.cpp rename to ogr/ogrsf_frmts/ods/testparser.cpp diff --git a/gdal/ogr/ogrsf_frmts/ogdi/CMakeLists.txt b/ogr/ogrsf_frmts/ogdi/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogdi/CMakeLists.txt rename to ogr/ogrsf_frmts/ogdi/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/ogdi/GNUmakefile b/ogr/ogrsf_frmts/ogdi/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogdi/GNUmakefile rename to ogr/ogrsf_frmts/ogdi/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/ogdi/makefile.vc b/ogr/ogrsf_frmts/ogdi/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogdi/makefile.vc rename to ogr/ogrsf_frmts/ogdi/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/ogdi/ogrogdi.h b/ogr/ogrsf_frmts/ogdi/ogrogdi.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogdi/ogrogdi.h rename to ogr/ogrsf_frmts/ogdi/ogrogdi.h diff --git a/gdal/ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp b/ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp rename to ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp b/ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp rename to ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp b/ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp rename to ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/ogr_attrind.h b/ogr/ogrsf_frmts/ogr_attrind.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogr_attrind.h rename to ogr/ogrsf_frmts/ogr_attrind.h diff --git a/gdal/ogr/ogrsf_frmts/ogrsf_frmts.dox b/ogr/ogrsf_frmts/ogrsf_frmts.dox similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogrsf_frmts.dox rename to ogr/ogrsf_frmts/ogrsf_frmts.dox diff --git a/gdal/ogr/ogrsf_frmts/ogrsf_frmts.h b/ogr/ogrsf_frmts/ogrsf_frmts.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/ogrsf_frmts.h rename to ogr/ogrsf_frmts/ogrsf_frmts.h diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/CMakeLists.txt b/ogr/ogrsf_frmts/openfilegdb/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/CMakeLists.txt rename to ogr/ogrsf_frmts/openfilegdb/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/GNUmakefile b/ogr/ogrsf_frmts/openfilegdb/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/GNUmakefile rename to ogr/ogrsf_frmts/openfilegdb/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/filegdb_fielddomain.h b/ogr/ogrsf_frmts/openfilegdb/filegdb_fielddomain.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/filegdb_fielddomain.h rename to ogr/ogrsf_frmts/openfilegdb/filegdb_fielddomain.h diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/filegdb_gdbtoogrfieldtype.h b/ogr/ogrsf_frmts/openfilegdb/filegdb_gdbtoogrfieldtype.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/filegdb_gdbtoogrfieldtype.h rename to ogr/ogrsf_frmts/openfilegdb/filegdb_gdbtoogrfieldtype.h diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp rename to ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp rename to ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.h rename to ogr/ogrsf_frmts/openfilegdb/filegdbtable.h diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h rename to ogr/ogrsf_frmts/openfilegdb/filegdbtable_priv.h diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/makefile.vc b/ogr/ogrsf_frmts/openfilegdb/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/makefile.vc rename to ogr/ogrsf_frmts/openfilegdb/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h b/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h rename to ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp rename to ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdriver.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdriver.cpp rename to ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp rename to ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/osm/CMakeLists.txt b/ogr/ogrsf_frmts/osm/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/CMakeLists.txt rename to ogr/ogrsf_frmts/osm/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/osm/GNUmakefile b/ogr/ogrsf_frmts/osm/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/GNUmakefile rename to ogr/ogrsf_frmts/osm/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/osm/gpb.h b/ogr/ogrsf_frmts/osm/gpb.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/gpb.h rename to ogr/ogrsf_frmts/osm/gpb.h diff --git a/gdal/ogr/ogrsf_frmts/osm/makefile.vc b/ogr/ogrsf_frmts/osm/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/makefile.vc rename to ogr/ogrsf_frmts/osm/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/osm/ogr_osm.h b/ogr/ogrsf_frmts/osm/ogr_osm.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/ogr_osm.h rename to ogr/ogrsf_frmts/osm/ogr_osm.h diff --git a/gdal/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp rename to ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/osm/ogrosmdriver.cpp b/ogr/ogrsf_frmts/osm/ogrosmdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/ogrosmdriver.cpp rename to ogr/ogrsf_frmts/osm/ogrosmdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp b/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp rename to ogr/ogrsf_frmts/osm/ogrosmlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/osm/osm2osm.cpp b/ogr/ogrsf_frmts/osm/osm2osm.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/osm2osm.cpp rename to ogr/ogrsf_frmts/osm/osm2osm.cpp diff --git a/gdal/ogr/ogrsf_frmts/osm/osm_parser.cpp b/ogr/ogrsf_frmts/osm/osm_parser.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/osm_parser.cpp rename to ogr/ogrsf_frmts/osm/osm_parser.cpp diff --git a/gdal/ogr/ogrsf_frmts/osm/osm_parser.h b/ogr/ogrsf_frmts/osm/osm_parser.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/osm/osm_parser.h rename to ogr/ogrsf_frmts/osm/osm_parser.h diff --git a/gdal/ogr/ogrsf_frmts/pds/CMakeLists.txt b/ogr/ogrsf_frmts/pds/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/pds/CMakeLists.txt rename to ogr/ogrsf_frmts/pds/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/pds/GNUmakefile b/ogr/ogrsf_frmts/pds/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/pds/GNUmakefile rename to ogr/ogrsf_frmts/pds/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/pds/makefile.vc b/ogr/ogrsf_frmts/pds/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/pds/makefile.vc rename to ogr/ogrsf_frmts/pds/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/pds/ogr_pds.h b/ogr/ogrsf_frmts/pds/ogr_pds.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/pds/ogr_pds.h rename to ogr/ogrsf_frmts/pds/ogr_pds.h diff --git a/gdal/ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp b/ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp rename to ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp b/ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp rename to ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp b/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp rename to ogr/ogrsf_frmts/pds/ogrpdslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/pg/CMakeLists.txt b/ogr/ogrsf_frmts/pg/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/CMakeLists.txt rename to ogr/ogrsf_frmts/pg/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/pg/GNUmakefile b/ogr/ogrsf_frmts/pg/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/GNUmakefile rename to ogr/ogrsf_frmts/pg/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/pg/makefile.vc b/ogr/ogrsf_frmts/pg/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/makefile.vc rename to ogr/ogrsf_frmts/pg/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/pg/ogr_pg.h b/ogr/ogrsf_frmts/pg/ogr_pg.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/ogr_pg.h rename to ogr/ogrsf_frmts/pg/ogr_pg.h diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp rename to ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpgdriver.cpp b/ogr/ogrsf_frmts/pg/ogrpgdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/ogrpgdriver.cpp rename to ogr/ogrsf_frmts/pg/ogrpgdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/ogrpglayer.cpp rename to ogr/ogrsf_frmts/pg/ogrpglayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp b/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp rename to ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp b/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp rename to ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpgutility.cpp b/ogr/ogrsf_frmts/pg/ogrpgutility.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/ogrpgutility.cpp rename to ogr/ogrsf_frmts/pg/ogrpgutility.cpp diff --git a/gdal/ogr/ogrsf_frmts/pg/ogrpgutility.h b/ogr/ogrsf_frmts/pg/ogrpgutility.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/pg/ogrpgutility.h rename to ogr/ogrsf_frmts/pg/ogrpgutility.h diff --git a/gdal/ogr/ogrsf_frmts/pgdump/CMakeLists.txt b/ogr/ogrsf_frmts/pgdump/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgdump/CMakeLists.txt rename to ogr/ogrsf_frmts/pgdump/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/pgdump/GNUmakefile b/ogr/ogrsf_frmts/pgdump/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgdump/GNUmakefile rename to ogr/ogrsf_frmts/pgdump/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/pgdump/makefile.vc b/ogr/ogrsf_frmts/pgdump/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgdump/makefile.vc rename to ogr/ogrsf_frmts/pgdump/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h b/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h rename to ogr/ogrsf_frmts/pgdump/ogr_pgdump.h diff --git a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp b/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp rename to ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp b/ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp rename to ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp b/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp rename to ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/pgeo/CMakeLists.txt b/ogr/ogrsf_frmts/pgeo/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/CMakeLists.txt rename to ogr/ogrsf_frmts/pgeo/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/pgeo/GNUmakefile b/ogr/ogrsf_frmts/pgeo/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/GNUmakefile rename to ogr/ogrsf_frmts/pgeo/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/pgeo/makefile.vc b/ogr/ogrsf_frmts/pgeo/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/makefile.vc rename to ogr/ogrsf_frmts/pgeo/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h b/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/ogr_pgeo.h rename to ogr/ogrsf_frmts/pgeo/ogr_pgeo.h diff --git a/gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp rename to ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp rename to ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp rename to ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/pgeo/ogrpgeoselectlayer.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeoselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/ogrpgeoselectlayer.cpp rename to ogr/ogrsf_frmts/pgeo/ogrpgeoselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp b/ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp rename to ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/plscenes/CMakeLists.txt b/ogr/ogrsf_frmts/plscenes/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/plscenes/CMakeLists.txt rename to ogr/ogrsf_frmts/plscenes/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/plscenes/GNUmakefile b/ogr/ogrsf_frmts/plscenes/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/plscenes/GNUmakefile rename to ogr/ogrsf_frmts/plscenes/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/plscenes/makefile.vc b/ogr/ogrsf_frmts/plscenes/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/plscenes/makefile.vc rename to ogr/ogrsf_frmts/plscenes/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h b/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/plscenes/ogr_plscenes.h rename to ogr/ogrsf_frmts/plscenes/ogr_plscenes.h diff --git a/gdal/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1dataset.cpp b/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1dataset.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1dataset.cpp rename to ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1dataset.cpp diff --git a/gdal/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp b/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp rename to ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp diff --git a/gdal/ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp b/ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp rename to ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/rec/CMakeLists.txt b/ogr/ogrsf_frmts/rec/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/rec/CMakeLists.txt rename to ogr/ogrsf_frmts/rec/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/rec/GNUmakefile b/ogr/ogrsf_frmts/rec/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/rec/GNUmakefile rename to ogr/ogrsf_frmts/rec/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/rec/ll_recio.cpp b/ogr/ogrsf_frmts/rec/ll_recio.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/rec/ll_recio.cpp rename to ogr/ogrsf_frmts/rec/ll_recio.cpp diff --git a/gdal/ogr/ogrsf_frmts/rec/makefile.vc b/ogr/ogrsf_frmts/rec/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/rec/makefile.vc rename to ogr/ogrsf_frmts/rec/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/rec/ogr_rec.h b/ogr/ogrsf_frmts/rec/ogr_rec.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/rec/ogr_rec.h rename to ogr/ogrsf_frmts/rec/ogr_rec.h diff --git a/gdal/ogr/ogrsf_frmts/rec/ogrrecdatasource.cpp b/ogr/ogrsf_frmts/rec/ogrrecdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/rec/ogrrecdatasource.cpp rename to ogr/ogrsf_frmts/rec/ogrrecdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/rec/ogrrecdriver.cpp b/ogr/ogrsf_frmts/rec/ogrrecdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/rec/ogrrecdriver.cpp rename to ogr/ogrsf_frmts/rec/ogrrecdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/rec/ogrreclayer.cpp b/ogr/ogrsf_frmts/rec/ogrreclayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/rec/ogrreclayer.cpp rename to ogr/ogrsf_frmts/rec/ogrreclayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/CMakeLists.txt b/ogr/ogrsf_frmts/s57/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/CMakeLists.txt rename to ogr/ogrsf_frmts/s57/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/s57/GNUmakefile b/ogr/ogrsf_frmts/s57/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/GNUmakefile rename to ogr/ogrsf_frmts/s57/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/s57/ddfrecordindex.cpp b/ogr/ogrsf_frmts/s57/ddfrecordindex.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/ddfrecordindex.cpp rename to ogr/ogrsf_frmts/s57/ddfrecordindex.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/makefile.vc b/ogr/ogrsf_frmts/s57/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/makefile.vc rename to ogr/ogrsf_frmts/s57/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/s57/ogr_s57.h b/ogr/ogrsf_frmts/s57/ogr_s57.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/ogr_s57.h rename to ogr/ogrsf_frmts/s57/ogr_s57.h diff --git a/gdal/ogr/ogrsf_frmts/s57/ogrs57datasource.cpp b/ogr/ogrsf_frmts/s57/ogrs57datasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/ogrs57datasource.cpp rename to ogr/ogrsf_frmts/s57/ogrs57datasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/ogrs57driver.cpp b/ogr/ogrsf_frmts/s57/ogrs57driver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/ogrs57driver.cpp rename to ogr/ogrsf_frmts/s57/ogrs57driver.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/ogrs57layer.cpp b/ogr/ogrsf_frmts/s57/ogrs57layer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/ogrs57layer.cpp rename to ogr/ogrsf_frmts/s57/ogrs57layer.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/s57.h b/ogr/ogrsf_frmts/s57/s57.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57.h rename to ogr/ogrsf_frmts/s57/s57.h diff --git a/gdal/ogr/ogrsf_frmts/s57/s57classregistrar.cpp b/ogr/ogrsf_frmts/s57/s57classregistrar.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57classregistrar.cpp rename to ogr/ogrsf_frmts/s57/s57classregistrar.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/s57dump.cpp b/ogr/ogrsf_frmts/s57/s57dump.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57dump.cpp rename to ogr/ogrsf_frmts/s57/s57dump.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/s57featuredefns.cpp b/ogr/ogrsf_frmts/s57/s57featuredefns.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57featuredefns.cpp rename to ogr/ogrsf_frmts/s57/s57featuredefns.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/s57filecollector.cpp b/ogr/ogrsf_frmts/s57/s57filecollector.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57filecollector.cpp rename to ogr/ogrsf_frmts/s57/s57filecollector.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/s57reader.cpp b/ogr/ogrsf_frmts/s57/s57reader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57reader.cpp rename to ogr/ogrsf_frmts/s57/s57reader.cpp diff --git a/gdal/ogr/ogrsf_frmts/s57/s57tables.h b/ogr/ogrsf_frmts/s57/s57tables.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57tables.h rename to ogr/ogrsf_frmts/s57/s57tables.h diff --git a/gdal/ogr/ogrsf_frmts/s57/s57tables.py b/ogr/ogrsf_frmts/s57/s57tables.py similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57tables.py rename to ogr/ogrsf_frmts/s57/s57tables.py diff --git a/gdal/ogr/ogrsf_frmts/s57/s57writer.cpp b/ogr/ogrsf_frmts/s57/s57writer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/s57/s57writer.cpp rename to ogr/ogrsf_frmts/s57/s57writer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sdts/CMakeLists.txt b/ogr/ogrsf_frmts/sdts/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/sdts/CMakeLists.txt rename to ogr/ogrsf_frmts/sdts/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/sdts/GNUmakefile b/ogr/ogrsf_frmts/sdts/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/sdts/GNUmakefile rename to ogr/ogrsf_frmts/sdts/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/sdts/install-libs.sh b/ogr/ogrsf_frmts/sdts/install-libs.sh similarity index 100% rename from gdal/ogr/ogrsf_frmts/sdts/install-libs.sh rename to ogr/ogrsf_frmts/sdts/install-libs.sh diff --git a/gdal/ogr/ogrsf_frmts/sdts/makefile.vc b/ogr/ogrsf_frmts/sdts/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/sdts/makefile.vc rename to ogr/ogrsf_frmts/sdts/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/sdts/ogr_sdts.h b/ogr/ogrsf_frmts/sdts/ogr_sdts.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sdts/ogr_sdts.h rename to ogr/ogrsf_frmts/sdts/ogr_sdts.h diff --git a/gdal/ogr/ogrsf_frmts/sdts/ogrsdtsdatasource.cpp b/ogr/ogrsf_frmts/sdts/ogrsdtsdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sdts/ogrsdtsdatasource.cpp rename to ogr/ogrsf_frmts/sdts/ogrsdtsdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp b/ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp rename to ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/sdts/ogrsdtslayer.cpp b/ogr/ogrsf_frmts/sdts/ogrsdtslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sdts/ogrsdtslayer.cpp rename to ogr/ogrsf_frmts/sdts/ogrsdtslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/selafin/CMakeLists.txt b/ogr/ogrsf_frmts/selafin/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/CMakeLists.txt rename to ogr/ogrsf_frmts/selafin/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/selafin/GNUmakefile b/ogr/ogrsf_frmts/selafin/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/GNUmakefile rename to ogr/ogrsf_frmts/selafin/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp b/ogr/ogrsf_frmts/selafin/io_selafin.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp rename to ogr/ogrsf_frmts/selafin/io_selafin.cpp diff --git a/gdal/ogr/ogrsf_frmts/selafin/io_selafin.h b/ogr/ogrsf_frmts/selafin/io_selafin.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/io_selafin.h rename to ogr/ogrsf_frmts/selafin/io_selafin.h diff --git a/gdal/ogr/ogrsf_frmts/selafin/makefile.vc b/ogr/ogrsf_frmts/selafin/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/makefile.vc rename to ogr/ogrsf_frmts/selafin/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/selafin/ogr_selafin.h b/ogr/ogrsf_frmts/selafin/ogr_selafin.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/ogr_selafin.h rename to ogr/ogrsf_frmts/selafin/ogr_selafin.h diff --git a/gdal/ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp b/ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp rename to ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp b/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp rename to ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp b/ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp rename to ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/shape/CMakeLists.txt b/ogr/ogrsf_frmts/shape/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/CMakeLists.txt rename to ogr/ogrsf_frmts/shape/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/shape/COPYING b/ogr/ogrsf_frmts/shape/COPYING similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/COPYING rename to ogr/ogrsf_frmts/shape/COPYING diff --git a/gdal/ogr/ogrsf_frmts/shape/GNUmakefile b/ogr/ogrsf_frmts/shape/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/GNUmakefile rename to ogr/ogrsf_frmts/shape/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/shape/dbfopen.c b/ogr/ogrsf_frmts/shape/dbfopen.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/dbfopen.c rename to ogr/ogrsf_frmts/shape/dbfopen.c diff --git a/gdal/ogr/ogrsf_frmts/shape/dbfopen_wrapper.c b/ogr/ogrsf_frmts/shape/dbfopen_wrapper.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/dbfopen_wrapper.c rename to ogr/ogrsf_frmts/shape/dbfopen_wrapper.c diff --git a/gdal/ogr/ogrsf_frmts/shape/dump_symbols.sh b/ogr/ogrsf_frmts/shape/dump_symbols.sh similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/dump_symbols.sh rename to ogr/ogrsf_frmts/shape/dump_symbols.sh diff --git a/gdal/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h b/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h rename to ogr/ogrsf_frmts/shape/gdal_shapelib_symbol_rename.h diff --git a/gdal/ogr/ogrsf_frmts/shape/makefile.vc b/ogr/ogrsf_frmts/shape/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/makefile.vc rename to ogr/ogrsf_frmts/shape/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshape.h b/ogr/ogrsf_frmts/shape/ogrshape.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/ogrshape.h rename to ogr/ogrsf_frmts/shape/ogrshape.h diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp b/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp rename to ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp b/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp rename to ogr/ogrsf_frmts/shape/ogrshapedriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp rename to ogr/ogrsf_frmts/shape/ogrshapelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/shape/sbnsearch.c b/ogr/ogrsf_frmts/shape/sbnsearch.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/sbnsearch.c rename to ogr/ogrsf_frmts/shape/sbnsearch.c diff --git a/gdal/ogr/ogrsf_frmts/shape/sbnsearch_wrapper.c b/ogr/ogrsf_frmts/shape/sbnsearch_wrapper.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/sbnsearch_wrapper.c rename to ogr/ogrsf_frmts/shape/sbnsearch_wrapper.c diff --git a/gdal/ogr/ogrsf_frmts/shape/shape2ogr.cpp b/ogr/ogrsf_frmts/shape/shape2ogr.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/shape2ogr.cpp rename to ogr/ogrsf_frmts/shape/shape2ogr.cpp diff --git a/gdal/ogr/ogrsf_frmts/shape/shapefil.h b/ogr/ogrsf_frmts/shape/shapefil.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/shapefil.h rename to ogr/ogrsf_frmts/shape/shapefil.h diff --git a/gdal/ogr/ogrsf_frmts/shape/shp_vsi.c b/ogr/ogrsf_frmts/shape/shp_vsi.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/shp_vsi.c rename to ogr/ogrsf_frmts/shape/shp_vsi.c diff --git a/gdal/ogr/ogrsf_frmts/shape/shp_vsi.h b/ogr/ogrsf_frmts/shape/shp_vsi.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/shp_vsi.h rename to ogr/ogrsf_frmts/shape/shp_vsi.h diff --git a/gdal/ogr/ogrsf_frmts/shape/shpopen.c b/ogr/ogrsf_frmts/shape/shpopen.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/shpopen.c rename to ogr/ogrsf_frmts/shape/shpopen.c diff --git a/gdal/ogr/ogrsf_frmts/shape/shpopen_wrapper.c b/ogr/ogrsf_frmts/shape/shpopen_wrapper.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/shpopen_wrapper.c rename to ogr/ogrsf_frmts/shape/shpopen_wrapper.c diff --git a/gdal/ogr/ogrsf_frmts/shape/shptree.c b/ogr/ogrsf_frmts/shape/shptree.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/shptree.c rename to ogr/ogrsf_frmts/shape/shptree.c diff --git a/gdal/ogr/ogrsf_frmts/shape/shptree_wrapper.c b/ogr/ogrsf_frmts/shape/shptree_wrapper.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/shape/shptree_wrapper.c rename to ogr/ogrsf_frmts/shape/shptree_wrapper.c diff --git a/gdal/ogr/ogrsf_frmts/sosi/CMakeLists.txt b/ogr/ogrsf_frmts/sosi/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/CMakeLists.txt rename to ogr/ogrsf_frmts/sosi/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/sosi/GNUmakefile b/ogr/ogrsf_frmts/sosi/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/GNUmakefile rename to ogr/ogrsf_frmts/sosi/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/sosi/fyba_melding.cpp b/ogr/ogrsf_frmts/sosi/fyba_melding.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/fyba_melding.cpp rename to ogr/ogrsf_frmts/sosi/fyba_melding.cpp diff --git a/gdal/ogr/ogrsf_frmts/sosi/makefile.vc b/ogr/ogrsf_frmts/sosi/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/makefile.vc rename to ogr/ogrsf_frmts/sosi/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/sosi/ogr_sosi.h b/ogr/ogrsf_frmts/sosi/ogr_sosi.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/ogr_sosi.h rename to ogr/ogrsf_frmts/sosi/ogr_sosi.h diff --git a/gdal/ogr/ogrsf_frmts/sosi/ogrsosidatasource.cpp b/ogr/ogrsf_frmts/sosi/ogrsosidatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/ogrsosidatasource.cpp rename to ogr/ogrsf_frmts/sosi/ogrsosidatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/sosi/ogrsosidatatypes.cpp b/ogr/ogrsf_frmts/sosi/ogrsosidatatypes.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/ogrsosidatatypes.cpp rename to ogr/ogrsf_frmts/sosi/ogrsosidatatypes.cpp diff --git a/gdal/ogr/ogrsf_frmts/sosi/ogrsosidatatypes.h b/ogr/ogrsf_frmts/sosi/ogrsosidatatypes.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/ogrsosidatatypes.h rename to ogr/ogrsf_frmts/sosi/ogrsosidatatypes.h diff --git a/gdal/ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp b/ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp rename to ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp b/ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp rename to ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sosi/tools/README b/ogr/ogrsf_frmts/sosi/tools/README similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/tools/README rename to ogr/ogrsf_frmts/sosi/tools/README diff --git a/gdal/ogr/ogrsf_frmts/sosi/tools/basicelements.xslt b/ogr/ogrsf_frmts/sosi/tools/basicelements.xslt similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/tools/basicelements.xslt rename to ogr/ogrsf_frmts/sosi/tools/basicelements.xslt diff --git a/gdal/ogr/ogrsf_frmts/sosi/tools/convert.sh b/ogr/ogrsf_frmts/sosi/tools/convert.sh similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/tools/convert.sh rename to ogr/ogrsf_frmts/sosi/tools/convert.sh diff --git a/gdal/ogr/ogrsf_frmts/sosi/tools/groupelements.xslt b/ogr/ogrsf_frmts/sosi/tools/groupelements.xslt similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/tools/groupelements.xslt rename to ogr/ogrsf_frmts/sosi/tools/groupelements.xslt diff --git a/gdal/ogr/ogrsf_frmts/sosi/tools/unnorsk.xslt b/ogr/ogrsf_frmts/sosi/tools/unnorsk.xslt similarity index 100% rename from gdal/ogr/ogrsf_frmts/sosi/tools/unnorsk.xslt rename to ogr/ogrsf_frmts/sosi/tools/unnorsk.xslt diff --git a/gdal/ogr/ogrsf_frmts/sqlite/CMakeLists.txt b/ogr/ogrsf_frmts/sqlite/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/CMakeLists.txt rename to ogr/ogrsf_frmts/sqlite/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/sqlite/GNUmakefile b/ogr/ogrsf_frmts/sqlite/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/GNUmakefile rename to ogr/ogrsf_frmts/sqlite/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/sqlite/makefile.vc b/ogr/ogrsf_frmts/sqlite/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/makefile.vc rename to ogr/ogrsf_frmts/sqlite/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h rename to ogr/ogrsf_frmts/sqlite/ogr_sqlite.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlite3ext.h b/ogr/ogrsf_frmts/sqlite/ogrsqlite3ext.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlite3ext.h rename to ogr/ogrsf_frmts/sqlite/ogrsqlite3ext.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c b/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c rename to ogr/ogrsf_frmts/sqlite/ogrsqliteapiroutines.c diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h rename to ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h rename to ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h rename to ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitesinglefeaturelayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitesinglefeaturelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitesinglefeaturelayer.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqlitesinglefeaturelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h rename to ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h rename to ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h rename to ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqliteviewlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp rename to ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h rename to ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp b/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/rasterlite2.cpp rename to ogr/ogrsf_frmts/sqlite/rasterlite2.cpp diff --git a/gdal/ogr/ogrsf_frmts/sqlite/rasterlite2_header.h b/ogr/ogrsf_frmts/sqlite/rasterlite2_header.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/rasterlite2_header.h rename to ogr/ogrsf_frmts/sqlite/rasterlite2_header.h diff --git a/gdal/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c b/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c similarity index 100% rename from gdal/ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c rename to ogr/ogrsf_frmts/sqlite/test_load_virtual_ogr.c diff --git a/gdal/ogr/ogrsf_frmts/svg/CMakeLists.txt b/ogr/ogrsf_frmts/svg/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/svg/CMakeLists.txt rename to ogr/ogrsf_frmts/svg/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/svg/GNUmakefile b/ogr/ogrsf_frmts/svg/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/svg/GNUmakefile rename to ogr/ogrsf_frmts/svg/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/svg/makefile.vc b/ogr/ogrsf_frmts/svg/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/svg/makefile.vc rename to ogr/ogrsf_frmts/svg/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/svg/ogr_svg.h b/ogr/ogrsf_frmts/svg/ogr_svg.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/svg/ogr_svg.h rename to ogr/ogrsf_frmts/svg/ogr_svg.h diff --git a/gdal/ogr/ogrsf_frmts/svg/ogrsvgdatasource.cpp b/ogr/ogrsf_frmts/svg/ogrsvgdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/svg/ogrsvgdatasource.cpp rename to ogr/ogrsf_frmts/svg/ogrsvgdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp b/ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp rename to ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/svg/ogrsvglayer.cpp b/ogr/ogrsf_frmts/svg/ogrsvglayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/svg/ogrsvglayer.cpp rename to ogr/ogrsf_frmts/svg/ogrsvglayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sxf/CMakeLists.txt b/ogr/ogrsf_frmts/sxf/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/sxf/CMakeLists.txt rename to ogr/ogrsf_frmts/sxf/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/sxf/GNUmakefile b/ogr/ogrsf_frmts/sxf/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/sxf/GNUmakefile rename to ogr/ogrsf_frmts/sxf/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/sxf/makefile.vc b/ogr/ogrsf_frmts/sxf/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/sxf/makefile.vc rename to ogr/ogrsf_frmts/sxf/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/sxf/ogr_sxf.h b/ogr/ogrsf_frmts/sxf/ogr_sxf.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sxf/ogr_sxf.h rename to ogr/ogrsf_frmts/sxf/ogr_sxf.h diff --git a/gdal/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp b/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp rename to ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp b/ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp rename to ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp b/ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp rename to ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/sxf/org_sxf_defs.h b/ogr/ogrsf_frmts/sxf/org_sxf_defs.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/sxf/org_sxf_defs.h rename to ogr/ogrsf_frmts/sxf/org_sxf_defs.h diff --git a/gdal/ogr/ogrsf_frmts/tiger/CMakeLists.txt b/ogr/ogrsf_frmts/tiger/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/CMakeLists.txt rename to ogr/ogrsf_frmts/tiger/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/tiger/GNUmakefile b/ogr/ogrsf_frmts/tiger/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/GNUmakefile rename to ogr/ogrsf_frmts/tiger/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/tiger/makefile.vc b/ogr/ogrsf_frmts/tiger/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/makefile.vc rename to ogr/ogrsf_frmts/tiger/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/tiger/ogr_tiger.h b/ogr/ogrsf_frmts/tiger/ogr_tiger.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/ogr_tiger.h rename to ogr/ogrsf_frmts/tiger/ogr_tiger.h diff --git a/gdal/ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp b/ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp rename to ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp b/ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp rename to ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/ogrtigerlayer.cpp b/ogr/ogrsf_frmts/tiger/ogrtigerlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/ogrtigerlayer.cpp rename to ogr/ogrsf_frmts/tiger/ogrtigerlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigeraltname.cpp b/ogr/ogrsf_frmts/tiger/tigeraltname.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigeraltname.cpp rename to ogr/ogrsf_frmts/tiger/tigeraltname.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerarealandmarks.cpp b/ogr/ogrsf_frmts/tiger/tigerarealandmarks.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerarealandmarks.cpp rename to ogr/ogrsf_frmts/tiger/tigerarealandmarks.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp b/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp rename to ogr/ogrsf_frmts/tiger/tigercompletechain.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerentitynames.cpp b/ogr/ogrsf_frmts/tiger/tigerentitynames.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerentitynames.cpp rename to ogr/ogrsf_frmts/tiger/tigerentitynames.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerfeatureids.cpp b/ogr/ogrsf_frmts/tiger/tigerfeatureids.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerfeatureids.cpp rename to ogr/ogrsf_frmts/tiger/tigerfeatureids.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerfilebase.cpp b/ogr/ogrsf_frmts/tiger/tigerfilebase.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerfilebase.cpp rename to ogr/ogrsf_frmts/tiger/tigerfilebase.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigeridhistory.cpp b/ogr/ogrsf_frmts/tiger/tigeridhistory.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigeridhistory.cpp rename to ogr/ogrsf_frmts/tiger/tigeridhistory.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerkeyfeatures.cpp b/ogr/ogrsf_frmts/tiger/tigerkeyfeatures.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerkeyfeatures.cpp rename to ogr/ogrsf_frmts/tiger/tigerkeyfeatures.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerlandmarks.cpp b/ogr/ogrsf_frmts/tiger/tigerlandmarks.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerlandmarks.cpp rename to ogr/ogrsf_frmts/tiger/tigerlandmarks.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigeroverunder.cpp b/ogr/ogrsf_frmts/tiger/tigeroverunder.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigeroverunder.cpp rename to ogr/ogrsf_frmts/tiger/tigeroverunder.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerpip.cpp b/ogr/ogrsf_frmts/tiger/tigerpip.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerpip.cpp rename to ogr/ogrsf_frmts/tiger/tigerpip.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerpoint.cpp b/ogr/ogrsf_frmts/tiger/tigerpoint.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerpoint.cpp rename to ogr/ogrsf_frmts/tiger/tigerpoint.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerpolychainlink.cpp b/ogr/ogrsf_frmts/tiger/tigerpolychainlink.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerpolychainlink.cpp rename to ogr/ogrsf_frmts/tiger/tigerpolychainlink.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerpolygon.cpp b/ogr/ogrsf_frmts/tiger/tigerpolygon.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerpolygon.cpp rename to ogr/ogrsf_frmts/tiger/tigerpolygon.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerpolygoncorrections.cpp b/ogr/ogrsf_frmts/tiger/tigerpolygoncorrections.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerpolygoncorrections.cpp rename to ogr/ogrsf_frmts/tiger/tigerpolygoncorrections.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerpolygoneconomic.cpp b/ogr/ogrsf_frmts/tiger/tigerpolygoneconomic.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerpolygoneconomic.cpp rename to ogr/ogrsf_frmts/tiger/tigerpolygoneconomic.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerspatialmetadata.cpp b/ogr/ogrsf_frmts/tiger/tigerspatialmetadata.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerspatialmetadata.cpp rename to ogr/ogrsf_frmts/tiger/tigerspatialmetadata.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigertlidrange.cpp b/ogr/ogrsf_frmts/tiger/tigertlidrange.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigertlidrange.cpp rename to ogr/ogrsf_frmts/tiger/tigertlidrange.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerzerocellid.cpp b/ogr/ogrsf_frmts/tiger/tigerzerocellid.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerzerocellid.cpp rename to ogr/ogrsf_frmts/tiger/tigerzerocellid.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerzipcodes.cpp b/ogr/ogrsf_frmts/tiger/tigerzipcodes.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerzipcodes.cpp rename to ogr/ogrsf_frmts/tiger/tigerzipcodes.cpp diff --git a/gdal/ogr/ogrsf_frmts/tiger/tigerzipplus4.cpp b/ogr/ogrsf_frmts/tiger/tigerzipplus4.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/tiger/tigerzipplus4.cpp rename to ogr/ogrsf_frmts/tiger/tigerzipplus4.cpp diff --git a/gdal/ogr/ogrsf_frmts/vdv/CMakeLists.txt b/ogr/ogrsf_frmts/vdv/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/vdv/CMakeLists.txt rename to ogr/ogrsf_frmts/vdv/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/vdv/GNUmakefile b/ogr/ogrsf_frmts/vdv/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/vdv/GNUmakefile rename to ogr/ogrsf_frmts/vdv/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/vdv/makefile.vc b/ogr/ogrsf_frmts/vdv/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/vdv/makefile.vc rename to ogr/ogrsf_frmts/vdv/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/vdv/ogr_vdv.h b/ogr/ogrsf_frmts/vdv/ogr_vdv.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/vdv/ogr_vdv.h rename to ogr/ogrsf_frmts/vdv/ogr_vdv.h diff --git a/gdal/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp b/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp rename to ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/CMakeLists.txt b/ogr/ogrsf_frmts/vfk/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/CMakeLists.txt rename to ogr/ogrsf_frmts/vfk/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/vfk/GNUmakefile b/ogr/ogrsf_frmts/vfk/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/GNUmakefile rename to ogr/ogrsf_frmts/vfk/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/vfk/makefile.vc b/ogr/ogrsf_frmts/vfk/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/makefile.vc rename to ogr/ogrsf_frmts/vfk/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/vfk/ogr_vfk.h b/ogr/ogrsf_frmts/vfk/ogr_vfk.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/ogr_vfk.h rename to ogr/ogrsf_frmts/vfk/ogr_vfk.h diff --git a/gdal/ogr/ogrsf_frmts/vfk/ogrvfkdatasource.cpp b/ogr/ogrsf_frmts/vfk/ogrvfkdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/ogrvfkdatasource.cpp rename to ogr/ogrsf_frmts/vfk/ogrvfkdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp b/ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp rename to ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp b/ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp rename to ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkdatablock.cpp b/ogr/ogrsf_frmts/vfk/vfkdatablock.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkdatablock.cpp rename to ogr/ogrsf_frmts/vfk/vfkdatablock.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp b/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp rename to ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkfeature.cpp b/ogr/ogrsf_frmts/vfk/vfkfeature.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkfeature.cpp rename to ogr/ogrsf_frmts/vfk/vfkfeature.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkfeaturesqlite.cpp b/ogr/ogrsf_frmts/vfk/vfkfeaturesqlite.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkfeaturesqlite.cpp rename to ogr/ogrsf_frmts/vfk/vfkfeaturesqlite.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkproperty.cpp b/ogr/ogrsf_frmts/vfk/vfkproperty.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkproperty.cpp rename to ogr/ogrsf_frmts/vfk/vfkproperty.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp b/ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp rename to ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkreader.cpp b/ogr/ogrsf_frmts/vfk/vfkreader.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkreader.cpp rename to ogr/ogrsf_frmts/vfk/vfkreader.cpp diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkreader.h b/ogr/ogrsf_frmts/vfk/vfkreader.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkreader.h rename to ogr/ogrsf_frmts/vfk/vfkreader.h diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkreaderp.h b/ogr/ogrsf_frmts/vfk/vfkreaderp.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkreaderp.h rename to ogr/ogrsf_frmts/vfk/vfkreaderp.h diff --git a/gdal/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp b/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp rename to ogr/ogrsf_frmts/vfk/vfkreadersqlite.cpp diff --git a/gdal/ogr/ogrsf_frmts/vrt/CMakeLists.txt b/ogr/ogrsf_frmts/vrt/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/vrt/CMakeLists.txt rename to ogr/ogrsf_frmts/vrt/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/vrt/GNUmakefile b/ogr/ogrsf_frmts/vrt/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/vrt/GNUmakefile rename to ogr/ogrsf_frmts/vrt/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/vrt/makefile.vc b/ogr/ogrsf_frmts/vrt/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/vrt/makefile.vc rename to ogr/ogrsf_frmts/vrt/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/vrt/ogr_vrt.h b/ogr/ogrsf_frmts/vrt/ogr_vrt.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/vrt/ogr_vrt.h rename to ogr/ogrsf_frmts/vrt/ogr_vrt.h diff --git a/gdal/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp b/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp rename to ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp b/ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp rename to ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp b/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp rename to ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/walk/CMakeLists.txt b/ogr/ogrsf_frmts/walk/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/CMakeLists.txt rename to ogr/ogrsf_frmts/walk/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/walk/GNUmakefile b/ogr/ogrsf_frmts/walk/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/GNUmakefile rename to ogr/ogrsf_frmts/walk/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/walk/makefile.vc b/ogr/ogrsf_frmts/walk/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/makefile.vc rename to ogr/ogrsf_frmts/walk/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/walk/ogis_geometry_wkb_struct.h b/ogr/ogrsf_frmts/walk/ogis_geometry_wkb_struct.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/ogis_geometry_wkb_struct.h rename to ogr/ogrsf_frmts/walk/ogis_geometry_wkb_struct.h diff --git a/gdal/ogr/ogrsf_frmts/walk/ogrwalk.h b/ogr/ogrsf_frmts/walk/ogrwalk.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/ogrwalk.h rename to ogr/ogrsf_frmts/walk/ogrwalk.h diff --git a/gdal/ogr/ogrsf_frmts/walk/ogrwalkdatasource.cpp b/ogr/ogrsf_frmts/walk/ogrwalkdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/ogrwalkdatasource.cpp rename to ogr/ogrsf_frmts/walk/ogrwalkdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/walk/ogrwalkdriver.cpp b/ogr/ogrsf_frmts/walk/ogrwalkdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/ogrwalkdriver.cpp rename to ogr/ogrsf_frmts/walk/ogrwalkdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/walk/ogrwalklayer.cpp b/ogr/ogrsf_frmts/walk/ogrwalklayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/ogrwalklayer.cpp rename to ogr/ogrsf_frmts/walk/ogrwalklayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/walk/ogrwalkselectlayer.cpp b/ogr/ogrsf_frmts/walk/ogrwalkselectlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/ogrwalkselectlayer.cpp rename to ogr/ogrsf_frmts/walk/ogrwalkselectlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/walk/ogrwalktablelayer.cpp b/ogr/ogrsf_frmts/walk/ogrwalktablelayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/ogrwalktablelayer.cpp rename to ogr/ogrsf_frmts/walk/ogrwalktablelayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/walk/ogrwalktool.cpp b/ogr/ogrsf_frmts/walk/ogrwalktool.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/walk/ogrwalktool.cpp rename to ogr/ogrsf_frmts/walk/ogrwalktool.cpp diff --git a/gdal/ogr/ogrsf_frmts/wasp/CMakeLists.txt b/ogr/ogrsf_frmts/wasp/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/wasp/CMakeLists.txt rename to ogr/ogrsf_frmts/wasp/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/wasp/GNUmakefile b/ogr/ogrsf_frmts/wasp/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/wasp/GNUmakefile rename to ogr/ogrsf_frmts/wasp/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/wasp/makefile.vc b/ogr/ogrsf_frmts/wasp/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/wasp/makefile.vc rename to ogr/ogrsf_frmts/wasp/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/wasp/ogrwasp.h b/ogr/ogrsf_frmts/wasp/ogrwasp.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/wasp/ogrwasp.h rename to ogr/ogrsf_frmts/wasp/ogrwasp.h diff --git a/gdal/ogr/ogrsf_frmts/wasp/ogrwaspdatasource.cpp b/ogr/ogrsf_frmts/wasp/ogrwaspdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wasp/ogrwaspdatasource.cpp rename to ogr/ogrsf_frmts/wasp/ogrwaspdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp b/ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp rename to ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp b/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp rename to ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/wfs/CMakeLists.txt b/ogr/ogrsf_frmts/wfs/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/CMakeLists.txt rename to ogr/ogrsf_frmts/wfs/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/wfs/GNUmakefile b/ogr/ogrsf_frmts/wfs/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/GNUmakefile rename to ogr/ogrsf_frmts/wfs/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/wfs/WFSServersList.txt b/ogr/ogrsf_frmts/wfs/WFSServersList.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/WFSServersList.txt rename to ogr/ogrsf_frmts/wfs/WFSServersList.txt diff --git a/gdal/ogr/ogrsf_frmts/wfs/makefile.vc b/ogr/ogrsf_frmts/wfs/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/makefile.vc rename to ogr/ogrsf_frmts/wfs/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogr_wfs.h b/ogr/ogrsf_frmts/wfs/ogr_wfs.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/ogr_wfs.h rename to ogr/ogrsf_frmts/wfs/ogr_wfs.h diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp b/ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp rename to ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp b/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp rename to ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp b/ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp rename to ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp b/ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp rename to ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfsjoinlayer.cpp b/ogr/ogrsf_frmts/wfs/ogrwfsjoinlayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/ogrwfsjoinlayer.cpp rename to ogr/ogrsf_frmts/wfs/ogrwfsjoinlayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp rename to ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/xls/CMakeLists.txt b/ogr/ogrsf_frmts/xls/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/xls/CMakeLists.txt rename to ogr/ogrsf_frmts/xls/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/xls/GNUmakefile b/ogr/ogrsf_frmts/xls/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/xls/GNUmakefile rename to ogr/ogrsf_frmts/xls/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/xls/makefile.vc b/ogr/ogrsf_frmts/xls/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/xls/makefile.vc rename to ogr/ogrsf_frmts/xls/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/xls/ogr_xls.h b/ogr/ogrsf_frmts/xls/ogr_xls.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/xls/ogr_xls.h rename to ogr/ogrsf_frmts/xls/ogr_xls.h diff --git a/gdal/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp b/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp rename to ogr/ogrsf_frmts/xls/ogrxlsdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp b/ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp rename to ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp diff --git a/gdal/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp b/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/xls/ogrxlslayer.cpp rename to ogr/ogrsf_frmts/xls/ogrxlslayer.cpp diff --git a/gdal/ogr/ogrsf_frmts/xlsx/CMakeLists.txt b/ogr/ogrsf_frmts/xlsx/CMakeLists.txt similarity index 100% rename from gdal/ogr/ogrsf_frmts/xlsx/CMakeLists.txt rename to ogr/ogrsf_frmts/xlsx/CMakeLists.txt diff --git a/gdal/ogr/ogrsf_frmts/xlsx/GNUmakefile b/ogr/ogrsf_frmts/xlsx/GNUmakefile similarity index 100% rename from gdal/ogr/ogrsf_frmts/xlsx/GNUmakefile rename to ogr/ogrsf_frmts/xlsx/GNUmakefile diff --git a/gdal/ogr/ogrsf_frmts/xlsx/makefile.vc b/ogr/ogrsf_frmts/xlsx/makefile.vc similarity index 100% rename from gdal/ogr/ogrsf_frmts/xlsx/makefile.vc rename to ogr/ogrsf_frmts/xlsx/makefile.vc diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h b/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h similarity index 100% rename from gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h rename to ogr/ogrsf_frmts/xlsx/ogr_xlsx.h diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp b/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp rename to ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp diff --git a/gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp b/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp similarity index 100% rename from gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp rename to ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp diff --git a/gdal/ogr/ogrspatialreference.cpp b/ogr/ogrspatialreference.cpp similarity index 100% rename from gdal/ogr/ogrspatialreference.cpp rename to ogr/ogrspatialreference.cpp diff --git a/gdal/ogr/ogrsurface.cpp b/ogr/ogrsurface.cpp similarity index 100% rename from gdal/ogr/ogrsurface.cpp rename to ogr/ogrsurface.cpp diff --git a/gdal/ogr/ogrtriangle.cpp b/ogr/ogrtriangle.cpp similarity index 100% rename from gdal/ogr/ogrtriangle.cpp rename to ogr/ogrtriangle.cpp diff --git a/gdal/ogr/ogrtriangulatedsurface.cpp b/ogr/ogrtriangulatedsurface.cpp similarity index 100% rename from gdal/ogr/ogrtriangulatedsurface.cpp rename to ogr/ogrtriangulatedsurface.cpp diff --git a/gdal/ogr/ogrutils.cpp b/ogr/ogrutils.cpp similarity index 100% rename from gdal/ogr/ogrutils.cpp rename to ogr/ogrutils.cpp diff --git a/gdal/ogr/style_ogr_brush.png b/ogr/style_ogr_brush.png similarity index 100% rename from gdal/ogr/style_ogr_brush.png rename to ogr/style_ogr_brush.png diff --git a/gdal/ogr/style_ogr_sym.png b/ogr/style_ogr_sym.png similarity index 100% rename from gdal/ogr/style_ogr_sym.png rename to ogr/style_ogr_sym.png diff --git a/gdal/ogr/style_pen1.gif b/ogr/style_pen1.gif similarity index 100% rename from gdal/ogr/style_pen1.gif rename to ogr/style_pen1.gif diff --git a/gdal/ogr/style_pen2.gif b/ogr/style_pen2.gif similarity index 100% rename from gdal/ogr/style_pen2.gif rename to ogr/style_pen2.gif diff --git a/gdal/ogr/style_pen3.gif b/ogr/style_pen3.gif similarity index 100% rename from gdal/ogr/style_pen3.gif rename to ogr/style_pen3.gif diff --git a/gdal/ogr/style_textanchor.gif b/ogr/style_textanchor.gif similarity index 100% rename from gdal/ogr/style_textanchor.gif rename to ogr/style_textanchor.gif diff --git a/gdal/ogr/swq.cpp b/ogr/swq.cpp similarity index 100% rename from gdal/ogr/swq.cpp rename to ogr/swq.cpp diff --git a/gdal/ogr/swq_expr_node.cpp b/ogr/swq_expr_node.cpp similarity index 100% rename from gdal/ogr/swq_expr_node.cpp rename to ogr/swq_expr_node.cpp diff --git a/gdal/ogr/swq_op_general.cpp b/ogr/swq_op_general.cpp similarity index 100% rename from gdal/ogr/swq_op_general.cpp rename to ogr/swq_op_general.cpp diff --git a/gdal/ogr/swq_op_registrar.cpp b/ogr/swq_op_registrar.cpp similarity index 100% rename from gdal/ogr/swq_op_registrar.cpp rename to ogr/swq_op_registrar.cpp diff --git a/gdal/ogr/swq_parser.cpp b/ogr/swq_parser.cpp similarity index 100% rename from gdal/ogr/swq_parser.cpp rename to ogr/swq_parser.cpp diff --git a/gdal/ogr/swq_parser.hpp b/ogr/swq_parser.hpp similarity index 100% rename from gdal/ogr/swq_parser.hpp rename to ogr/swq_parser.hpp diff --git a/gdal/ogr/swq_parser.y b/ogr/swq_parser.y similarity index 100% rename from gdal/ogr/swq_parser.y rename to ogr/swq_parser.y diff --git a/gdal/ogr/swq_select.cpp b/ogr/swq_select.cpp similarity index 100% rename from gdal/ogr/swq_select.cpp rename to ogr/swq_select.cpp diff --git a/gdal/ogr/test_geo_utils.cpp b/ogr/test_geo_utils.cpp similarity index 100% rename from gdal/ogr/test_geo_utils.cpp rename to ogr/test_geo_utils.cpp diff --git a/gdal/perftests/cog.py b/perftests/cog.py similarity index 100% rename from gdal/perftests/cog.py rename to perftests/cog.py diff --git a/gdal/perftests/computestatistics.py b/perftests/computestatistics.py similarity index 100% rename from gdal/perftests/computestatistics.py rename to perftests/computestatistics.py diff --git a/gdal/perftests/downsample_integer_factor.py b/perftests/downsample_integer_factor.py similarity index 100% rename from gdal/perftests/downsample_integer_factor.py rename to perftests/downsample_integer_factor.py diff --git a/gdal/perftests/overview.py b/perftests/overview.py similarity index 100% rename from gdal/perftests/overview.py rename to perftests/overview.py diff --git a/gdal/port/CMakeLists.txt b/port/CMakeLists.txt similarity index 100% rename from gdal/port/CMakeLists.txt rename to port/CMakeLists.txt diff --git a/gdal/port/GNUmakefile b/port/GNUmakefile similarity index 100% rename from gdal/port/GNUmakefile rename to port/GNUmakefile diff --git a/gdal/port/LICENCE_minizip b/port/LICENCE_minizip similarity index 100% rename from gdal/port/LICENCE_minizip rename to port/LICENCE_minizip diff --git a/gdal/port/cpl_alibaba_oss.cpp b/port/cpl_alibaba_oss.cpp similarity index 100% rename from gdal/port/cpl_alibaba_oss.cpp rename to port/cpl_alibaba_oss.cpp diff --git a/gdal/port/cpl_alibaba_oss.h b/port/cpl_alibaba_oss.h similarity index 100% rename from gdal/port/cpl_alibaba_oss.h rename to port/cpl_alibaba_oss.h diff --git a/gdal/port/cpl_atomic_ops.cpp b/port/cpl_atomic_ops.cpp similarity index 100% rename from gdal/port/cpl_atomic_ops.cpp rename to port/cpl_atomic_ops.cpp diff --git a/gdal/port/cpl_atomic_ops.h b/port/cpl_atomic_ops.h similarity index 100% rename from gdal/port/cpl_atomic_ops.h rename to port/cpl_atomic_ops.h diff --git a/gdal/port/cpl_auto_close.h b/port/cpl_auto_close.h similarity index 100% rename from gdal/port/cpl_auto_close.h rename to port/cpl_auto_close.h diff --git a/gdal/port/cpl_aws.cpp b/port/cpl_aws.cpp similarity index 100% rename from gdal/port/cpl_aws.cpp rename to port/cpl_aws.cpp diff --git a/gdal/port/cpl_aws.h b/port/cpl_aws.h similarity index 100% rename from gdal/port/cpl_aws.h rename to port/cpl_aws.h diff --git a/gdal/port/cpl_aws_win32.cpp b/port/cpl_aws_win32.cpp similarity index 100% rename from gdal/port/cpl_aws_win32.cpp rename to port/cpl_aws_win32.cpp diff --git a/gdal/port/cpl_azure.cpp b/port/cpl_azure.cpp similarity index 100% rename from gdal/port/cpl_azure.cpp rename to port/cpl_azure.cpp diff --git a/gdal/port/cpl_azure.h b/port/cpl_azure.h similarity index 100% rename from gdal/port/cpl_azure.h rename to port/cpl_azure.h diff --git a/gdal/port/cpl_base64.cpp b/port/cpl_base64.cpp similarity index 100% rename from gdal/port/cpl_base64.cpp rename to port/cpl_base64.cpp diff --git a/gdal/port/cpl_compressor.cpp b/port/cpl_compressor.cpp similarity index 100% rename from gdal/port/cpl_compressor.cpp rename to port/cpl_compressor.cpp diff --git a/gdal/port/cpl_compressor.h b/port/cpl_compressor.h similarity index 100% rename from gdal/port/cpl_compressor.h rename to port/cpl_compressor.h diff --git a/gdal/port/cpl_config.h.in b/port/cpl_config.h.in similarity index 100% rename from gdal/port/cpl_config.h.in rename to port/cpl_config.h.in diff --git a/gdal/port/cpl_config.h.vc.begin b/port/cpl_config.h.vc.begin similarity index 100% rename from gdal/port/cpl_config.h.vc.begin rename to port/cpl_config.h.vc.begin diff --git a/gdal/port/cpl_config.h.vc.common b/port/cpl_config.h.vc.common similarity index 100% rename from gdal/port/cpl_config.h.vc.common rename to port/cpl_config.h.vc.common diff --git a/gdal/port/cpl_config.h.vc.end b/port/cpl_config.h.vc.end similarity index 100% rename from gdal/port/cpl_config.h.vc.end rename to port/cpl_config.h.vc.end diff --git a/gdal/port/cpl_config.h.vc.no_dll b/port/cpl_config.h.vc.no_dll similarity index 100% rename from gdal/port/cpl_config.h.vc.no_dll rename to port/cpl_config.h.vc.no_dll diff --git a/gdal/port/cpl_config_extras.h b/port/cpl_config_extras.h similarity index 100% rename from gdal/port/cpl_config_extras.h rename to port/cpl_config_extras.h diff --git a/gdal/port/cpl_conv.cpp b/port/cpl_conv.cpp similarity index 100% rename from gdal/port/cpl_conv.cpp rename to port/cpl_conv.cpp diff --git a/gdal/port/cpl_conv.h b/port/cpl_conv.h similarity index 100% rename from gdal/port/cpl_conv.h rename to port/cpl_conv.h diff --git a/gdal/port/cpl_cpu_features.cpp b/port/cpl_cpu_features.cpp similarity index 100% rename from gdal/port/cpl_cpu_features.cpp rename to port/cpl_cpu_features.cpp diff --git a/gdal/port/cpl_cpu_features.h b/port/cpl_cpu_features.h similarity index 100% rename from gdal/port/cpl_cpu_features.h rename to port/cpl_cpu_features.h diff --git a/gdal/port/cpl_csv.cpp b/port/cpl_csv.cpp similarity index 100% rename from gdal/port/cpl_csv.cpp rename to port/cpl_csv.cpp diff --git a/gdal/port/cpl_csv.h b/port/cpl_csv.h similarity index 100% rename from gdal/port/cpl_csv.h rename to port/cpl_csv.h diff --git a/gdal/port/cpl_curl_priv.h b/port/cpl_curl_priv.h similarity index 100% rename from gdal/port/cpl_curl_priv.h rename to port/cpl_curl_priv.h diff --git a/gdal/port/cpl_error.cpp b/port/cpl_error.cpp similarity index 100% rename from gdal/port/cpl_error.cpp rename to port/cpl_error.cpp diff --git a/gdal/port/cpl_error.h b/port/cpl_error.h similarity index 100% rename from gdal/port/cpl_error.h rename to port/cpl_error.h diff --git a/gdal/port/cpl_error_internal.h b/port/cpl_error_internal.h similarity index 100% rename from gdal/port/cpl_error_internal.h rename to port/cpl_error_internal.h diff --git a/gdal/port/cpl_findfile.cpp b/port/cpl_findfile.cpp similarity index 100% rename from gdal/port/cpl_findfile.cpp rename to port/cpl_findfile.cpp diff --git a/gdal/port/cpl_getexecpath.cpp b/port/cpl_getexecpath.cpp similarity index 100% rename from gdal/port/cpl_getexecpath.cpp rename to port/cpl_getexecpath.cpp diff --git a/gdal/port/cpl_google_cloud.cpp b/port/cpl_google_cloud.cpp similarity index 100% rename from gdal/port/cpl_google_cloud.cpp rename to port/cpl_google_cloud.cpp diff --git a/gdal/port/cpl_google_cloud.h b/port/cpl_google_cloud.h similarity index 100% rename from gdal/port/cpl_google_cloud.h rename to port/cpl_google_cloud.h diff --git a/gdal/port/cpl_google_oauth2.cpp b/port/cpl_google_oauth2.cpp similarity index 100% rename from gdal/port/cpl_google_oauth2.cpp rename to port/cpl_google_oauth2.cpp diff --git a/gdal/port/cpl_hash_set.cpp b/port/cpl_hash_set.cpp similarity index 100% rename from gdal/port/cpl_hash_set.cpp rename to port/cpl_hash_set.cpp diff --git a/gdal/port/cpl_hash_set.h b/port/cpl_hash_set.h similarity index 100% rename from gdal/port/cpl_hash_set.h rename to port/cpl_hash_set.h diff --git a/gdal/port/cpl_http.cpp b/port/cpl_http.cpp similarity index 100% rename from gdal/port/cpl_http.cpp rename to port/cpl_http.cpp diff --git a/gdal/port/cpl_http.h b/port/cpl_http.h similarity index 100% rename from gdal/port/cpl_http.h rename to port/cpl_http.h diff --git a/gdal/port/cpl_json.cpp b/port/cpl_json.cpp similarity index 100% rename from gdal/port/cpl_json.cpp rename to port/cpl_json.cpp diff --git a/gdal/port/cpl_json.h b/port/cpl_json.h similarity index 100% rename from gdal/port/cpl_json.h rename to port/cpl_json.h diff --git a/gdal/port/cpl_json_header.h b/port/cpl_json_header.h similarity index 100% rename from gdal/port/cpl_json_header.h rename to port/cpl_json_header.h diff --git a/gdal/port/cpl_json_streaming_parser.cpp b/port/cpl_json_streaming_parser.cpp similarity index 100% rename from gdal/port/cpl_json_streaming_parser.cpp rename to port/cpl_json_streaming_parser.cpp diff --git a/gdal/port/cpl_json_streaming_parser.h b/port/cpl_json_streaming_parser.h similarity index 100% rename from gdal/port/cpl_json_streaming_parser.h rename to port/cpl_json_streaming_parser.h diff --git a/gdal/port/cpl_json_streaming_writer.cpp b/port/cpl_json_streaming_writer.cpp similarity index 100% rename from gdal/port/cpl_json_streaming_writer.cpp rename to port/cpl_json_streaming_writer.cpp diff --git a/gdal/port/cpl_json_streaming_writer.h b/port/cpl_json_streaming_writer.h similarity index 100% rename from gdal/port/cpl_json_streaming_writer.h rename to port/cpl_json_streaming_writer.h diff --git a/gdal/port/cpl_list.cpp b/port/cpl_list.cpp similarity index 100% rename from gdal/port/cpl_list.cpp rename to port/cpl_list.cpp diff --git a/gdal/port/cpl_list.h b/port/cpl_list.h similarity index 100% rename from gdal/port/cpl_list.h rename to port/cpl_list.h diff --git a/gdal/port/cpl_md5.cpp b/port/cpl_md5.cpp similarity index 100% rename from gdal/port/cpl_md5.cpp rename to port/cpl_md5.cpp diff --git a/gdal/port/cpl_md5.h b/port/cpl_md5.h similarity index 100% rename from gdal/port/cpl_md5.h rename to port/cpl_md5.h diff --git a/gdal/port/cpl_mem_cache.h b/port/cpl_mem_cache.h similarity index 100% rename from gdal/port/cpl_mem_cache.h rename to port/cpl_mem_cache.h diff --git a/gdal/port/cpl_minixml.cpp b/port/cpl_minixml.cpp similarity index 100% rename from gdal/port/cpl_minixml.cpp rename to port/cpl_minixml.cpp diff --git a/gdal/port/cpl_minixml.h b/port/cpl_minixml.h similarity index 100% rename from gdal/port/cpl_minixml.h rename to port/cpl_minixml.h diff --git a/gdal/port/cpl_minizip_ioapi.cpp b/port/cpl_minizip_ioapi.cpp similarity index 100% rename from gdal/port/cpl_minizip_ioapi.cpp rename to port/cpl_minizip_ioapi.cpp diff --git a/gdal/port/cpl_minizip_ioapi.h b/port/cpl_minizip_ioapi.h similarity index 100% rename from gdal/port/cpl_minizip_ioapi.h rename to port/cpl_minizip_ioapi.h diff --git a/gdal/port/cpl_minizip_unzip.cpp b/port/cpl_minizip_unzip.cpp similarity index 100% rename from gdal/port/cpl_minizip_unzip.cpp rename to port/cpl_minizip_unzip.cpp diff --git a/gdal/port/cpl_minizip_unzip.h b/port/cpl_minizip_unzip.h similarity index 100% rename from gdal/port/cpl_minizip_unzip.h rename to port/cpl_minizip_unzip.h diff --git a/gdal/port/cpl_minizip_zip.cpp b/port/cpl_minizip_zip.cpp similarity index 100% rename from gdal/port/cpl_minizip_zip.cpp rename to port/cpl_minizip_zip.cpp diff --git a/gdal/port/cpl_minizip_zip.h b/port/cpl_minizip_zip.h similarity index 100% rename from gdal/port/cpl_minizip_zip.h rename to port/cpl_minizip_zip.h diff --git a/gdal/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp similarity index 100% rename from gdal/port/cpl_multiproc.cpp rename to port/cpl_multiproc.cpp diff --git a/gdal/port/cpl_multiproc.h b/port/cpl_multiproc.h similarity index 100% rename from gdal/port/cpl_multiproc.h rename to port/cpl_multiproc.h diff --git a/gdal/port/cpl_odbc.cpp b/port/cpl_odbc.cpp similarity index 100% rename from gdal/port/cpl_odbc.cpp rename to port/cpl_odbc.cpp diff --git a/gdal/port/cpl_odbc.h b/port/cpl_odbc.h similarity index 100% rename from gdal/port/cpl_odbc.h rename to port/cpl_odbc.h diff --git a/gdal/port/cpl_path.cpp b/port/cpl_path.cpp similarity index 100% rename from gdal/port/cpl_path.cpp rename to port/cpl_path.cpp diff --git a/gdal/port/cpl_port.h b/port/cpl_port.h similarity index 100% rename from gdal/port/cpl_port.h rename to port/cpl_port.h diff --git a/gdal/port/cpl_progress.cpp b/port/cpl_progress.cpp similarity index 100% rename from gdal/port/cpl_progress.cpp rename to port/cpl_progress.cpp diff --git a/gdal/port/cpl_progress.h b/port/cpl_progress.h similarity index 100% rename from gdal/port/cpl_progress.h rename to port/cpl_progress.h diff --git a/gdal/port/cpl_quad_tree.cpp b/port/cpl_quad_tree.cpp similarity index 100% rename from gdal/port/cpl_quad_tree.cpp rename to port/cpl_quad_tree.cpp diff --git a/gdal/port/cpl_quad_tree.h b/port/cpl_quad_tree.h similarity index 100% rename from gdal/port/cpl_quad_tree.h rename to port/cpl_quad_tree.h diff --git a/gdal/port/cpl_recode.cpp b/port/cpl_recode.cpp similarity index 100% rename from gdal/port/cpl_recode.cpp rename to port/cpl_recode.cpp diff --git a/gdal/port/cpl_recode_iconv.cpp b/port/cpl_recode_iconv.cpp similarity index 100% rename from gdal/port/cpl_recode_iconv.cpp rename to port/cpl_recode_iconv.cpp diff --git a/gdal/port/cpl_recode_stub.cpp b/port/cpl_recode_stub.cpp similarity index 100% rename from gdal/port/cpl_recode_stub.cpp rename to port/cpl_recode_stub.cpp diff --git a/gdal/port/cpl_safemaths.hpp b/port/cpl_safemaths.hpp similarity index 100% rename from gdal/port/cpl_safemaths.hpp rename to port/cpl_safemaths.hpp diff --git a/gdal/port/cpl_sha1.cpp b/port/cpl_sha1.cpp similarity index 100% rename from gdal/port/cpl_sha1.cpp rename to port/cpl_sha1.cpp diff --git a/gdal/port/cpl_sha1.h b/port/cpl_sha1.h similarity index 100% rename from gdal/port/cpl_sha1.h rename to port/cpl_sha1.h diff --git a/gdal/port/cpl_sha256.cpp b/port/cpl_sha256.cpp similarity index 100% rename from gdal/port/cpl_sha256.cpp rename to port/cpl_sha256.cpp diff --git a/gdal/port/cpl_sha256.h b/port/cpl_sha256.h similarity index 100% rename from gdal/port/cpl_sha256.h rename to port/cpl_sha256.h diff --git a/gdal/port/cpl_spawn.cpp b/port/cpl_spawn.cpp similarity index 100% rename from gdal/port/cpl_spawn.cpp rename to port/cpl_spawn.cpp diff --git a/gdal/port/cpl_spawn.h b/port/cpl_spawn.h similarity index 100% rename from gdal/port/cpl_spawn.h rename to port/cpl_spawn.h diff --git a/gdal/port/cpl_string.cpp b/port/cpl_string.cpp similarity index 100% rename from gdal/port/cpl_string.cpp rename to port/cpl_string.cpp diff --git a/gdal/port/cpl_string.h b/port/cpl_string.h similarity index 100% rename from gdal/port/cpl_string.h rename to port/cpl_string.h diff --git a/gdal/port/cpl_strtod.cpp b/port/cpl_strtod.cpp similarity index 100% rename from gdal/port/cpl_strtod.cpp rename to port/cpl_strtod.cpp diff --git a/gdal/port/cpl_swift.cpp b/port/cpl_swift.cpp similarity index 100% rename from gdal/port/cpl_swift.cpp rename to port/cpl_swift.cpp diff --git a/gdal/port/cpl_swift.h b/port/cpl_swift.h similarity index 100% rename from gdal/port/cpl_swift.h rename to port/cpl_swift.h diff --git a/gdal/port/cpl_time.cpp b/port/cpl_time.cpp similarity index 100% rename from gdal/port/cpl_time.cpp rename to port/cpl_time.cpp diff --git a/gdal/port/cpl_time.h b/port/cpl_time.h similarity index 100% rename from gdal/port/cpl_time.h rename to port/cpl_time.h diff --git a/gdal/port/cpl_userfaultfd.cpp b/port/cpl_userfaultfd.cpp similarity index 100% rename from gdal/port/cpl_userfaultfd.cpp rename to port/cpl_userfaultfd.cpp diff --git a/gdal/port/cpl_userfaultfd.h b/port/cpl_userfaultfd.h similarity index 100% rename from gdal/port/cpl_userfaultfd.h rename to port/cpl_userfaultfd.h diff --git a/gdal/port/cpl_vax.cpp b/port/cpl_vax.cpp similarity index 100% rename from gdal/port/cpl_vax.cpp rename to port/cpl_vax.cpp diff --git a/gdal/port/cpl_vax.h b/port/cpl_vax.h similarity index 100% rename from gdal/port/cpl_vax.h rename to port/cpl_vax.h diff --git a/gdal/port/cpl_virtualmem.cpp b/port/cpl_virtualmem.cpp similarity index 100% rename from gdal/port/cpl_virtualmem.cpp rename to port/cpl_virtualmem.cpp diff --git a/gdal/port/cpl_virtualmem.h b/port/cpl_virtualmem.h similarity index 100% rename from gdal/port/cpl_virtualmem.h rename to port/cpl_virtualmem.h diff --git a/gdal/port/cpl_vsi.h b/port/cpl_vsi.h similarity index 100% rename from gdal/port/cpl_vsi.h rename to port/cpl_vsi.h diff --git a/gdal/port/cpl_vsi_error.cpp b/port/cpl_vsi_error.cpp similarity index 100% rename from gdal/port/cpl_vsi_error.cpp rename to port/cpl_vsi_error.cpp diff --git a/gdal/port/cpl_vsi_error.h b/port/cpl_vsi_error.h similarity index 100% rename from gdal/port/cpl_vsi_error.h rename to port/cpl_vsi_error.h diff --git a/gdal/port/cpl_vsi_mem.cpp b/port/cpl_vsi_mem.cpp similarity index 100% rename from gdal/port/cpl_vsi_mem.cpp rename to port/cpl_vsi_mem.cpp diff --git a/gdal/port/cpl_vsi_virtual.h b/port/cpl_vsi_virtual.h similarity index 100% rename from gdal/port/cpl_vsi_virtual.h rename to port/cpl_vsi_virtual.h diff --git a/gdal/port/cpl_vsil.cpp b/port/cpl_vsil.cpp similarity index 100% rename from gdal/port/cpl_vsil.cpp rename to port/cpl_vsil.cpp diff --git a/gdal/port/cpl_vsil_abstract_archive.cpp b/port/cpl_vsil_abstract_archive.cpp similarity index 100% rename from gdal/port/cpl_vsil_abstract_archive.cpp rename to port/cpl_vsil_abstract_archive.cpp diff --git a/gdal/port/cpl_vsil_adls.cpp b/port/cpl_vsil_adls.cpp similarity index 100% rename from gdal/port/cpl_vsil_adls.cpp rename to port/cpl_vsil_adls.cpp diff --git a/gdal/port/cpl_vsil_az.cpp b/port/cpl_vsil_az.cpp similarity index 100% rename from gdal/port/cpl_vsil_az.cpp rename to port/cpl_vsil_az.cpp diff --git a/gdal/port/cpl_vsil_buffered_reader.cpp b/port/cpl_vsil_buffered_reader.cpp similarity index 100% rename from gdal/port/cpl_vsil_buffered_reader.cpp rename to port/cpl_vsil_buffered_reader.cpp diff --git a/gdal/port/cpl_vsil_cache.cpp b/port/cpl_vsil_cache.cpp similarity index 100% rename from gdal/port/cpl_vsil_cache.cpp rename to port/cpl_vsil_cache.cpp diff --git a/gdal/port/cpl_vsil_crypt.cpp b/port/cpl_vsil_crypt.cpp similarity index 100% rename from gdal/port/cpl_vsil_crypt.cpp rename to port/cpl_vsil_crypt.cpp diff --git a/gdal/port/cpl_vsil_curl.cpp b/port/cpl_vsil_curl.cpp similarity index 100% rename from gdal/port/cpl_vsil_curl.cpp rename to port/cpl_vsil_curl.cpp diff --git a/gdal/port/cpl_vsil_curl_class.h b/port/cpl_vsil_curl_class.h similarity index 100% rename from gdal/port/cpl_vsil_curl_class.h rename to port/cpl_vsil_curl_class.h diff --git a/gdal/port/cpl_vsil_curl_priv.h b/port/cpl_vsil_curl_priv.h similarity index 100% rename from gdal/port/cpl_vsil_curl_priv.h rename to port/cpl_vsil_curl_priv.h diff --git a/gdal/port/cpl_vsil_curl_streaming.cpp b/port/cpl_vsil_curl_streaming.cpp similarity index 100% rename from gdal/port/cpl_vsil_curl_streaming.cpp rename to port/cpl_vsil_curl_streaming.cpp diff --git a/gdal/port/cpl_vsil_gs.cpp b/port/cpl_vsil_gs.cpp similarity index 100% rename from gdal/port/cpl_vsil_gs.cpp rename to port/cpl_vsil_gs.cpp diff --git a/gdal/port/cpl_vsil_gzip.cpp b/port/cpl_vsil_gzip.cpp similarity index 100% rename from gdal/port/cpl_vsil_gzip.cpp rename to port/cpl_vsil_gzip.cpp diff --git a/gdal/port/cpl_vsil_hdfs.cpp b/port/cpl_vsil_hdfs.cpp similarity index 100% rename from gdal/port/cpl_vsil_hdfs.cpp rename to port/cpl_vsil_hdfs.cpp diff --git a/gdal/port/cpl_vsil_oss.cpp b/port/cpl_vsil_oss.cpp similarity index 100% rename from gdal/port/cpl_vsil_oss.cpp rename to port/cpl_vsil_oss.cpp diff --git a/gdal/port/cpl_vsil_plugin.cpp b/port/cpl_vsil_plugin.cpp similarity index 100% rename from gdal/port/cpl_vsil_plugin.cpp rename to port/cpl_vsil_plugin.cpp diff --git a/gdal/port/cpl_vsil_plugin.h b/port/cpl_vsil_plugin.h similarity index 100% rename from gdal/port/cpl_vsil_plugin.h rename to port/cpl_vsil_plugin.h diff --git a/gdal/port/cpl_vsil_s3.cpp b/port/cpl_vsil_s3.cpp similarity index 100% rename from gdal/port/cpl_vsil_s3.cpp rename to port/cpl_vsil_s3.cpp diff --git a/gdal/port/cpl_vsil_simple.cpp b/port/cpl_vsil_simple.cpp similarity index 100% rename from gdal/port/cpl_vsil_simple.cpp rename to port/cpl_vsil_simple.cpp diff --git a/gdal/port/cpl_vsil_sparsefile.cpp b/port/cpl_vsil_sparsefile.cpp similarity index 100% rename from gdal/port/cpl_vsil_sparsefile.cpp rename to port/cpl_vsil_sparsefile.cpp diff --git a/gdal/port/cpl_vsil_stdin.cpp b/port/cpl_vsil_stdin.cpp similarity index 100% rename from gdal/port/cpl_vsil_stdin.cpp rename to port/cpl_vsil_stdin.cpp diff --git a/gdal/port/cpl_vsil_stdout.cpp b/port/cpl_vsil_stdout.cpp similarity index 100% rename from gdal/port/cpl_vsil_stdout.cpp rename to port/cpl_vsil_stdout.cpp diff --git a/gdal/port/cpl_vsil_subfile.cpp b/port/cpl_vsil_subfile.cpp similarity index 100% rename from gdal/port/cpl_vsil_subfile.cpp rename to port/cpl_vsil_subfile.cpp diff --git a/gdal/port/cpl_vsil_swift.cpp b/port/cpl_vsil_swift.cpp similarity index 100% rename from gdal/port/cpl_vsil_swift.cpp rename to port/cpl_vsil_swift.cpp diff --git a/gdal/port/cpl_vsil_tar.cpp b/port/cpl_vsil_tar.cpp similarity index 100% rename from gdal/port/cpl_vsil_tar.cpp rename to port/cpl_vsil_tar.cpp diff --git a/gdal/port/cpl_vsil_unix_stdio_64.cpp b/port/cpl_vsil_unix_stdio_64.cpp similarity index 100% rename from gdal/port/cpl_vsil_unix_stdio_64.cpp rename to port/cpl_vsil_unix_stdio_64.cpp diff --git a/gdal/port/cpl_vsil_uploadonclose.cpp b/port/cpl_vsil_uploadonclose.cpp similarity index 100% rename from gdal/port/cpl_vsil_uploadonclose.cpp rename to port/cpl_vsil_uploadonclose.cpp diff --git a/gdal/port/cpl_vsil_webhdfs.cpp b/port/cpl_vsil_webhdfs.cpp similarity index 100% rename from gdal/port/cpl_vsil_webhdfs.cpp rename to port/cpl_vsil_webhdfs.cpp diff --git a/gdal/port/cpl_vsil_win32.cpp b/port/cpl_vsil_win32.cpp similarity index 100% rename from gdal/port/cpl_vsil_win32.cpp rename to port/cpl_vsil_win32.cpp diff --git a/gdal/port/cpl_vsisimple.cpp b/port/cpl_vsisimple.cpp similarity index 100% rename from gdal/port/cpl_vsisimple.cpp rename to port/cpl_vsisimple.cpp diff --git a/gdal/port/cpl_worker_thread_pool.cpp b/port/cpl_worker_thread_pool.cpp similarity index 100% rename from gdal/port/cpl_worker_thread_pool.cpp rename to port/cpl_worker_thread_pool.cpp diff --git a/gdal/port/cpl_worker_thread_pool.h b/port/cpl_worker_thread_pool.h similarity index 100% rename from gdal/port/cpl_worker_thread_pool.h rename to port/cpl_worker_thread_pool.h diff --git a/gdal/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp similarity index 100% rename from gdal/port/cpl_xml_validate.cpp rename to port/cpl_xml_validate.cpp diff --git a/gdal/port/cplgetsymbol.cpp b/port/cplgetsymbol.cpp similarity index 100% rename from gdal/port/cplgetsymbol.cpp rename to port/cplgetsymbol.cpp diff --git a/gdal/port/cplkeywordparser.cpp b/port/cplkeywordparser.cpp similarity index 100% rename from gdal/port/cplkeywordparser.cpp rename to port/cplkeywordparser.cpp diff --git a/gdal/port/cplkeywordparser.h b/port/cplkeywordparser.h similarity index 100% rename from gdal/port/cplkeywordparser.h rename to port/cplkeywordparser.h diff --git a/gdal/port/cplstring.cpp b/port/cplstring.cpp similarity index 100% rename from gdal/port/cplstring.cpp rename to port/cplstring.cpp diff --git a/gdal/port/cplstringlist.cpp b/port/cplstringlist.cpp similarity index 100% rename from gdal/port/cplstringlist.cpp rename to port/cplstringlist.cpp diff --git a/gdal/port/gdal_csv.h b/port/gdal_csv.h similarity index 100% rename from gdal/port/gdal_csv.h rename to port/gdal_csv.h diff --git a/gdal/port/makefile.vc b/port/makefile.vc similarity index 100% rename from gdal/port/makefile.vc rename to port/makefile.vc diff --git a/gdal/port/vsipreload.cpp b/port/vsipreload.cpp similarity index 100% rename from gdal/port/vsipreload.cpp rename to port/vsipreload.cpp diff --git a/gdal/port/xmlreformat.cpp b/port/xmlreformat.cpp similarity index 100% rename from gdal/port/xmlreformat.cpp rename to port/xmlreformat.cpp diff --git a/gdal/scripts/GNUmakefile b/scripts/GNUmakefile similarity index 100% rename from gdal/scripts/GNUmakefile rename to scripts/GNUmakefile diff --git a/gdal/scripts/analyze_ossfuzz.py b/scripts/analyze_ossfuzz.py similarity index 100% rename from gdal/scripts/analyze_ossfuzz.py rename to scripts/analyze_ossfuzz.py diff --git a/gdal/scripts/check_broken_links.py b/scripts/check_broken_links.py similarity index 100% rename from gdal/scripts/check_broken_links.py rename to scripts/check_broken_links.py diff --git a/gdal/scripts/clang-format b/scripts/clang-format similarity index 100% rename from gdal/scripts/clang-format rename to scripts/clang-format diff --git a/gdal/scripts/completionFinder.py b/scripts/completionFinder.py similarity index 100% rename from gdal/scripts/completionFinder.py rename to scripts/completionFinder.py diff --git a/gdal/scripts/cppcheck.sh b/scripts/cppcheck.sh similarity index 100% rename from gdal/scripts/cppcheck.sh rename to scripts/cppcheck.sh diff --git a/gdal/scripts/detect_printf.sh b/scripts/detect_printf.sh similarity index 100% rename from gdal/scripts/detect_printf.sh rename to scripts/detect_printf.sh diff --git a/gdal/scripts/detect_self_assignment.py b/scripts/detect_self_assignment.py similarity index 100% rename from gdal/scripts/detect_self_assignment.py rename to scripts/detect_self_assignment.py diff --git a/gdal/scripts/detect_self_assignment.sh b/scripts/detect_self_assignment.sh similarity index 100% rename from gdal/scripts/detect_self_assignment.sh rename to scripts/detect_self_assignment.sh diff --git a/gdal/scripts/detect_suspicious_char_digit_zero.sh b/scripts/detect_suspicious_char_digit_zero.sh similarity index 100% rename from gdal/scripts/detect_suspicious_char_digit_zero.sh rename to scripts/detect_suspicious_char_digit_zero.sh diff --git a/gdal/scripts/detect_tabulations.sh b/scripts/detect_tabulations.sh similarity index 100% rename from gdal/scripts/detect_tabulations.sh rename to scripts/detect_tabulations.sh diff --git a/gdal/scripts/fix_container_dot_size_zero.py b/scripts/fix_container_dot_size_zero.py similarity index 100% rename from gdal/scripts/fix_container_dot_size_zero.py rename to scripts/fix_container_dot_size_zero.py diff --git a/gdal/scripts/fix_container_dot_size_zero.sh b/scripts/fix_container_dot_size_zero.sh similarity index 100% rename from gdal/scripts/fix_container_dot_size_zero.sh rename to scripts/fix_container_dot_size_zero.sh diff --git a/gdal/scripts/fix_typos.sh b/scripts/fix_typos.sh similarity index 100% rename from gdal/scripts/fix_typos.sh rename to scripts/fix_typos.sh diff --git a/gdal/scripts/gdal-bash-completion.sh b/scripts/gdal-bash-completion.sh similarity index 100% rename from gdal/scripts/gdal-bash-completion.sh rename to scripts/gdal-bash-completion.sh diff --git a/gdal/scripts/setdevenv.sh b/scripts/setdevenv.sh similarity index 100% rename from gdal/scripts/setdevenv.sh rename to scripts/setdevenv.sh diff --git a/gdal/scripts/typos_allowlist.txt b/scripts/typos_allowlist.txt similarity index 100% rename from gdal/scripts/typos_allowlist.txt rename to scripts/typos_allowlist.txt diff --git a/gdal/scripts/vagrant/gdal-mingw.sh b/scripts/vagrant/gdal-mingw.sh similarity index 100% rename from gdal/scripts/vagrant/gdal-mingw.sh rename to scripts/vagrant/gdal-mingw.sh diff --git a/gdal/scripts/vagrant/gdal.sh b/scripts/vagrant/gdal.sh similarity index 100% rename from gdal/scripts/vagrant/gdal.sh rename to scripts/vagrant/gdal.sh diff --git a/gdal/scripts/vagrant/install-proj6-mingw.sh b/scripts/vagrant/install-proj6-mingw.sh similarity index 100% rename from gdal/scripts/vagrant/install-proj6-mingw.sh rename to scripts/vagrant/install-proj6-mingw.sh diff --git a/gdal/scripts/vagrant/install-proj6.sh b/scripts/vagrant/install-proj6.sh similarity index 100% rename from gdal/scripts/vagrant/install-proj6.sh rename to scripts/vagrant/install-proj6.sh diff --git a/gdal/scripts/vagrant/postgis.sh b/scripts/vagrant/postgis.sh similarity index 100% rename from gdal/scripts/vagrant/postgis.sh rename to scripts/vagrant/postgis.sh diff --git a/gdal/scripts/vagrant/swig-3.0.8.sh b/scripts/vagrant/swig-3.0.8.sh similarity index 100% rename from gdal/scripts/vagrant/swig-3.0.8.sh rename to scripts/vagrant/swig-3.0.8.sh diff --git a/gdal/submake.bat b/submake.bat similarity index 100% rename from gdal/submake.bat rename to submake.bat diff --git a/gdal/swig/CMakeLists.txt b/swig/CMakeLists.txt similarity index 100% rename from gdal/swig/CMakeLists.txt rename to swig/CMakeLists.txt diff --git a/gdal/swig/GNUmakefile b/swig/GNUmakefile similarity index 100% rename from gdal/swig/GNUmakefile rename to swig/GNUmakefile diff --git a/gdal/swig/SWIGmake.base b/swig/SWIGmake.base similarity index 100% rename from gdal/swig/SWIGmake.base rename to swig/SWIGmake.base diff --git a/gdal/swig/csharp/AssemblyInfo.cs b/swig/csharp/AssemblyInfo.cs similarity index 100% rename from gdal/swig/csharp/AssemblyInfo.cs rename to swig/csharp/AssemblyInfo.cs diff --git a/gdal/swig/csharp/CMakeLists.txt b/swig/csharp/CMakeLists.txt similarity index 95% rename from gdal/swig/csharp/CMakeLists.txt rename to swig/csharp/CMakeLists.txt index 253f8d36733f..fe46226d89bd 100644 --- a/gdal/swig/csharp/CMakeLists.txt +++ b/swig/csharp/CMakeLists.txt @@ -10,10 +10,10 @@ function (gdal_csharp_dll) OUTPUT ${_CSHARP_WORKING_DIRECTORY}/${_CSHARP_WRAPPER}.cpp ${_CSHARP_CS_SOURCES} COMMAND ${SWIG_EXECUTABLE} -namespace ${_CSHARP_NAMESPACE} -outdir ${_CSHARP_WORKING_DIRECTORY} -DSWIG2_CSHARP -dllimport - ${_CSHARP_WRAPPER} -Wall -I${CMAKE_SOURCE_DIR}/gdal/swig/include -I${CMAKE_SOURCE_DIR}/gdal/swig/include/csharp + ${_CSHARP_WRAPPER} -Wall -I${CMAKE_SOURCE_DIR}/swig/include -I${CMAKE_SOURCE_DIR}/swig/include/csharp -I${CMAKE_SOURCE_DIR}/gdal -c++ -csharp -o ${_CSHARP_WRAPPER}.cpp ${_CSHARP_SWIG_INTERFACE} WORKING_DIRECTORY ${_CSHARP_WORKING_DIRECTORY} - DEPENDS ${GDAL_SWIG_COMMON_INCLUDE} ${CMAKE_SOURCE_DIR}/gdal/swig/include/csharp/typemaps_csharp.i + DEPENDS ${GDAL_SWIG_COMMON_INCLUDE} ${CMAKE_SOURCE_DIR}/swig/include/csharp/typemaps_csharp.i ${_CSHARP_SWIG_INTERFACE}) set_source_files_properties(${_CSHARP_WRAPPER} PROPERTIES GENERATED 1) add_library(${_CSHARP_WRAPPER} OBJECT ${_CSHARP_WORKING_DIRECTORY}/${_CSHARP_WRAPPER}.cpp) @@ -38,7 +38,7 @@ gdal_csharp_dll( TARGET gdal_csharp.dll NAMESPACE OSGeo.GDAL WRAPPER gdal_wrap - SWIG_INTERFACE ${CMAKE_SOURCE_DIR}/gdal/swig/include/gdal.i + SWIG_INTERFACE ${CMAKE_SOURCE_DIR}/swig/include/gdal.i CS_SOURCES gdal/Access.cs gdal/GDALWarpAppOptions.cs gdal/AsyncReader.cs @@ -86,7 +86,7 @@ gdal_csharp_dll( TARGET ogr_csharp.dll NAMESPACE OSGeo.OGR WRAPPER ogr_wrap - SWIG_INTERFACE ${CMAKE_SOURCE_DIR}/gdal/swig/include/ogr.i + SWIG_INTERFACE ${CMAKE_SOURCE_DIR}/swig/include/ogr.i CS_SOURCES ogr/DataSource.cs ogr/FieldDefn.cs ogr/Layer.cs @@ -111,14 +111,14 @@ gdal_csharp_dll( TARGET osr_csharp.dll NAMESPACE OSGeo.OSR WRAPPER osr_wrap - SWIG_INTERFACE ${CMAKE_SOURCE_DIR}/gdal/swig/include/osr.i + SWIG_INTERFACE ${CMAKE_SOURCE_DIR}/swig/include/osr.i CS_SOURCES osr/AxisOrientation.cs osr/Osr.cs osr/SpatialReference.cs osr/CoordinateTransformation.cs osr/OsrPINVOKE.cs WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/osr) gdal_csharp_dll( TARGET gdalconst_csharp.dll NAMESPACE OSGeo.GDAL WRAPPER gdalconst_wrap - SWIG_INTERFACE ${CMAKE_SOURCE_DIR}/gdal/swig/include/gdalconst.i + SWIG_INTERFACE ${CMAKE_SOURCE_DIR}/swig/include/gdalconst.i CS_SOURCES const/GdalConst.cs const/GdalConstPINVOKE.cs WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/const) # ###################################################################################################################### diff --git a/gdal/swig/csharp/GNUmakefile b/swig/csharp/GNUmakefile similarity index 100% rename from gdal/swig/csharp/GNUmakefile rename to swig/csharp/GNUmakefile diff --git a/gdal/swig/csharp/apps/GDALAdjustContrast.cs b/swig/csharp/apps/GDALAdjustContrast.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALAdjustContrast.cs rename to swig/csharp/apps/GDALAdjustContrast.cs diff --git a/gdal/swig/csharp/apps/GDALColorTable.cs b/swig/csharp/apps/GDALColorTable.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALColorTable.cs rename to swig/csharp/apps/GDALColorTable.cs diff --git a/gdal/swig/csharp/apps/GDALCreateCopy.cs b/swig/csharp/apps/GDALCreateCopy.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALCreateCopy.cs rename to swig/csharp/apps/GDALCreateCopy.cs diff --git a/gdal/swig/csharp/apps/GDALDatasetRasterIO.cs b/swig/csharp/apps/GDALDatasetRasterIO.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALDatasetRasterIO.cs rename to swig/csharp/apps/GDALDatasetRasterIO.cs diff --git a/gdal/swig/csharp/apps/GDALDatasetRasterIOEx.cs b/swig/csharp/apps/GDALDatasetRasterIOEx.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALDatasetRasterIOEx.cs rename to swig/csharp/apps/GDALDatasetRasterIOEx.cs diff --git a/gdal/swig/csharp/apps/GDALDatasetWrite.cs b/swig/csharp/apps/GDALDatasetWrite.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALDatasetWrite.cs rename to swig/csharp/apps/GDALDatasetWrite.cs diff --git a/gdal/swig/csharp/apps/GDALGetHistogram.cs b/swig/csharp/apps/GDALGetHistogram.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALGetHistogram.cs rename to swig/csharp/apps/GDALGetHistogram.cs diff --git a/gdal/swig/csharp/apps/GDALInfo.cs b/swig/csharp/apps/GDALInfo.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALInfo.cs rename to swig/csharp/apps/GDALInfo.cs diff --git a/gdal/swig/csharp/apps/GDALMemDataset.cs b/swig/csharp/apps/GDALMemDataset.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALMemDataset.cs rename to swig/csharp/apps/GDALMemDataset.cs diff --git a/gdal/swig/csharp/apps/GDALOverviews.cs b/swig/csharp/apps/GDALOverviews.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALOverviews.cs rename to swig/csharp/apps/GDALOverviews.cs diff --git a/gdal/swig/csharp/apps/GDALRead.cs b/swig/csharp/apps/GDALRead.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALRead.cs rename to swig/csharp/apps/GDALRead.cs diff --git a/gdal/swig/csharp/apps/GDALReadDirect.cs b/swig/csharp/apps/GDALReadDirect.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALReadDirect.cs rename to swig/csharp/apps/GDALReadDirect.cs diff --git a/gdal/swig/csharp/apps/GDALWarp.cs b/swig/csharp/apps/GDALWarp.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALWarp.cs rename to swig/csharp/apps/GDALWarp.cs diff --git a/gdal/swig/csharp/apps/GDALWrite.cs b/swig/csharp/apps/GDALWrite.cs similarity index 100% rename from gdal/swig/csharp/apps/GDALWrite.cs rename to swig/csharp/apps/GDALWrite.cs diff --git a/gdal/swig/csharp/apps/GetCRSInfo.cs b/swig/csharp/apps/GetCRSInfo.cs similarity index 100% rename from gdal/swig/csharp/apps/GetCRSInfo.cs rename to swig/csharp/apps/GetCRSInfo.cs diff --git a/gdal/swig/csharp/apps/OGRFeatureEdit.cs b/swig/csharp/apps/OGRFeatureEdit.cs similarity index 100% rename from gdal/swig/csharp/apps/OGRFeatureEdit.cs rename to swig/csharp/apps/OGRFeatureEdit.cs diff --git a/gdal/swig/csharp/apps/OGRGEOS.cs b/swig/csharp/apps/OGRGEOS.cs similarity index 100% rename from gdal/swig/csharp/apps/OGRGEOS.cs rename to swig/csharp/apps/OGRGEOS.cs diff --git a/gdal/swig/csharp/apps/OGRLayerAlg.cs b/swig/csharp/apps/OGRLayerAlg.cs similarity index 100% rename from gdal/swig/csharp/apps/OGRLayerAlg.cs rename to swig/csharp/apps/OGRLayerAlg.cs diff --git a/gdal/swig/csharp/apps/OSRTransform.cs b/swig/csharp/apps/OSRTransform.cs similarity index 100% rename from gdal/swig/csharp/apps/OSRTransform.cs rename to swig/csharp/apps/OSRTransform.cs diff --git a/gdal/swig/csharp/apps/ReadXML.cs b/swig/csharp/apps/ReadXML.cs similarity index 100% rename from gdal/swig/csharp/apps/ReadXML.cs rename to swig/csharp/apps/ReadXML.cs diff --git a/gdal/swig/csharp/apps/VSIMem.cs b/swig/csharp/apps/VSIMem.cs similarity index 100% rename from gdal/swig/csharp/apps/VSIMem.cs rename to swig/csharp/apps/VSIMem.cs diff --git a/gdal/swig/csharp/apps/WKT2WKB.cs b/swig/csharp/apps/WKT2WKB.cs similarity index 100% rename from gdal/swig/csharp/apps/WKT2WKB.cs rename to swig/csharp/apps/WKT2WKB.cs diff --git a/gdal/swig/csharp/apps/createdata.cs b/swig/csharp/apps/createdata.cs similarity index 100% rename from gdal/swig/csharp/apps/createdata.cs rename to swig/csharp/apps/createdata.cs diff --git a/gdal/swig/csharp/apps/ogrinfo.cs b/swig/csharp/apps/ogrinfo.cs similarity index 100% rename from gdal/swig/csharp/apps/ogrinfo.cs rename to swig/csharp/apps/ogrinfo.cs diff --git a/gdal/swig/csharp/const/makefile.vc b/swig/csharp/const/makefile.vc similarity index 100% rename from gdal/swig/csharp/const/makefile.vc rename to swig/csharp/const/makefile.vc diff --git a/gdal/swig/csharp/csharp.opt b/swig/csharp/csharp.opt similarity index 100% rename from gdal/swig/csharp/csharp.opt rename to swig/csharp/csharp.opt diff --git a/gdal/swig/csharp/gdal.snk b/swig/csharp/gdal.snk similarity index 100% rename from gdal/swig/csharp/gdal.snk rename to swig/csharp/gdal.snk diff --git a/gdal/swig/csharp/gdal/makefile.vc b/swig/csharp/gdal/makefile.vc similarity index 100% rename from gdal/swig/csharp/gdal/makefile.vc rename to swig/csharp/gdal/makefile.vc diff --git a/gdal/swig/csharp/makefile.vc b/swig/csharp/makefile.vc similarity index 98% rename from gdal/swig/csharp/makefile.vc rename to swig/csharp/makefile.vc index 1492feaa3f15..e55f65f777eb 100644 --- a/gdal/swig/csharp/makefile.vc +++ b/swig/csharp/makefile.vc @@ -177,7 +177,7 @@ interface: cd ogr $(SWIG) -DSWIG2_CSHARP -c++ -csharp -namespace OSGeo.OGR -dllimport ogr_wrap -I../../include/csharp -o ogr_wrap.cpp ../../include/ogr.i cd .. - + sampleprojects: apps/ogrinfo.csproj apps/createdata.csproj apps/OSRTransform.csproj apps/GDALRead.csproj apps/GDALReadDirect.csproj apps/GDALAdjustContrast.csproj apps/GDALDatasetRasterIO.csproj apps/GDALDatasetRasterIOEx.csproj apps/GDALWrite.csproj apps/GDALDatasetWrite.csproj apps/GDALColorTable.csproj apps/WKT2WKB.csproj apps/OGRGEOS.csproj apps/ReadXML.csproj apps/GDALInfo.csproj apps/GDALOverviews.csproj apps/GDALCreateCopy.csproj apps/GDALGetHistogram.csproj apps/VSIMem.csproj apps/GDALMemDataset.csproj apps/OGRLayerAlg.csproj apps/OGRFeatureEdit.csproj apps/GDALWarp.csproj apps/GetCRSInfo.csproj samples: sampleprojects @@ -205,7 +205,7 @@ samples: sampleprojects dotnet build -c $(DOTNET_CONFIG) -o "." -r $(DOTNET_RID) GDALDatasetRasterIO.csproj dotnet add GDALDatasetRasterIOEx.csproj reference ..\gdal\gdal_csharp.csproj dotnet add GDALDatasetRasterIOEx.csproj package System.Drawing.Common - dotnet build -c $(DOTNET_CONFIG) -o "." -r $(DOTNET_RID) GDALDatasetRasterIOEx.csproj + dotnet build -c $(DOTNET_CONFIG) -o "." -r $(DOTNET_RID) GDALDatasetRasterIOEx.csproj dotnet add GDALWrite.csproj reference ..\gdal\gdal_csharp.csproj dotnet build -c $(DOTNET_CONFIG) -o "." -r $(DOTNET_RID) GDALWrite.csproj dotnet add GDALDatasetWrite.csproj reference ..\gdal\gdal_csharp.csproj @@ -247,7 +247,7 @@ samples: sampleprojects -move /Y *.pdb .. -move /Y *.json .. -move /Y *.md .. - cd .. + cd .. !ELSE $(CSC) $(CSDEBUG) /r:ogr_csharp.dll /r:osr_csharp.dll /out:ogrinfo.exe apps\ogrinfo.cs $(CSC) $(CSDEBUG) /r:ogr_csharp.dll /r:osr_csharp.dll /out:createdata.exe apps\createdata.cs @@ -285,7 +285,7 @@ test: mono GDALCreateCopy.exe Data/sample.tif Data/sample2.tif mono GDALOverviews.exe Data/sample.tif NEAREST 2 4 mono GDALInfo.exe Data/sample.tif - mono GDALInfo.exe ../../../autotest/gcore/data/byte.tif + mono GDALInfo.exe ../../autotest/gcore/data/byte.tif !ELSE createdata.exe Data pointlayer ogrinfo.exe Data/pointlayer.shp @@ -296,10 +296,10 @@ test: GDALReadDirect.exe Data/sample.tif Data/sample.png GDALOverviews.exe Data/sample.tif NEAREST 2 4 GDALInfo.exe Data/sample.tif - GDALInfo.exe ../../../autotest/gcore/data/byte.tif + GDALInfo.exe ../../autotest/gcore/data/byte.tif ogrlayeralg.exe Intersection Data/pointlayer.shp pointlayer Data/pointlayer.shp pointlayer Data intersectionresult ogrinfo.exe Data/intersectionresult.shp - gdalwarp.exe Data/testwarp.tif "-of GTiff -t_srs EPSG:32645 -overwrite" "../../../autotest/gcore/data/byte.tif" + gdalwarp.exe Data/testwarp.tif "-of GTiff -t_srs EPSG:32645 -overwrite" "../../autotest/gcore/data/byte.tif" getcrsinfo.exe "EPSG" 20 sn -vf osr_csharp.dll sn -vf ogr_csharp.dll diff --git a/gdal/swig/csharp/mkinterface.sh b/swig/csharp/mkinterface.sh similarity index 100% rename from gdal/swig/csharp/mkinterface.sh rename to swig/csharp/mkinterface.sh diff --git a/gdal/swig/csharp/ogr/makefile.vc b/swig/csharp/ogr/makefile.vc similarity index 100% rename from gdal/swig/csharp/ogr/makefile.vc rename to swig/csharp/ogr/makefile.vc diff --git a/gdal/swig/csharp/osr/makefile.vc b/swig/csharp/osr/makefile.vc similarity index 100% rename from gdal/swig/csharp/osr/makefile.vc rename to swig/csharp/osr/makefile.vc diff --git a/gdal/swig/include/Band.i b/swig/include/Band.i similarity index 100% rename from gdal/swig/include/Band.i rename to swig/include/Band.i diff --git a/gdal/swig/include/ColorTable.i b/swig/include/ColorTable.i similarity index 100% rename from gdal/swig/include/ColorTable.i rename to swig/include/ColorTable.i diff --git a/gdal/swig/include/Dataset.i b/swig/include/Dataset.i similarity index 100% rename from gdal/swig/include/Dataset.i rename to swig/include/Dataset.i diff --git a/gdal/swig/include/Driver.i b/swig/include/Driver.i similarity index 100% rename from gdal/swig/include/Driver.i rename to swig/include/Driver.i diff --git a/gdal/swig/include/MajorObject.i b/swig/include/MajorObject.i similarity index 100% rename from gdal/swig/include/MajorObject.i rename to swig/include/MajorObject.i diff --git a/gdal/swig/include/MultiDimensional.i b/swig/include/MultiDimensional.i similarity index 100% rename from gdal/swig/include/MultiDimensional.i rename to swig/include/MultiDimensional.i diff --git a/gdal/swig/include/Operations.i b/swig/include/Operations.i similarity index 100% rename from gdal/swig/include/Operations.i rename to swig/include/Operations.i diff --git a/gdal/swig/include/README.typemaps b/swig/include/README.typemaps similarity index 100% rename from gdal/swig/include/README.typemaps rename to swig/include/README.typemaps diff --git a/gdal/swig/include/RasterAttributeTable.i b/swig/include/RasterAttributeTable.i similarity index 100% rename from gdal/swig/include/RasterAttributeTable.i rename to swig/include/RasterAttributeTable.i diff --git a/gdal/swig/include/Transform.i b/swig/include/Transform.i similarity index 100% rename from gdal/swig/include/Transform.i rename to swig/include/Transform.i diff --git a/gdal/swig/include/XMLNode.i b/swig/include/XMLNode.i similarity index 100% rename from gdal/swig/include/XMLNode.i rename to swig/include/XMLNode.i diff --git a/gdal/swig/include/cpl.i b/swig/include/cpl.i similarity index 100% rename from gdal/swig/include/cpl.i rename to swig/include/cpl.i diff --git a/gdal/swig/include/cpl_exceptions.i b/swig/include/cpl_exceptions.i similarity index 100% rename from gdal/swig/include/cpl_exceptions.i rename to swig/include/cpl_exceptions.i diff --git a/gdal/swig/include/cplvirtualmem.i b/swig/include/cplvirtualmem.i similarity index 100% rename from gdal/swig/include/cplvirtualmem.i rename to swig/include/cplvirtualmem.i diff --git a/gdal/swig/include/csharp/gdal_csharp.i b/swig/include/csharp/gdal_csharp.i similarity index 100% rename from gdal/swig/include/csharp/gdal_csharp.i rename to swig/include/csharp/gdal_csharp.i diff --git a/gdal/swig/include/csharp/gdal_csharp_extend.i b/swig/include/csharp/gdal_csharp_extend.i similarity index 100% rename from gdal/swig/include/csharp/gdal_csharp_extend.i rename to swig/include/csharp/gdal_csharp_extend.i diff --git a/gdal/swig/include/csharp/gnm_csharp.i b/swig/include/csharp/gnm_csharp.i similarity index 100% rename from gdal/swig/include/csharp/gnm_csharp.i rename to swig/include/csharp/gnm_csharp.i diff --git a/gdal/swig/include/csharp/ogr_csharp.i b/swig/include/csharp/ogr_csharp.i similarity index 100% rename from gdal/swig/include/csharp/ogr_csharp.i rename to swig/include/csharp/ogr_csharp.i diff --git a/gdal/swig/include/csharp/ogr_csharp_extend.i b/swig/include/csharp/ogr_csharp_extend.i similarity index 100% rename from gdal/swig/include/csharp/ogr_csharp_extend.i rename to swig/include/csharp/ogr_csharp_extend.i diff --git a/gdal/swig/include/csharp/osr_csharp.i b/swig/include/csharp/osr_csharp.i similarity index 100% rename from gdal/swig/include/csharp/osr_csharp.i rename to swig/include/csharp/osr_csharp.i diff --git a/gdal/swig/include/csharp/swig_csharp_extensions.i b/swig/include/csharp/swig_csharp_extensions.i similarity index 100% rename from gdal/swig/include/csharp/swig_csharp_extensions.i rename to swig/include/csharp/swig_csharp_extensions.i diff --git a/gdal/swig/include/csharp/typemaps_csharp.i b/swig/include/csharp/typemaps_csharp.i similarity index 100% rename from gdal/swig/include/csharp/typemaps_csharp.i rename to swig/include/csharp/typemaps_csharp.i diff --git a/gdal/swig/include/gdal.i b/swig/include/gdal.i similarity index 100% rename from gdal/swig/include/gdal.i rename to swig/include/gdal.i diff --git a/gdal/swig/include/gdal_array.i b/swig/include/gdal_array.i similarity index 100% rename from gdal/swig/include/gdal_array.i rename to swig/include/gdal_array.i diff --git a/gdal/swig/include/gdal_typemaps.i b/swig/include/gdal_typemaps.i similarity index 100% rename from gdal/swig/include/gdal_typemaps.i rename to swig/include/gdal_typemaps.i diff --git a/gdal/swig/include/gdalconst.i b/swig/include/gdalconst.i similarity index 100% rename from gdal/swig/include/gdalconst.i rename to swig/include/gdalconst.i diff --git a/gdal/swig/include/gnm.i b/swig/include/gnm.i similarity index 100% rename from gdal/swig/include/gnm.i rename to swig/include/gnm.i diff --git a/gdal/swig/include/java/callback.i b/swig/include/java/callback.i similarity index 100% rename from gdal/swig/include/java/callback.i rename to swig/include/java/callback.i diff --git a/gdal/swig/include/java/gdal_java.i b/swig/include/java/gdal_java.i similarity index 100% rename from gdal/swig/include/java/gdal_java.i rename to swig/include/java/gdal_java.i diff --git a/gdal/swig/include/java/gdalconst_java.i b/swig/include/java/gdalconst_java.i similarity index 100% rename from gdal/swig/include/java/gdalconst_java.i rename to swig/include/java/gdalconst_java.i diff --git a/gdal/swig/include/java/gnm_java.i b/swig/include/java/gnm_java.i similarity index 100% rename from gdal/swig/include/java/gnm_java.i rename to swig/include/java/gnm_java.i diff --git a/gdal/swig/include/java/java_exceptions.i b/swig/include/java/java_exceptions.i similarity index 100% rename from gdal/swig/include/java/java_exceptions.i rename to swig/include/java/java_exceptions.i diff --git a/gdal/swig/include/java/ogr_java.i b/swig/include/java/ogr_java.i similarity index 100% rename from gdal/swig/include/java/ogr_java.i rename to swig/include/java/ogr_java.i diff --git a/gdal/swig/include/java/ogr_java_extend.i b/swig/include/java/ogr_java_extend.i similarity index 100% rename from gdal/swig/include/java/ogr_java_extend.i rename to swig/include/java/ogr_java_extend.i diff --git a/gdal/swig/include/java/osr_java.i b/swig/include/java/osr_java.i similarity index 100% rename from gdal/swig/include/java/osr_java.i rename to swig/include/java/osr_java.i diff --git a/gdal/swig/include/java/typemaps_java.i b/swig/include/java/typemaps_java.i similarity index 100% rename from gdal/swig/include/java/typemaps_java.i rename to swig/include/java/typemaps_java.i diff --git a/gdal/swig/include/ogr.i b/swig/include/ogr.i similarity index 100% rename from gdal/swig/include/ogr.i rename to swig/include/ogr.i diff --git a/gdal/swig/include/ogr_error_map.i b/swig/include/ogr_error_map.i similarity index 100% rename from gdal/swig/include/ogr_error_map.i rename to swig/include/ogr_error_map.i diff --git a/gdal/swig/include/osr.i b/swig/include/osr.i similarity index 100% rename from gdal/swig/include/osr.i rename to swig/include/osr.i diff --git a/gdal/swig/include/perl/band.i b/swig/include/perl/band.i similarity index 100% rename from gdal/swig/include/perl/band.i rename to swig/include/perl/band.i diff --git a/gdal/swig/include/perl/callback.i b/swig/include/perl/callback.i similarity index 100% rename from gdal/swig/include/perl/callback.i rename to swig/include/perl/callback.i diff --git a/gdal/swig/include/perl/confess.i b/swig/include/perl/confess.i similarity index 100% rename from gdal/swig/include/perl/confess.i rename to swig/include/perl/confess.i diff --git a/gdal/swig/include/perl/destroy.i b/swig/include/perl/destroy.i similarity index 100% rename from gdal/swig/include/perl/destroy.i rename to swig/include/perl/destroy.i diff --git a/gdal/swig/include/perl/gdal_perl.i b/swig/include/perl/gdal_perl.i similarity index 100% rename from gdal/swig/include/perl/gdal_perl.i rename to swig/include/perl/gdal_perl.i diff --git a/gdal/swig/include/perl/gdal_perl_rename.i b/swig/include/perl/gdal_perl_rename.i similarity index 100% rename from gdal/swig/include/perl/gdal_perl_rename.i rename to swig/include/perl/gdal_perl_rename.i diff --git a/gdal/swig/include/perl/gnm_perl.i b/swig/include/perl/gnm_perl.i similarity index 100% rename from gdal/swig/include/perl/gnm_perl.i rename to swig/include/perl/gnm_perl.i diff --git a/gdal/swig/include/perl/init.i b/swig/include/perl/init.i similarity index 100% rename from gdal/swig/include/perl/init.i rename to swig/include/perl/init.i diff --git a/gdal/swig/include/perl/ogr_perl.i b/swig/include/perl/ogr_perl.i similarity index 100% rename from gdal/swig/include/perl/ogr_perl.i rename to swig/include/perl/ogr_perl.i diff --git a/gdal/swig/include/perl/osr_perl.i b/swig/include/perl/osr_perl.i similarity index 100% rename from gdal/swig/include/perl/osr_perl.i rename to swig/include/perl/osr_perl.i diff --git a/gdal/swig/include/perl/typemaps_perl.i b/swig/include/perl/typemaps_perl.i similarity index 100% rename from gdal/swig/include/perl/typemaps_perl.i rename to swig/include/perl/typemaps_perl.i diff --git a/gdal/swig/include/python/callback.i b/swig/include/python/callback.i similarity index 100% rename from gdal/swig/include/python/callback.i rename to swig/include/python/callback.i diff --git a/gdal/swig/include/python/docs/README b/swig/include/python/docs/README similarity index 100% rename from gdal/swig/include/python/docs/README rename to swig/include/python/docs/README diff --git a/gdal/swig/include/python/docs/doxy2swig.py b/swig/include/python/docs/doxy2swig.py similarity index 100% rename from gdal/swig/include/python/docs/doxy2swig.py rename to swig/include/python/docs/doxy2swig.py diff --git a/gdal/swig/include/python/docs/ogr_datasource_docs.i b/swig/include/python/docs/ogr_datasource_docs.i similarity index 100% rename from gdal/swig/include/python/docs/ogr_datasource_docs.i rename to swig/include/python/docs/ogr_datasource_docs.i diff --git a/gdal/swig/include/python/docs/ogr_driver_docs.i b/swig/include/python/docs/ogr_driver_docs.i similarity index 100% rename from gdal/swig/include/python/docs/ogr_driver_docs.i rename to swig/include/python/docs/ogr_driver_docs.i diff --git a/gdal/swig/include/python/docs/ogr_feature_docs.i b/swig/include/python/docs/ogr_feature_docs.i similarity index 100% rename from gdal/swig/include/python/docs/ogr_feature_docs.i rename to swig/include/python/docs/ogr_feature_docs.i diff --git a/gdal/swig/include/python/docs/ogr_featuredef_docs.i b/swig/include/python/docs/ogr_featuredef_docs.i similarity index 100% rename from gdal/swig/include/python/docs/ogr_featuredef_docs.i rename to swig/include/python/docs/ogr_featuredef_docs.i diff --git a/gdal/swig/include/python/docs/ogr_fielddef_docs.i b/swig/include/python/docs/ogr_fielddef_docs.i similarity index 100% rename from gdal/swig/include/python/docs/ogr_fielddef_docs.i rename to swig/include/python/docs/ogr_fielddef_docs.i diff --git a/gdal/swig/include/python/docs/ogr_geometry_docs.i b/swig/include/python/docs/ogr_geometry_docs.i similarity index 100% rename from gdal/swig/include/python/docs/ogr_geometry_docs.i rename to swig/include/python/docs/ogr_geometry_docs.i diff --git a/gdal/swig/include/python/docs/ogr_layer_docs.i b/swig/include/python/docs/ogr_layer_docs.i similarity index 100% rename from gdal/swig/include/python/docs/ogr_layer_docs.i rename to swig/include/python/docs/ogr_layer_docs.i diff --git a/gdal/swig/include/python/gdal_python.i b/swig/include/python/gdal_python.i similarity index 100% rename from gdal/swig/include/python/gdal_python.i rename to swig/include/python/gdal_python.i diff --git a/gdal/swig/include/python/gnm_python.i b/swig/include/python/gnm_python.i similarity index 100% rename from gdal/swig/include/python/gnm_python.i rename to swig/include/python/gnm_python.i diff --git a/gdal/swig/include/python/ogr_python.i b/swig/include/python/ogr_python.i similarity index 100% rename from gdal/swig/include/python/ogr_python.i rename to swig/include/python/ogr_python.i diff --git a/gdal/swig/include/python/osr_python.i b/swig/include/python/osr_python.i similarity index 100% rename from gdal/swig/include/python/osr_python.i rename to swig/include/python/osr_python.i diff --git a/gdal/swig/include/python/python_exceptions.i b/swig/include/python/python_exceptions.i similarity index 100% rename from gdal/swig/include/python/python_exceptions.i rename to swig/include/python/python_exceptions.i diff --git a/gdal/swig/include/python/python_strings.i b/swig/include/python/python_strings.i similarity index 100% rename from gdal/swig/include/python/python_strings.i rename to swig/include/python/python_strings.i diff --git a/gdal/swig/include/python/typemaps_python.i b/swig/include/python/typemaps_python.i similarity index 100% rename from gdal/swig/include/python/typemaps_python.i rename to swig/include/python/typemaps_python.i diff --git a/gdal/swig/java/CMakeLists.txt b/swig/java/CMakeLists.txt similarity index 79% rename from gdal/swig/java/CMakeLists.txt rename to swig/java/CMakeLists.txt index 771177ba1658..d60ee5ecff45 100644 --- a/gdal/swig/java/CMakeLists.txt +++ b/swig/java/CMakeLists.txt @@ -8,11 +8,11 @@ function (GDAL_JAVA_WRAP) set(SWIG_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org/gdal/${_SWIG_TARGET}/${_SWIG_TARGET}_wrap.cpp) add_custom_command( OUTPUT ${SWIG_OUTPUT} - COMMAND ${SWIG_EXECUTABLE} ${_SWIG_ARGS} ${SWIG_DEFINES} -I${CMAKE_SOURCE_DIR}/gdal -I${CMAKE_SOURCE_DIR}/gdal - -c++ -java -o ${SWIG_OUTPUT} ${CMAKE_SOURCE_DIR}/gdal/swig/include/${_SWIG_TARGET}.i + COMMAND ${SWIG_EXECUTABLE} ${_SWIG_ARGS} ${SWIG_DEFINES} -I${CMAKE_SOURCE_DIR}/gdal + -c++ -java -o ${SWIG_OUTPUT} ${CMAKE_SOURCE_DIR}/swig/include/${_SWIG_TARGET}.i WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${GDAL_SWIG_COMMON_INTERFACE_FILES} ${CMAKE_SOURCE_DIR}/gdal/swig/include/java/typemaps_java.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/java/${_SWIG_TARGET}_java.i) + DEPENDS ${GDAL_SWIG_COMMON_INTERFACE_FILES} ${CMAKE_SOURCE_DIR}/swig/include/java/typemaps_java.i + ${CMAKE_SOURCE_DIR}/swig/include/java/${_SWIG_TARGET}_java.i) set_source_files_properties(${SWIG_OUTPUT} PROPERTIES GENERATED 1) add_library(${_SWIG_TARGET}jni MODULE ${CMAKE_CURRENT_BINARY_DIR}/org/gdal/${_SWIG_TARGET}/${_SWIG_TARGET}_wrap.cpp) else () @@ -20,10 +20,10 @@ function (GDAL_JAVA_WRAP) add_custom_command( OUTPUT ${SWIG_OUTPUT} COMMAND ${SWIG_EXECUTABLE} ${_SWIG_ARGS} ${SWIG_DEFINES} -I${CMAKE_SOURCE_DIR}/gdal -java -o ${SWIG_OUTPUT} - ${CMAKE_SOURCE_DIR}/gdal/swig/include/${_SWIG_TARGET}.i + ${CMAKE_SOURCE_DIR}/swig/include/${_SWIG_TARGET}.i WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${GDAL_SWIG_COMMON_INTERFACE_FILES} ${CMAKE_SOURCE_DIR}/gdal/swig/include/java/typemaps_java.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/java/${_SWIG_TARGET}_java.i) + DEPENDS ${GDAL_SWIG_COMMON_INTERFACE_FILES} ${CMAKE_SOURCE_DIR}/swig/include/java/typemaps_java.i + ${CMAKE_SOURCE_DIR}/swig/include/java/${_SWIG_TARGET}_java.i) set_source_files_properties(${SWIG_OUTPUT} PROPERTIES GENERATED 1) add_library(${_SWIG_TARGET}jni MODULE ${CMAKE_CURRENT_BINARY_DIR}/org/gdal/${_SWIG_TARGET}/${_SWIG_TARGET}_wrap.c) endif () @@ -44,8 +44,8 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/org/gdal/gdalconst) gdal_java_wrap( TARGET gdalconst ARGS -Wall - -I${CMAKE_SOURCE_DIR}/gdal/swig/include - -I${CMAKE_SOURCE_DIR}/gdal/swig/include/java + -I${CMAKE_SOURCE_DIR}/swig/include + -I${CMAKE_SOURCE_DIR}/swig/include/java -outdir ${CMAKE_CURRENT_BINARY_DIR}/org/gdal/gdalconst/ -package @@ -56,8 +56,8 @@ foreach (tgt IN ITEMS gdal ogr osr gnm) TARGET ${tgt} CXX ARGS -Wall - -I${CMAKE_SOURCE_DIR}/gdal/swig/include - -I${CMAKE_SOURCE_DIR}/gdal/swig/include/java + -I${CMAKE_SOURCE_DIR}/swig/include + -I${CMAKE_SOURCE_DIR}/swig/include/java -outdir ${CMAKE_CURRENT_BINARY_DIR}/org/gdal/${tgt}/ -package diff --git a/gdal/swig/java/GNUmakefile b/swig/java/GNUmakefile similarity index 100% rename from gdal/swig/java/GNUmakefile rename to swig/java/GNUmakefile diff --git a/gdal/swig/java/add_javadoc.c b/swig/java/add_javadoc.c similarity index 100% rename from gdal/swig/java/add_javadoc.c rename to swig/java/add_javadoc.c diff --git a/gdal/swig/java/apps/GDALContour.java b/swig/java/apps/GDALContour.java similarity index 100% rename from gdal/swig/java/apps/GDALContour.java rename to swig/java/apps/GDALContour.java diff --git a/gdal/swig/java/apps/GDALGrid.java b/swig/java/apps/GDALGrid.java similarity index 100% rename from gdal/swig/java/apps/GDALGrid.java rename to swig/java/apps/GDALGrid.java diff --git a/gdal/swig/java/apps/GDALOverviews.java b/swig/java/apps/GDALOverviews.java similarity index 100% rename from gdal/swig/java/apps/GDALOverviews.java rename to swig/java/apps/GDALOverviews.java diff --git a/gdal/swig/java/apps/GDALProximity.java b/swig/java/apps/GDALProximity.java similarity index 100% rename from gdal/swig/java/apps/GDALProximity.java rename to swig/java/apps/GDALProximity.java diff --git a/gdal/swig/java/apps/GDALTestIO.java b/swig/java/apps/GDALTestIO.java similarity index 100% rename from gdal/swig/java/apps/GDALTestIO.java rename to swig/java/apps/GDALTestIO.java diff --git a/gdal/swig/java/apps/GDALtest.java b/swig/java/apps/GDALtest.java similarity index 100% rename from gdal/swig/java/apps/GDALtest.java rename to swig/java/apps/GDALtest.java diff --git a/gdal/swig/java/apps/OGRFeature.java b/swig/java/apps/OGRFeature.java similarity index 100% rename from gdal/swig/java/apps/OGRFeature.java rename to swig/java/apps/OGRFeature.java diff --git a/gdal/swig/java/apps/OGRTestGC.java b/swig/java/apps/OGRTestGC.java similarity index 100% rename from gdal/swig/java/apps/OGRTestGC.java rename to swig/java/apps/OGRTestGC.java diff --git a/gdal/swig/java/apps/OSRTest.java b/swig/java/apps/OSRTest.java similarity index 100% rename from gdal/swig/java/apps/OSRTest.java rename to swig/java/apps/OSRTest.java diff --git a/gdal/swig/java/apps/OSRTransform.java b/swig/java/apps/OSRTransform.java similarity index 100% rename from gdal/swig/java/apps/OSRTransform.java rename to swig/java/apps/OSRTransform.java diff --git a/gdal/swig/java/apps/ReadXML.java b/swig/java/apps/ReadXML.java similarity index 100% rename from gdal/swig/java/apps/ReadXML.java rename to swig/java/apps/ReadXML.java diff --git a/gdal/swig/java/apps/WKT2WKB.java b/swig/java/apps/WKT2WKB.java similarity index 100% rename from gdal/swig/java/apps/WKT2WKB.java rename to swig/java/apps/WKT2WKB.java diff --git a/gdal/swig/java/apps/gdalinfo.java b/swig/java/apps/gdalinfo.java similarity index 100% rename from gdal/swig/java/apps/gdalinfo.java rename to swig/java/apps/gdalinfo.java diff --git a/gdal/swig/java/apps/gdalmajorobject.java b/swig/java/apps/gdalmajorobject.java similarity index 100% rename from gdal/swig/java/apps/gdalmajorobject.java rename to swig/java/apps/gdalmajorobject.java diff --git a/gdal/swig/java/apps/gdaltransformer.java b/swig/java/apps/gdaltransformer.java similarity index 100% rename from gdal/swig/java/apps/gdaltransformer.java rename to swig/java/apps/gdaltransformer.java diff --git a/gdal/swig/java/apps/multireadtest.java b/swig/java/apps/multireadtest.java similarity index 100% rename from gdal/swig/java/apps/multireadtest.java rename to swig/java/apps/multireadtest.java diff --git a/gdal/swig/java/apps/ogr2ogr.java b/swig/java/apps/ogr2ogr.java similarity index 100% rename from gdal/swig/java/apps/ogr2ogr.java rename to swig/java/apps/ogr2ogr.java diff --git a/gdal/swig/java/apps/ogr2ogr_new.java b/swig/java/apps/ogr2ogr_new.java similarity index 100% rename from gdal/swig/java/apps/ogr2ogr_new.java rename to swig/java/apps/ogr2ogr_new.java diff --git a/gdal/swig/java/apps/ogrinfo.java b/swig/java/apps/ogrinfo.java similarity index 100% rename from gdal/swig/java/apps/ogrinfo.java rename to swig/java/apps/ogrinfo.java diff --git a/gdal/swig/java/apps/ogrtindex.java b/swig/java/apps/ogrtindex.java similarity index 100% rename from gdal/swig/java/apps/ogrtindex.java rename to swig/java/apps/ogrtindex.java diff --git a/gdal/swig/java/apps/testgetpoints.java b/swig/java/apps/testgetpoints.java similarity index 100% rename from gdal/swig/java/apps/testgetpoints.java rename to swig/java/apps/testgetpoints.java diff --git a/gdal/swig/java/build.xml b/swig/java/build.xml similarity index 100% rename from gdal/swig/java/build.xml rename to swig/java/build.xml diff --git a/gdal/swig/java/const/makefile.vc b/swig/java/const/makefile.vc similarity index 100% rename from gdal/swig/java/const/makefile.vc rename to swig/java/const/makefile.vc diff --git a/gdal/swig/java/gdal-package-info.java b/swig/java/gdal-package-info.java similarity index 100% rename from gdal/swig/java/gdal-package-info.java rename to swig/java/gdal-package-info.java diff --git a/gdal/swig/java/gdal/makefile.vc b/swig/java/gdal/makefile.vc similarity index 100% rename from gdal/swig/java/gdal/makefile.vc rename to swig/java/gdal/makefile.vc diff --git a/gdal/swig/java/gdalconst-package-info.java b/swig/java/gdalconst-package-info.java similarity index 100% rename from gdal/swig/java/gdalconst-package-info.java rename to swig/java/gdalconst-package-info.java diff --git a/gdal/swig/java/gnm/makefile.vc b/swig/java/gnm/makefile.vc similarity index 100% rename from gdal/swig/java/gnm/makefile.vc rename to swig/java/gnm/makefile.vc diff --git a/gdal/swig/java/java.opt b/swig/java/java.opt similarity index 100% rename from gdal/swig/java/java.opt rename to swig/java/java.opt diff --git a/gdal/swig/java/javadoc.java b/swig/java/javadoc.java similarity index 100% rename from gdal/swig/java/javadoc.java rename to swig/java/javadoc.java diff --git a/gdal/swig/java/make_doc.sh b/swig/java/make_doc.sh similarity index 100% rename from gdal/swig/java/make_doc.sh rename to swig/java/make_doc.sh diff --git a/gdal/swig/java/makefile.vc b/swig/java/makefile.vc similarity index 100% rename from gdal/swig/java/makefile.vc rename to swig/java/makefile.vc diff --git a/gdal/swig/java/ogr-package-info.java b/swig/java/ogr-package-info.java similarity index 100% rename from gdal/swig/java/ogr-package-info.java rename to swig/java/ogr-package-info.java diff --git a/gdal/swig/java/ogr/makefile.vc b/swig/java/ogr/makefile.vc similarity index 100% rename from gdal/swig/java/ogr/makefile.vc rename to swig/java/ogr/makefile.vc diff --git a/gdal/swig/java/osr-package-info.java b/swig/java/osr-package-info.java similarity index 100% rename from gdal/swig/java/osr-package-info.java rename to swig/java/osr-package-info.java diff --git a/gdal/swig/java/osr/makefile.vc b/swig/java/osr/makefile.vc similarity index 100% rename from gdal/swig/java/osr/makefile.vc rename to swig/java/osr/makefile.vc diff --git a/gdal/swig/java/overview.html b/swig/java/overview.html similarity index 100% rename from gdal/swig/java/overview.html rename to swig/java/overview.html diff --git a/gdal/swig/java/pom.xml b/swig/java/pom.xml similarity index 100% rename from gdal/swig/java/pom.xml rename to swig/java/pom.xml diff --git a/gdal/swig/java/test_data/byte.tif b/swig/java/test_data/byte.tif similarity index 100% rename from gdal/swig/java/test_data/byte.tif rename to swig/java/test_data/byte.tif diff --git a/gdal/swig/java/test_data/poly.dbf b/swig/java/test_data/poly.dbf similarity index 100% rename from gdal/swig/java/test_data/poly.dbf rename to swig/java/test_data/poly.dbf diff --git a/gdal/swig/java/test_data/poly.shp b/swig/java/test_data/poly.shp similarity index 100% rename from gdal/swig/java/test_data/poly.shp rename to swig/java/test_data/poly.shp diff --git a/gdal/swig/java/test_data/poly.shx b/swig/java/test_data/poly.shx similarity index 100% rename from gdal/swig/java/test_data/poly.shx rename to swig/java/test_data/poly.shx diff --git a/gdal/swig/makefile.vc b/swig/makefile.vc similarity index 100% rename from gdal/swig/makefile.vc rename to swig/makefile.vc diff --git a/gdal/swig/perl/CMakeLists.txt b/swig/perl/CMakeLists.txt similarity index 100% rename from gdal/swig/perl/CMakeLists.txt rename to swig/perl/CMakeLists.txt diff --git a/gdal/swig/perl/Changes b/swig/perl/Changes similarity index 100% rename from gdal/swig/perl/Changes rename to swig/perl/Changes diff --git a/gdal/swig/perl/Changes-in-the-API-in-2.0 b/swig/perl/Changes-in-the-API-in-2.0 similarity index 100% rename from gdal/swig/perl/Changes-in-the-API-in-2.0 rename to swig/perl/Changes-in-the-API-in-2.0 diff --git a/gdal/swig/perl/Doxyfile b/swig/perl/Doxyfile similarity index 100% rename from gdal/swig/perl/Doxyfile rename to swig/perl/Doxyfile diff --git a/gdal/swig/perl/GNUmakefile b/swig/perl/GNUmakefile similarity index 100% rename from gdal/swig/perl/GNUmakefile rename to swig/perl/GNUmakefile diff --git a/gdal/swig/perl/Makefile b/swig/perl/Makefile similarity index 100% rename from gdal/swig/perl/Makefile rename to swig/perl/Makefile diff --git a/gdal/swig/perl/Makefile.PL b/swig/perl/Makefile.PL similarity index 100% rename from gdal/swig/perl/Makefile.PL rename to swig/perl/Makefile.PL diff --git a/gdal/swig/perl/README b/swig/perl/README similarity index 100% rename from gdal/swig/perl/README rename to swig/perl/README diff --git a/gdal/swig/perl/check_dox.pl b/swig/perl/check_dox.pl similarity index 100% rename from gdal/swig/perl/check_dox.pl rename to swig/perl/check_dox.pl diff --git a/gdal/swig/perl/cr.dox b/swig/perl/cr.dox similarity index 100% rename from gdal/swig/perl/cr.dox rename to swig/perl/cr.dox diff --git a/gdal/swig/perl/cv.dox b/swig/perl/cv.dox similarity index 100% rename from gdal/swig/perl/cv.dox rename to swig/perl/cv.dox diff --git a/gdal/swig/perl/index.dox b/swig/perl/index.dox similarity index 100% rename from gdal/swig/perl/index.dox rename to swig/perl/index.dox diff --git a/gdal/swig/perl/lib/Geo/GDAL.dox b/swig/perl/lib/Geo/GDAL.dox similarity index 100% rename from gdal/swig/perl/lib/Geo/GDAL.dox rename to swig/perl/lib/Geo/GDAL.dox diff --git a/gdal/swig/perl/lib/Geo/GNM.dox b/swig/perl/lib/Geo/GNM.dox similarity index 100% rename from gdal/swig/perl/lib/Geo/GNM.dox rename to swig/perl/lib/Geo/GNM.dox diff --git a/gdal/swig/perl/lib/Geo/OGR.dox b/swig/perl/lib/Geo/OGR.dox similarity index 100% rename from gdal/swig/perl/lib/Geo/OGR.dox rename to swig/perl/lib/Geo/OGR.dox diff --git a/gdal/swig/perl/lib/Geo/OSR.dox b/swig/perl/lib/Geo/OSR.dox similarity index 100% rename from gdal/swig/perl/lib/Geo/OSR.dox rename to swig/perl/lib/Geo/OSR.dox diff --git a/gdal/swig/perl/make.bat b/swig/perl/make.bat similarity index 100% rename from gdal/swig/perl/make.bat rename to swig/perl/make.bat diff --git a/gdal/swig/perl/parse-for-doxygen.pl b/swig/perl/parse-for-doxygen.pl similarity index 100% rename from gdal/swig/perl/parse-for-doxygen.pl rename to swig/perl/parse-for-doxygen.pl diff --git a/gdal/swig/perl/pdl.dox b/swig/perl/pdl.dox similarity index 100% rename from gdal/swig/perl/pdl.dox rename to swig/perl/pdl.dox diff --git a/gdal/swig/perl/rr.dox b/swig/perl/rr.dox similarity index 100% rename from gdal/swig/perl/rr.dox rename to swig/perl/rr.dox diff --git a/gdal/swig/perl/rv.dox b/swig/perl/rv.dox similarity index 100% rename from gdal/swig/perl/rv.dox rename to swig/perl/rv.dox diff --git a/gdal/swig/perl/rwv.dox b/swig/perl/rwv.dox similarity index 100% rename from gdal/swig/perl/rwv.dox rename to swig/perl/rwv.dox diff --git a/gdal/swig/perl/streaming.dox b/swig/perl/streaming.dox similarity index 100% rename from gdal/swig/perl/streaming.dox rename to swig/perl/streaming.dox diff --git a/gdal/swig/perl/t/00-measures-00.t b/swig/perl/t/00-measures-00.t similarity index 100% rename from gdal/swig/perl/t/00-measures-00.t rename to swig/perl/t/00-measures-00.t diff --git a/gdal/swig/perl/t/00-measures-01.t b/swig/perl/t/00-measures-01.t similarity index 100% rename from gdal/swig/perl/t/00-measures-01.t rename to swig/perl/t/00-measures-01.t diff --git a/gdal/swig/perl/t/00-measures-02.t b/swig/perl/t/00-measures-02.t similarity index 100% rename from gdal/swig/perl/t/00-measures-02.t rename to swig/perl/t/00-measures-02.t diff --git a/gdal/swig/perl/t/00-measures-03.t b/swig/perl/t/00-measures-03.t similarity index 100% rename from gdal/swig/perl/t/00-measures-03.t rename to swig/perl/t/00-measures-03.t diff --git a/gdal/swig/perl/t/00-measures-04.t b/swig/perl/t/00-measures-04.t similarity index 100% rename from gdal/swig/perl/t/00-measures-04.t rename to swig/perl/t/00-measures-04.t diff --git a/gdal/swig/perl/t/00.t b/swig/perl/t/00.t similarity index 100% rename from gdal/swig/perl/t/00.t rename to swig/perl/t/00.t diff --git a/gdal/swig/perl/t/01.t b/swig/perl/t/01.t similarity index 100% rename from gdal/swig/perl/t/01.t rename to swig/perl/t/01.t diff --git a/gdal/swig/perl/t/02.t b/swig/perl/t/02.t similarity index 100% rename from gdal/swig/perl/t/02.t rename to swig/perl/t/02.t diff --git a/gdal/swig/perl/t/03.t b/swig/perl/t/03.t similarity index 100% rename from gdal/swig/perl/t/03.t rename to swig/perl/t/03.t diff --git a/gdal/swig/perl/t/alg.t b/swig/perl/t/alg.t similarity index 100% rename from gdal/swig/perl/t/alg.t rename to swig/perl/t/alg.t diff --git a/gdal/swig/perl/t/band.t b/swig/perl/t/band.t similarity index 100% rename from gdal/swig/perl/t/band.t rename to swig/perl/t/band.t diff --git a/gdal/swig/perl/t/callback.t b/swig/perl/t/callback.t similarity index 100% rename from gdal/swig/perl/t/callback.t rename to swig/perl/t/callback.t diff --git a/gdal/swig/perl/t/dataset.t b/swig/perl/t/dataset.t similarity index 100% rename from gdal/swig/perl/t/dataset.t rename to swig/perl/t/dataset.t diff --git a/gdal/swig/perl/t/error.t b/swig/perl/t/error.t similarity index 100% rename from gdal/swig/perl/t/error.t rename to swig/perl/t/error.t diff --git a/gdal/swig/perl/t/extent.t b/swig/perl/t/extent.t similarity index 100% rename from gdal/swig/perl/t/extent.t rename to swig/perl/t/extent.t diff --git a/gdal/swig/perl/t/feature.t b/swig/perl/t/feature.t similarity index 100% rename from gdal/swig/perl/t/feature.t rename to swig/perl/t/feature.t diff --git a/gdal/swig/perl/t/gcp.t b/swig/perl/t/gcp.t similarity index 100% rename from gdal/swig/perl/t/gcp.t rename to swig/perl/t/gcp.t diff --git a/gdal/swig/perl/t/gdal.t b/swig/perl/t/gdal.t similarity index 100% rename from gdal/swig/perl/t/gdal.t rename to swig/perl/t/gdal.t diff --git a/gdal/swig/perl/t/geom.t b/swig/perl/t/geom.t similarity index 100% rename from gdal/swig/perl/t/geom.t rename to swig/perl/t/geom.t diff --git a/gdal/swig/perl/t/geotransform.t b/swig/perl/t/geotransform.t similarity index 100% rename from gdal/swig/perl/t/geotransform.t rename to swig/perl/t/geotransform.t diff --git a/gdal/swig/perl/t/layer.t b/swig/perl/t/layer.t similarity index 100% rename from gdal/swig/perl/t/layer.t rename to swig/perl/t/layer.t diff --git a/gdal/swig/perl/t/nodata.t b/swig/perl/t/nodata.t similarity index 100% rename from gdal/swig/perl/t/nodata.t rename to swig/perl/t/nodata.t diff --git a/gdal/swig/perl/t/ogr.t b/swig/perl/t/ogr.t similarity index 100% rename from gdal/swig/perl/t/ogr.t rename to swig/perl/t/ogr.t diff --git a/gdal/swig/perl/t/open.t b/swig/perl/t/open.t similarity index 100% rename from gdal/swig/perl/t/open.t rename to swig/perl/t/open.t diff --git a/gdal/swig/perl/t/osr.t b/swig/perl/t/osr.t similarity index 100% rename from gdal/swig/perl/t/osr.t rename to swig/perl/t/osr.t diff --git a/gdal/swig/perl/t/parenting.t b/swig/perl/t/parenting.t similarity index 100% rename from gdal/swig/perl/t/parenting.t rename to swig/perl/t/parenting.t diff --git a/gdal/swig/perl/t/pdl.t b/swig/perl/t/pdl.t similarity index 100% rename from gdal/swig/perl/t/pdl.t rename to swig/perl/t/pdl.t diff --git a/gdal/swig/perl/t/utf8.t b/swig/perl/t/utf8.t similarity index 100% rename from gdal/swig/perl/t/utf8.t rename to swig/perl/t/utf8.t diff --git a/gdal/swig/perl/t/util.t b/swig/perl/t/util.t similarity index 100% rename from gdal/swig/perl/t/util.t rename to swig/perl/t/util.t diff --git a/gdal/swig/perl/tips.dox b/swig/perl/tips.dox similarity index 100% rename from gdal/swig/perl/tips.dox rename to swig/perl/tips.dox diff --git a/gdal/swig/perl/transform.dox b/swig/perl/transform.dox similarity index 100% rename from gdal/swig/perl/transform.dox rename to swig/perl/transform.dox diff --git a/gdal/swig/python/.gitignore b/swig/python/.gitignore similarity index 100% rename from gdal/swig/python/.gitignore rename to swig/python/.gitignore diff --git a/gdal/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt similarity index 72% rename from gdal/swig/python/CMakeLists.txt rename to swig/python/CMakeLists.txt index 84f02c587812..5bfa7c32596d 100644 --- a/gdal/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt @@ -22,7 +22,7 @@ if (SWIG_REGENERATE_PYTHON) BINDING python ARGS - -I${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs + -I${CMAKE_SOURCE_DIR}/swig/include/python/docs ${PY3ARG} -threads -outdir @@ -33,15 +33,15 @@ if (SWIG_REGENERATE_PYTHON) # gdal_array_wrap.cpp when NumPy exist if (NumPy_FOUND) - set(ARRAY_INPUT ${CMAKE_SOURCE_DIR}/gdal/swig/include/gdal_array.i) + set(ARRAY_INPUT ${CMAKE_SOURCE_DIR}/swig/include/gdal_array.i) set(ARRAY_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/extensions/gdal_array_wrap.cpp) add_custom_command( OUTPUT ${ARRAY_OUTPUT} "${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdal_array.py" COMMAND - ${SWIG_EXECUTABLE} -Wall -I${CMAKE_SOURCE_DIR}/gdal/swig/include -I${CMAKE_SOURCE_DIR}/gdal/swig/include/python - -I${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs ${PY3ARG} -threads -outdir ${CMAKE_CURRENT_BINARY_DIR} + ${SWIG_EXECUTABLE} -Wall -I${CMAKE_SOURCE_DIR}/swig/include -I${CMAKE_SOURCE_DIR}/swig/include/python + -I${CMAKE_SOURCE_DIR}/swig/include/python/docs ${PY3ARG} -threads -outdir ${CMAKE_CURRENT_BINARY_DIR} ${SWIG_DEFINES} -I${CMAKE_SOURCE_DIR}/gdal -c++ -python -o ${ARRAY_OUTPUT} ${ARRAY_INPUT} - DEPENDS ${GDAL_SWIG_COMMON_INCLUDE} ${ARRAY_INPUT} ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/typemaps_python.i + DEPENDS ${GDAL_SWIG_COMMON_INCLUDE} ${ARRAY_INPUT} ${CMAKE_SOURCE_DIR}/swig/include/python/typemaps_python.i COMMENT "Generate _gdal_array_wrap.so and gdal_array.py by SWiG command") list(APPEND GDAL_PYTHON_CSOURCES "${GDAL_PYTHON_CSOURCE_DIR}/gdal_array_wrap.cpp") list(APPEND GDAL_PYTHON_PYSOURCES "${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdal_array.py") @@ -207,87 +207,87 @@ else () endif () # FIXME !!!! add_subdirectory(scripts) -file(COPY ${CMAKE_SOURCE_DIR}/gdal/Doxyfile DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +file(COPY ${CMAKE_SOURCE_DIR}/Doxyfile DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile "GENERATE_XML=YES") add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/gdal/xml/ogrlayer_8cpp.xml ${CMAKE_SOURCE_DIR}/gdal/xml/ogrgeometry_8cpp.xml - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrsfdriver_8cpp.xml ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfeature_8cpp.xml - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfeaturedefn_8cpp.xml ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfielddefn_8cpp.xml + OUTPUT ${CMAKE_SOURCE_DIR}/xml/ogrlayer_8cpp.xml ${CMAKE_SOURCE_DIR}/xml/ogrgeometry_8cpp.xml + ${CMAKE_SOURCE_DIR}/xml/ogrsfdriver_8cpp.xml ${CMAKE_SOURCE_DIR}/xml/ogrfeature_8cpp.xml + ${CMAKE_SOURCE_DIR}/xml/ogrfeaturedefn_8cpp.xml ${CMAKE_SOURCE_DIR}/xml/ogrfielddefn_8cpp.xml COMMAND doxygen ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile COMMENT "Generate xml by doxygen" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/gdal) add_custom_target( python_interface_docs - DEPENDS ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_layer_docs.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_geometry_docs.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_datasource_docs.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_driver_docs.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_feature_docs.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_featuredef_docs.i - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_fielddef_docs.i + DEPENDS ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_layer_docs.i + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_geometry_docs.i + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_datasource_docs.i + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_driver_docs.i + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_feature_docs.i + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_featuredef_docs.i + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_fielddef_docs.i COMMENT "Generate document interfaces for python") add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_layer_docs.i + OUTPUT ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_layer_docs.i COMMAND - ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/doxy2swig.py - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrlayer_8cpp.xml ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_layer_docs.i + ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/swig/include/python/docs/doxy2swig.py + ${CMAKE_SOURCE_DIR}/xml/ogrlayer_8cpp.xml ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_layer_docs.i OGRLayerShadow OGR_L_ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/gdal/xml/ogrlayer_8cpp.xml + DEPENDS ${CMAKE_SOURCE_DIR}/xml/ogrlayer_8cpp.xml COMMENT "Generate ogr_layer_docs.i by doxy2swig") add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_geometry_docs.i + OUTPUT ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_geometry_docs.i COMMAND - ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/doxy2swig.py - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrgeometry_8cpp.xml - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_geometry_docs.i OGRGeometryShadow OGR_G_ + ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/swig/include/python/docs/doxy2swig.py + ${CMAKE_SOURCE_DIR}/xml/ogrgeometry_8cpp.xml + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_geometry_docs.i OGRGeometryShadow OGR_G_ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/gdal/xml/ogrgeometry_8cpp.xml + DEPENDS ${CMAKE_SOURCE_DIR}/xml/ogrgeometry_8cpp.xml COMMENT "Generate ogr_geometory_docs.i by doxy2swig") add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_datasource_docs.i + OUTPUT ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_datasource_docs.i COMMAND - ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/doxy2swig.py - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrdatasource_8cpp.xml - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_datasource_docs.i OGRDataSourceShadow OGR_DS_ + ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/swig/include/python/docs/doxy2swig.py + ${CMAKE_SOURCE_DIR}/xml/ogrdatasource_8cpp.xml + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_datasource_docs.i OGRDataSourceShadow OGR_DS_ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/gdal/xml/ogrdatasource_8cpp.xml + DEPENDS ${CMAKE_SOURCE_DIR}/xml/ogrdatasource_8cpp.xml COMMENT "Generate ogr_datasource_docs.i by doxy2swig") add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_driver_docs.i + OUTPUT ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_driver_docs.i COMMAND - ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/doxy2swig.py - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrsfdriver_8cpp.xml - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_driver_docs.i OGRDriverShadow OGR_Dr_ + ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/swig/include/python/docs/doxy2swig.py + ${CMAKE_SOURCE_DIR}/xml/ogrsfdriver_8cpp.xml + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_driver_docs.i OGRDriverShadow OGR_Dr_ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/gdal/xml/ogrsfdriver_8cpp.xml + DEPENDS ${CMAKE_SOURCE_DIR}/xml/ogrsfdriver_8cpp.xml COMMENT "Generate ogr_driver_docs.i by doxy2swig") add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_feature_docs.i + OUTPUT ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_feature_docs.i COMMAND - ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/doxy2swig.py - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfeature_8cpp.xml - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_feature_docs.i OGRFeatureShadow OGR_F_ + ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/swig/include/python/docs/doxy2swig.py + ${CMAKE_SOURCE_DIR}/xml/ogrfeature_8cpp.xml + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_feature_docs.i OGRFeatureShadow OGR_F_ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfeature_8cpp.xml + DEPENDS ${CMAKE_SOURCE_DIR}/xml/ogrfeature_8cpp.xml COMMENT "Generate ogr_feature_docs.i by doxy2swig") add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_featuredef_docs.i + OUTPUT ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_featuredef_docs.i COMMAND - ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/doxy2swig.py - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfeaturedefn_8cpp.xml - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_featuredef_docs.i OGRFeatureDefnShadow OGR_FD_ + ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/swig/include/python/docs/doxy2swig.py + ${CMAKE_SOURCE_DIR}/xml/ogrfeaturedefn_8cpp.xml + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_featuredef_docs.i OGRFeatureDefnShadow OGR_FD_ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfeaturedefn_8cpp.xml + DEPENDS ${CMAKE_SOURCE_DIR}/xml/ogrfeaturedefn_8cpp.xml COMMENT "Generate ogr_featuredef_docs.i by doxy2swig") add_custom_command( - OUTPUT ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_fielddef_docs.i + OUTPUT ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_fielddef_docs.i COMMAND - ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/doxy2swig.py - ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfielddefn_8cpp.xml - ${CMAKE_SOURCE_DIR}/gdal/swig/include/python/docs/ogr_fielddef_docs.i OGRFieldDefnShadow OGR_Fld_ + ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/swig/include/python/docs/doxy2swig.py + ${CMAKE_SOURCE_DIR}/xml/ogrfielddefn_8cpp.xml + ${CMAKE_SOURCE_DIR}/swig/include/python/docs/ogr_fielddef_docs.i OGRFieldDefnShadow OGR_Fld_ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${CMAKE_SOURCE_DIR}/gdal/xml/ogrfielddefn_8cpp.xml + DEPENDS ${CMAKE_SOURCE_DIR}/xml/ogrfielddefn_8cpp.xml COMMENT "Generate ogr_fielddef_docs.i by doxy2swig") add_custom_target( epydoc diff --git a/gdal/swig/python/GNUmakefile b/swig/python/GNUmakefile similarity index 100% rename from gdal/swig/python/GNUmakefile rename to swig/python/GNUmakefile diff --git a/gdal/swig/python/README.rst b/swig/python/README.rst similarity index 100% rename from gdal/swig/python/README.rst rename to swig/python/README.rst diff --git a/gdal/swig/python/epydoc.conf b/swig/python/epydoc.conf similarity index 100% rename from gdal/swig/python/epydoc.conf rename to swig/python/epydoc.conf diff --git a/gdal/swig/python/extensions/gdal_array_wrap.cpp b/swig/python/extensions/gdal_array_wrap.cpp similarity index 100% rename from gdal/swig/python/extensions/gdal_array_wrap.cpp rename to swig/python/extensions/gdal_array_wrap.cpp diff --git a/gdal/swig/python/extensions/gdal_wrap.cpp b/swig/python/extensions/gdal_wrap.cpp similarity index 100% rename from gdal/swig/python/extensions/gdal_wrap.cpp rename to swig/python/extensions/gdal_wrap.cpp diff --git a/gdal/swig/python/extensions/gdalconst_wrap.c b/swig/python/extensions/gdalconst_wrap.c similarity index 100% rename from gdal/swig/python/extensions/gdalconst_wrap.c rename to swig/python/extensions/gdalconst_wrap.c diff --git a/gdal/swig/python/extensions/gnm_wrap.cpp b/swig/python/extensions/gnm_wrap.cpp similarity index 100% rename from gdal/swig/python/extensions/gnm_wrap.cpp rename to swig/python/extensions/gnm_wrap.cpp diff --git a/gdal/swig/python/extensions/ogr_wrap.cpp b/swig/python/extensions/ogr_wrap.cpp similarity index 100% rename from gdal/swig/python/extensions/ogr_wrap.cpp rename to swig/python/extensions/ogr_wrap.cpp diff --git a/gdal/swig/python/extensions/osr_wrap.cpp b/swig/python/extensions/osr_wrap.cpp similarity index 100% rename from gdal/swig/python/extensions/osr_wrap.cpp rename to swig/python/extensions/osr_wrap.cpp diff --git a/gdal/swig/python/fallback_build.bat b/swig/python/fallback_build.bat similarity index 100% rename from gdal/swig/python/fallback_build.bat rename to swig/python/fallback_build.bat diff --git a/gdal/swig/python/fallback_build_mingw32_under_unix.sh b/swig/python/fallback_build_mingw32_under_unix.sh similarity index 100% rename from gdal/swig/python/fallback_build_mingw32_under_unix.sh rename to swig/python/fallback_build_mingw32_under_unix.sh diff --git a/gdal/swig/python/fallback_build_mingw32_under_unix_py37.sh b/swig/python/fallback_build_mingw32_under_unix_py37.sh similarity index 100% rename from gdal/swig/python/fallback_build_mingw32_under_unix_py37.sh rename to swig/python/fallback_build_mingw32_under_unix_py37.sh diff --git a/gdal/swig/python/gdal-utils/.gitignore b/swig/python/gdal-utils/.gitignore similarity index 100% rename from gdal/swig/python/gdal-utils/.gitignore rename to swig/python/gdal-utils/.gitignore diff --git a/gdal/swig/python/gdal-utils/README.rst b/swig/python/gdal-utils/README.rst similarity index 100% rename from gdal/swig/python/gdal-utils/README.rst rename to swig/python/gdal-utils/README.rst diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/__init__.py b/swig/python/gdal-utils/osgeo_utils/__init__.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/__init__.py rename to swig/python/gdal-utils/osgeo_utils/__init__.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/__init__.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/__init__.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/__init__.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/__init__.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/base.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/base.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/base.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/base.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/batch_creator.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/batch_creator.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/batch_creator.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/batch_creator.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/color_palette.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/color_palette.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/color_palette.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/color_palette.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/color_table.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/color_table.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/color_table.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/color_table.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/extent_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/extent_util.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/extent_util.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/extent_util.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/gdal_argparse.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/gdal_argparse.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/gdal_argparse.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/gdal_argparse.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/numpy_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/numpy_util.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/numpy_util.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/numpy_util.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/osr_util.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/progress.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/raster_creation.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/raster_creation.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/raster_creation.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/raster_creation.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/rectangle.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/rectangle.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/rectangle.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/rectangle.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/util.py b/swig/python/gdal-utils/osgeo_utils/auxiliary/util.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/util.py rename to swig/python/gdal-utils/osgeo_utils/auxiliary/util.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py b/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal2tiles.py rename to swig/python/gdal-utils/osgeo_utils/gdal2tiles.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py b/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal2xyz.py rename to swig/python/gdal-utils/osgeo_utils/gdal2xyz.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_calc.py b/swig/python/gdal-utils/osgeo_utils/gdal_calc.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_calc.py rename to swig/python/gdal-utils/osgeo_utils/gdal_calc.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_edit.py b/swig/python/gdal-utils/osgeo_utils/gdal_edit.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_edit.py rename to swig/python/gdal-utils/osgeo_utils/gdal_edit.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py b/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py rename to swig/python/gdal-utils/osgeo_utils/gdal_fillnodata.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_merge.py b/swig/python/gdal-utils/osgeo_utils/gdal_merge.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_merge.py rename to swig/python/gdal-utils/osgeo_utils/gdal_merge.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py b/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py rename to swig/python/gdal-utils/osgeo_utils/gdal_pansharpen.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py b/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py rename to swig/python/gdal-utils/osgeo_utils/gdal_polygonize.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py b/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_proximity.py rename to swig/python/gdal-utils/osgeo_utils/gdal_proximity.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_retile.py b/swig/python/gdal-utils/osgeo_utils/gdal_retile.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_retile.py rename to swig/python/gdal-utils/osgeo_utils/gdal_retile.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py b/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdal_sieve.py rename to swig/python/gdal-utils/osgeo_utils/gdal_sieve.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py b/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdalattachpct.py rename to swig/python/gdal-utils/osgeo_utils/gdalattachpct.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdalcompare.py b/swig/python/gdal-utils/osgeo_utils/gdalcompare.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdalcompare.py rename to swig/python/gdal-utils/osgeo_utils/gdalcompare.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/gdalmove.py b/swig/python/gdal-utils/osgeo_utils/gdalmove.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/gdalmove.py rename to swig/python/gdal-utils/osgeo_utils/gdalmove.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/ogrmerge.py b/swig/python/gdal-utils/osgeo_utils/ogrmerge.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/ogrmerge.py rename to swig/python/gdal-utils/osgeo_utils/ogrmerge.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/pct2rgb.py b/swig/python/gdal-utils/osgeo_utils/pct2rgb.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/pct2rgb.py rename to swig/python/gdal-utils/osgeo_utils/pct2rgb.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/rgb2pct.py b/swig/python/gdal-utils/osgeo_utils/rgb2pct.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/rgb2pct.py rename to swig/python/gdal-utils/osgeo_utils/rgb2pct.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/__init__.py b/swig/python/gdal-utils/osgeo_utils/samples/__init__.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/__init__.py rename to swig/python/gdal-utils/osgeo_utils/samples/__init__.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py b/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py rename to swig/python/gdal-utils/osgeo_utils/samples/assemblepoly.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py b/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py rename to swig/python/gdal-utils/osgeo_utils/samples/build_jp2_from_xml.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/classify.py b/swig/python/gdal-utils/osgeo_utils/samples/classify.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/classify.py rename to swig/python/gdal-utils/osgeo_utils/samples/classify.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/crs2crs2grid.py b/swig/python/gdal-utils/osgeo_utils/samples/crs2crs2grid.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/crs2crs2grid.py rename to swig/python/gdal-utils/osgeo_utils/samples/crs2crs2grid.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/densify.py b/swig/python/gdal-utils/osgeo_utils/samples/densify.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/densify.py rename to swig/python/gdal-utils/osgeo_utils/samples/densify.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py b/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py rename to swig/python/gdal-utils/osgeo_utils/samples/dump_jp2.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py b/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py rename to swig/python/gdal-utils/osgeo_utils/samples/epsg_tr.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/esri2wkt.py b/swig/python/gdal-utils/osgeo_utils/samples/esri2wkt.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/esri2wkt.py rename to swig/python/gdal-utils/osgeo_utils/samples/esri2wkt.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/fft.py b/swig/python/gdal-utils/osgeo_utils/samples/fft.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/fft.py rename to swig/python/gdal-utils/osgeo_utils/samples/fft.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py b/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py rename to swig/python/gdal-utils/osgeo_utils/samples/fix_gpkg.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py rename to swig/python/gdal-utils/osgeo_utils/samples/gcps2ogr.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py rename to swig/python/gdal-utils/osgeo_utils/samples/gcps2vec.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py b/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py rename to swig/python/gdal-utils/osgeo_utils/samples/gcps2wld.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal2grd.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_auth.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_cp.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_create_pdf.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_ls.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_lut.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_lut.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_lut.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_lut.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_mkdir.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_remove_towgs84.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_rm.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_rmdir.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_vrtmerge.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_vrtmerge.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_vrtmerge.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_vrtmerge.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_zip.py b/swig/python/gdal-utils/osgeo_utils/samples/gdal_zip.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdal_zip.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdal_zip.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdalchksum.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdalcopyproj.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdalfilter.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalident.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdalident.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdalimport.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdalinfo.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py rename to swig/python/gdal-utils/osgeo_utils/samples/gdallocationinfo.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py b/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py rename to swig/python/gdal-utils/osgeo_utils/samples/get_soundg.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/histrep.py b/swig/python/gdal-utils/osgeo_utils/samples/histrep.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/histrep.py rename to swig/python/gdal-utils/osgeo_utils/samples/histrep.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py b/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py rename to swig/python/gdal-utils/osgeo_utils/samples/hsv_merge.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py b/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py rename to swig/python/gdal-utils/osgeo_utils/samples/jpeg_in_tiff_extract.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py b/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py rename to swig/python/gdal-utils/osgeo_utils/samples/load2odbc.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/loslas2ntv2.py b/swig/python/gdal-utils/osgeo_utils/samples/loslas2ntv2.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/loslas2ntv2.py rename to swig/python/gdal-utils/osgeo_utils/samples/loslas2ntv2.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/magphase.py b/swig/python/gdal-utils/osgeo_utils/samples/magphase.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/magphase.py rename to swig/python/gdal-utils/osgeo_utils/samples/magphase.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py b/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py rename to swig/python/gdal-utils/osgeo_utils/samples/make_fuzzer_friendly_archive.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py b/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py rename to swig/python/gdal-utils/osgeo_utils/samples/mkgraticule.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr2ogr.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr2ogr.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr2ogr.py rename to swig/python/gdal-utils/osgeo_utils/samples/ogr2ogr.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py rename to swig/python/gdal-utils/osgeo_utils/samples/ogr2vrt.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py rename to swig/python/gdal-utils/osgeo_utils/samples/ogr_build_junction_table.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py rename to swig/python/gdal-utils/osgeo_utils/samples/ogr_dispatch.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr_layer_algebra.py b/swig/python/gdal-utils/osgeo_utils/samples/ogr_layer_algebra.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/ogr_layer_algebra.py rename to swig/python/gdal-utils/osgeo_utils/samples/ogr_layer_algebra.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py b/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py rename to swig/python/gdal-utils/osgeo_utils/samples/ogrinfo.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py b/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py rename to swig/python/gdal-utils/osgeo_utils/samples/ogrupdate.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/rel.py b/swig/python/gdal-utils/osgeo_utils/samples/rel.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/rel.py rename to swig/python/gdal-utils/osgeo_utils/samples/rel.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py b/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py rename to swig/python/gdal-utils/osgeo_utils/samples/tigerpoly.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py b/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py rename to swig/python/gdal-utils/osgeo_utils/samples/tile_extent_from_raster.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py b/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py rename to swig/python/gdal-utils/osgeo_utils/samples/tolatlong.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py b/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/val_repl.py rename to swig/python/gdal-utils/osgeo_utils/samples/val_repl.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py rename to swig/python/gdal-utils/osgeo_utils/samples/validate_cloud_optimized_geotiff.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py rename to swig/python/gdal-utils/osgeo_utils/samples/validate_gpkg.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py b/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py rename to swig/python/gdal-utils/osgeo_utils/samples/validate_jp2.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py rename to swig/python/gdal-utils/osgeo_utils/samples/vec_tr.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py b/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py rename to swig/python/gdal-utils/osgeo_utils/samples/vec_tr_spat.py diff --git a/gdal/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py b/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py similarity index 100% rename from gdal/swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py rename to swig/python/gdal-utils/osgeo_utils/samples/wcs_virtds_params.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal2tiles.py b/swig/python/gdal-utils/scripts/gdal2tiles.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal2tiles.py rename to swig/python/gdal-utils/scripts/gdal2tiles.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal2xyz.py b/swig/python/gdal-utils/scripts/gdal2xyz.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal2xyz.py rename to swig/python/gdal-utils/scripts/gdal2xyz.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_calc.py b/swig/python/gdal-utils/scripts/gdal_calc.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_calc.py rename to swig/python/gdal-utils/scripts/gdal_calc.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_edit.py b/swig/python/gdal-utils/scripts/gdal_edit.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_edit.py rename to swig/python/gdal-utils/scripts/gdal_edit.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_fillnodata.py b/swig/python/gdal-utils/scripts/gdal_fillnodata.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_fillnodata.py rename to swig/python/gdal-utils/scripts/gdal_fillnodata.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_merge.py b/swig/python/gdal-utils/scripts/gdal_merge.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_merge.py rename to swig/python/gdal-utils/scripts/gdal_merge.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_pansharpen.py b/swig/python/gdal-utils/scripts/gdal_pansharpen.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_pansharpen.py rename to swig/python/gdal-utils/scripts/gdal_pansharpen.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_polygonize.py b/swig/python/gdal-utils/scripts/gdal_polygonize.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_polygonize.py rename to swig/python/gdal-utils/scripts/gdal_polygonize.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_proximity.py b/swig/python/gdal-utils/scripts/gdal_proximity.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_proximity.py rename to swig/python/gdal-utils/scripts/gdal_proximity.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_retile.py b/swig/python/gdal-utils/scripts/gdal_retile.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_retile.py rename to swig/python/gdal-utils/scripts/gdal_retile.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdal_sieve.py b/swig/python/gdal-utils/scripts/gdal_sieve.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdal_sieve.py rename to swig/python/gdal-utils/scripts/gdal_sieve.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdalattachpct.py b/swig/python/gdal-utils/scripts/gdalattachpct.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdalattachpct.py rename to swig/python/gdal-utils/scripts/gdalattachpct.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdalcompare.py b/swig/python/gdal-utils/scripts/gdalcompare.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdalcompare.py rename to swig/python/gdal-utils/scripts/gdalcompare.py diff --git a/gdal/swig/python/gdal-utils/scripts/gdalmove.py b/swig/python/gdal-utils/scripts/gdalmove.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/gdalmove.py rename to swig/python/gdal-utils/scripts/gdalmove.py diff --git a/gdal/swig/python/gdal-utils/scripts/ogrmerge.py b/swig/python/gdal-utils/scripts/ogrmerge.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/ogrmerge.py rename to swig/python/gdal-utils/scripts/ogrmerge.py diff --git a/gdal/swig/python/gdal-utils/scripts/pct2rgb.py b/swig/python/gdal-utils/scripts/pct2rgb.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/pct2rgb.py rename to swig/python/gdal-utils/scripts/pct2rgb.py diff --git a/gdal/swig/python/gdal-utils/scripts/rgb2pct.py b/swig/python/gdal-utils/scripts/rgb2pct.py similarity index 100% rename from gdal/swig/python/gdal-utils/scripts/rgb2pct.py rename to swig/python/gdal-utils/scripts/rgb2pct.py diff --git a/gdal/swig/python/gdal-utils/setup.py b/swig/python/gdal-utils/setup.py similarity index 100% rename from gdal/swig/python/gdal-utils/setup.py rename to swig/python/gdal-utils/setup.py diff --git a/gdal/swig/python/osgeo/__init__.py b/swig/python/osgeo/__init__.py similarity index 100% rename from gdal/swig/python/osgeo/__init__.py rename to swig/python/osgeo/__init__.py diff --git a/gdal/swig/python/osgeo/gdal.py b/swig/python/osgeo/gdal.py similarity index 100% rename from gdal/swig/python/osgeo/gdal.py rename to swig/python/osgeo/gdal.py diff --git a/gdal/swig/python/osgeo/gdal_array.py b/swig/python/osgeo/gdal_array.py similarity index 100% rename from gdal/swig/python/osgeo/gdal_array.py rename to swig/python/osgeo/gdal_array.py diff --git a/gdal/swig/python/osgeo/gdalconst.py b/swig/python/osgeo/gdalconst.py similarity index 100% rename from gdal/swig/python/osgeo/gdalconst.py rename to swig/python/osgeo/gdalconst.py diff --git a/gdal/swig/python/osgeo/gdalnumeric.py b/swig/python/osgeo/gdalnumeric.py similarity index 100% rename from gdal/swig/python/osgeo/gdalnumeric.py rename to swig/python/osgeo/gdalnumeric.py diff --git a/gdal/swig/python/osgeo/gnm.py b/swig/python/osgeo/gnm.py similarity index 100% rename from gdal/swig/python/osgeo/gnm.py rename to swig/python/osgeo/gnm.py diff --git a/gdal/swig/python/osgeo/ogr.py b/swig/python/osgeo/ogr.py similarity index 100% rename from gdal/swig/python/osgeo/ogr.py rename to swig/python/osgeo/ogr.py diff --git a/gdal/swig/python/osgeo/osr.py b/swig/python/osgeo/osr.py similarity index 100% rename from gdal/swig/python/osgeo/osr.py rename to swig/python/osgeo/osr.py diff --git a/gdal/swig/python/osgeo/utils.py b/swig/python/osgeo/utils.py similarity index 100% rename from gdal/swig/python/osgeo/utils.py rename to swig/python/osgeo/utils.py diff --git a/gdal/swig/python/setup.cfg b/swig/python/setup.cfg similarity index 100% rename from gdal/swig/python/setup.cfg rename to swig/python/setup.cfg diff --git a/gdal/swig/python/setup.py b/swig/python/setup.py similarity index 100% rename from gdal/swig/python/setup.py rename to swig/python/setup.py diff --git a/gdal/swig/python/trimmedsysconfig.py b/swig/python/trimmedsysconfig.py similarity index 100% rename from gdal/swig/python/trimmedsysconfig.py rename to swig/python/trimmedsysconfig.py diff --git a/gdal/third_party/GNUmakefile b/third_party/GNUmakefile similarity index 100% rename from gdal/third_party/GNUmakefile rename to third_party/GNUmakefile diff --git a/gdal/third_party/LercLib/BitMask.cpp b/third_party/LercLib/BitMask.cpp similarity index 100% rename from gdal/third_party/LercLib/BitMask.cpp rename to third_party/LercLib/BitMask.cpp diff --git a/gdal/third_party/LercLib/BitMask.h b/third_party/LercLib/BitMask.h similarity index 100% rename from gdal/third_party/LercLib/BitMask.h rename to third_party/LercLib/BitMask.h diff --git a/gdal/third_party/LercLib/BitStuffer2.cpp b/third_party/LercLib/BitStuffer2.cpp similarity index 100% rename from gdal/third_party/LercLib/BitStuffer2.cpp rename to third_party/LercLib/BitStuffer2.cpp diff --git a/gdal/third_party/LercLib/BitStuffer2.h b/third_party/LercLib/BitStuffer2.h similarity index 100% rename from gdal/third_party/LercLib/BitStuffer2.h rename to third_party/LercLib/BitStuffer2.h diff --git a/gdal/third_party/LercLib/CMakeLists.txt b/third_party/LercLib/CMakeLists.txt similarity index 100% rename from gdal/third_party/LercLib/CMakeLists.txt rename to third_party/LercLib/CMakeLists.txt diff --git a/gdal/third_party/LercLib/Defines.h b/third_party/LercLib/Defines.h similarity index 100% rename from gdal/third_party/LercLib/Defines.h rename to third_party/LercLib/Defines.h diff --git a/gdal/third_party/LercLib/GNUmakefile b/third_party/LercLib/GNUmakefile similarity index 100% rename from gdal/third_party/LercLib/GNUmakefile rename to third_party/LercLib/GNUmakefile diff --git a/gdal/third_party/LercLib/Huffman.cpp b/third_party/LercLib/Huffman.cpp similarity index 100% rename from gdal/third_party/LercLib/Huffman.cpp rename to third_party/LercLib/Huffman.cpp diff --git a/gdal/third_party/LercLib/Huffman.h b/third_party/LercLib/Huffman.h similarity index 100% rename from gdal/third_party/LercLib/Huffman.h rename to third_party/LercLib/Huffman.h diff --git a/gdal/third_party/LercLib/LICENSE b/third_party/LercLib/LICENSE similarity index 100% rename from gdal/third_party/LercLib/LICENSE rename to third_party/LercLib/LICENSE diff --git a/gdal/third_party/LercLib/Lerc.cpp b/third_party/LercLib/Lerc.cpp similarity index 100% rename from gdal/third_party/LercLib/Lerc.cpp rename to third_party/LercLib/Lerc.cpp diff --git a/gdal/third_party/LercLib/Lerc.h b/third_party/LercLib/Lerc.h similarity index 100% rename from gdal/third_party/LercLib/Lerc.h rename to third_party/LercLib/Lerc.h diff --git a/gdal/third_party/LercLib/Lerc2.cpp b/third_party/LercLib/Lerc2.cpp similarity index 100% rename from gdal/third_party/LercLib/Lerc2.cpp rename to third_party/LercLib/Lerc2.cpp diff --git a/gdal/third_party/LercLib/Lerc2.h b/third_party/LercLib/Lerc2.h similarity index 100% rename from gdal/third_party/LercLib/Lerc2.h rename to third_party/LercLib/Lerc2.h diff --git a/gdal/third_party/LercLib/Lerc_c_api.h b/third_party/LercLib/Lerc_c_api.h similarity index 100% rename from gdal/third_party/LercLib/Lerc_c_api.h rename to third_party/LercLib/Lerc_c_api.h diff --git a/gdal/third_party/LercLib/Lerc_c_api_impl.cpp b/third_party/LercLib/Lerc_c_api_impl.cpp similarity index 100% rename from gdal/third_party/LercLib/Lerc_c_api_impl.cpp rename to third_party/LercLib/Lerc_c_api_impl.cpp diff --git a/gdal/third_party/LercLib/Lerc_types.h b/third_party/LercLib/Lerc_types.h similarity index 100% rename from gdal/third_party/LercLib/Lerc_types.h rename to third_party/LercLib/Lerc_types.h diff --git a/gdal/third_party/LercLib/NOTICE b/third_party/LercLib/NOTICE similarity index 100% rename from gdal/third_party/LercLib/NOTICE rename to third_party/LercLib/NOTICE diff --git a/gdal/third_party/LercLib/README_GDAL.TXT b/third_party/LercLib/README_GDAL.TXT similarity index 100% rename from gdal/third_party/LercLib/README_GDAL.TXT rename to third_party/LercLib/README_GDAL.TXT diff --git a/gdal/third_party/LercLib/RLE.cpp b/third_party/LercLib/RLE.cpp similarity index 100% rename from gdal/third_party/LercLib/RLE.cpp rename to third_party/LercLib/RLE.cpp diff --git a/gdal/third_party/LercLib/RLE.h b/third_party/LercLib/RLE.h similarity index 100% rename from gdal/third_party/LercLib/RLE.h rename to third_party/LercLib/RLE.h diff --git a/gdal/third_party/LercLib/makefile.vc b/third_party/LercLib/makefile.vc similarity index 100% rename from gdal/third_party/LercLib/makefile.vc rename to third_party/LercLib/makefile.vc diff --git a/gdal/third_party/makefile.vc b/third_party/makefile.vc similarity index 100% rename from gdal/third_party/makefile.vc rename to third_party/makefile.vc diff --git a/gdal/third_party/o/README.TXT b/third_party/o/README.TXT similarity index 100% rename from gdal/third_party/o/README.TXT rename to third_party/o/README.TXT diff --git a/gdal/update_copyright.py b/update_copyright.py similarity index 100% rename from gdal/update_copyright.py rename to update_copyright.py