From 24ab5ca85b4adfd26c1a489e4c943208b8bc0860 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 7 Apr 2019 11:49:51 -0700 Subject: [PATCH] GUACAMOLE-637: Remove unnecessary .gitignore files. Universally exclude test output. Remove duplicated exclusions. --- .gitignore | 4 ++++ src/common/.gitignore | 4 ---- src/guacd/.gitignore | 35 ----------------------------- src/libguac/.gitignore | 4 ---- src/protocols/rdp/.gitignore | 39 --------------------------------- src/protocols/ssh/.gitignore | 36 ------------------------------ src/protocols/telnet/.gitignore | 36 ------------------------------ src/protocols/vnc/.gitignore | 36 ------------------------------ 8 files changed, 4 insertions(+), 190 deletions(-) delete mode 100644 src/protocols/rdp/.gitignore delete mode 100644 src/protocols/ssh/.gitignore delete mode 100644 src/protocols/telnet/.gitignore delete mode 100644 src/protocols/vnc/.gitignore diff --git a/.gitignore b/.gitignore index e0a6d53e..e716ee0f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,10 @@ *.gcov *.gcno +# Test suite output +*.log +*.trs + # Backup files *~ diff --git a/src/common/.gitignore b/src/common/.gitignore index f7efbda8..b66a6a9a 100644 --- a/src/common/.gitignore +++ b/src/common/.gitignore @@ -3,7 +3,3 @@ _generated_runner.c test_common -# Test suite output -*.log -*.trs - diff --git a/src/guacd/.gitignore b/src/guacd/.gitignore index 558c3194..4f9ae75e 100644 --- a/src/guacd/.gitignore +++ b/src/guacd/.gitignore @@ -13,38 +13,3 @@ guacd.exe man/guacd.8 man/guacd.conf.5 -# Object code -*.o -*.so -*.lo -*.la - -# Backup files -*~ - -# Release files -*.tar.gz - -# Files currently being edited by vim or vi -*.swp - -# automake/autoconf -.deps/ -.libs/ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/ -m4/ -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing - - diff --git a/src/libguac/.gitignore b/src/libguac/.gitignore index ab580797..9adc856b 100644 --- a/src/libguac/.gitignore +++ b/src/libguac/.gitignore @@ -3,7 +3,3 @@ _generated_runner.c test_libguac -# Test suite output -*.log -*.trs - diff --git a/src/protocols/rdp/.gitignore b/src/protocols/rdp/.gitignore deleted file mode 100644 index dd8ff144..00000000 --- a/src/protocols/rdp/.gitignore +++ /dev/null @@ -1,39 +0,0 @@ - -# Object code -*.o -*.so -*.lo -*.la - -# Backup files -*~ - -# Release files -*.tar.gz - -# Files currently being edited by vim or vi -*.swp - -# automake/autoconf -.deps/ -.libs/ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/ -m4/* -!README -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing - -# Autogenerated sources -_generated_keymaps.c - diff --git a/src/protocols/ssh/.gitignore b/src/protocols/ssh/.gitignore deleted file mode 100644 index 3f725332..00000000 --- a/src/protocols/ssh/.gitignore +++ /dev/null @@ -1,36 +0,0 @@ - -# Object code -*.o -*.so -*.lo -*.la - -# Backup files -*~ - -# Release files -*.tar.gz - -# Files currently being edited by vim or vi -*.swp - -# automake/autoconf -.deps/ -.libs/ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/ -m4/* -!README -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing - diff --git a/src/protocols/telnet/.gitignore b/src/protocols/telnet/.gitignore deleted file mode 100644 index 3f725332..00000000 --- a/src/protocols/telnet/.gitignore +++ /dev/null @@ -1,36 +0,0 @@ - -# Object code -*.o -*.so -*.lo -*.la - -# Backup files -*~ - -# Release files -*.tar.gz - -# Files currently being edited by vim or vi -*.swp - -# automake/autoconf -.deps/ -.libs/ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/ -m4/* -!README -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing - diff --git a/src/protocols/vnc/.gitignore b/src/protocols/vnc/.gitignore deleted file mode 100644 index 3f725332..00000000 --- a/src/protocols/vnc/.gitignore +++ /dev/null @@ -1,36 +0,0 @@ - -# Object code -*.o -*.so -*.lo -*.la - -# Backup files -*~ - -# Release files -*.tar.gz - -# Files currently being edited by vim or vi -*.swp - -# automake/autoconf -.deps/ -.libs/ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/ -m4/* -!README -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -