Rearrange .gitignore and expand content

1 files changed, 100 insertions, 95 deletions

diff --git a/.gitignore b/.gitignore
index dd5e1016..563782de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,129 +1,134 @@
+# Editor temporary/working/backup
 *~
 *.bak
+*.swp
+
+# Compiled source
+*.dll
+*.exe
+*.exp
+*.la
+*.lib
+*.lo
+*.o
+*.obj
+*.ol
+*.pdb
 *.pyc
+
+# IDEs
 build.local.bat
 build.local.sh
-Makefile
-Makefile.in
-CMakeFiles
-CMakeCache.txt
-CMakeSettings.json
-CTestTestfile.cmake
-cmake_install.cmake
-install_manifest.txt
-cmake/project-config*.cmake
-README
-test-driver
-
 /.idea
 /.vs*
-/*.manifest
-/*.swp
 /*build*
+/nbproject
+
+# Autotools
+autom4te.cache
 /aclocal.m4
-/autom4te.cache
+/compile
 /config.cache
 /config.guess
 /config.log
 /config.status
 /config.sub
 /configure
-/compile
 /depcomp
 /install-sh
-/libtool
 /ltmain.sh
 /missing
-/nbproject
-/proj.pc
+libtool
+.deps
+.dirstamp
+.libs
+Makefile.in
+Makefile
+
+# CMake
+CMakeFiles
+CMakeCache.txt
+CMakeSettings.json
+CTestTestfile.cmake
+cmake_install.cmake
+cmake/project-config*.cmake
+install_manifest.txt
+/googletest*
+
+# / (base)
+/*.manifest
+/README
 /bin
 /lib
-/DartConfiguration.tcl
+/proj.pc
+/test-driver
 /Testing
 
-# html
-/html/dl
-/html/robots.txt
+# data
+/data/all.sql.in
+/data/proj.db
+/data/*.ct2
+/data/*.dat
+/data/*.gsb
+/data/*.gtx
+/data/*.lla
+/data/*.pol
+/data/*.zip
+/data/DK
+/data/FL
+/data/FO
+/data/GL
+/data/MD
+/data/NKG
+/data/README*
+/data/TN
+/data/WI
+/data/WO
+/data/alaska
+/data/conus
+/data/hawaii
+/data/null
+/data/prvi
+/data/stgeorge
+/data/stlrnc
+/data/stpaul
+/data/tv_out
 
-# m4
-/m4/libtool.m4
-/m4/ltoptions.m4
-/m4/ltsugar.m4
-/m4/ltversion.m4
-/m4/lt~obsolete.m4
+# docs
+tmp_breathe
+/docs/.doxygen_up_to_date
+/docs/build
 
-# nad
-/nad/install
-/nad/WI
-/nad/prvi
-/nad/WO
-/nad/alaska
-/nad/FL
-/nad/README.NADUS
-/nad/stpaul
-/nad/stgeorge
-/nad/TN
-/nad/conus
-/nad/MD
-/nad/hawaii
-/nad/stlrnc
-/nad/null
-/nad/*.lla
+# m4
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
 
 # src
-/src/*.o
-/src/*.lo
-/src/*.la
-/src/proj.dll
-/src/*.lib
-/src/*.pdb
-/src/*.exp
-/src/*.opt
-/src/*.obj
-/src/*.exe
-/src/.libs
-/src/.deps
-/src/*.manifest
-/src/*.swp
-/src/nad2nad
-/src/nad2bin
-/src/proj
+/src/cct
+/src/cs2cs
 /src/geod
-/src/geodtest.log
-/src/geodtest.trs
-/src/stamp-h*
+/src/geodtest*
+/src/gie
+/src/proj
 /src/proj_config.h
 /src/proj_config.h.in
-/src/cs2cs
-/src/multistresstest
-/src/test228
+/src/projinfo
+/src/stamp-h1
 /src/test-suite.log
-/src/cct
-/src/gie
-/src/geodtest
 
-# test
-test/googletest/.libs/
-test/googletest/libgtest.la
-test/googletest/src/.deps/
-test/googletest/src/.dirstamp
-test/googletest/src/.libs/
-test/googletest/src/gtest-all.lo
-test/googletest/src/gtest-all.o
-test/unit/.deps/
-test/unit/.libs/
-test/unit/basic_test
-test/unit/basic_test.o
-test/unit/main.o
-test/unit/pj_phi2_test
-test/unit/pj_phi2_test.o
-test/unit/proj_errno_string_test
-test/unit/proj_errno_string_test.o
+# test/unit
+/test/unit/basic_test
+/test/unit/gie_self_tests
+/test/unit/include_proj_h_from_c
+/test/unit/pj_phi2_test
+/test/unit/pj_transform_test
+/test/unit/proj_angular_io_test
+/test/unit/proj_context_test
+/test/unit/test_cpp_api
+/test/unit/proj_errno_string_test
 
-# Java bridge
+# jniwrap
 jniwrap/out
-
-/docs/build
-/docs/.doxygen_up_to_date
-
-tmp_breathe