.gitignore: Consolidate generic patterns at top level

Patterns in the top-level .gitignore match in all subdirectories, so
there's no need to repeat ourselves quite so much for generic
C, Autotools and gcov patterns.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/.gitignore b/.gitignore
index 82d27563f5e5bcfbe60794b26f29036152d98a97..ee80d4f8b3ad4cd3284142e685fd05d44109b683 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,11 +30,16 @@
 *.gcda
 *.gcno
 *.gcov
+*.la
+*.lo
 *.o
 *.orig
 *.rej
 *~
 .*.sw?
+.deps/
+.dirstamp
+.libs/
 Makefile
 Makefile.in
 cscope.out

diff --git a/bus/.gitignore b/bus/.gitignore
index 37b04778f3a9771d7aa3ca1d36742d9c8f00cdef..feeeee391ef940fce35337d123e3595fbdc4148d 100644 (file)
--- a/bus/.gitignore
+++ b/bus/.gitignore
@@ -1,18 +1,8 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
 dbus-daemon
 dbus-daemon-activation-helper
 dbus-daemon-activation-helper-test
 dbus-daemon-launch-helper
 dbus-daemon-launch-helper-test
-*.bb
-*.bbg
-*.da
-*.gcov
 test-bus
 rc.messagebus
 messagebus

diff --git a/dbus/.gitignore b/dbus/.gitignore
index fd91ccee5ecfc360391b49d9fcf55b8af7a19b9f..11b9f0a439614fb6467a32c5f78184184a1a3dca 100644 (file)
--- a/dbus/.gitignore
+++ b/dbus/.gitignore
@@ -1,17 +1,5 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
 test-dbus
-*.bb
-*.bbg
-*.gcov
-*.da
 dbus-arch-deps.h
 .dbus-keyrings
 dbus-glib-error-enum.h
-*.gcno
-*.gcda
 versioninfo.rc

diff --git a/doc/.gitignore b/doc/.gitignore
index 3f0dba888c01ea0058fa2a20e8f60dd46f8021dc..1636e348e3dcc6b75bd8d477db32ee1548073314 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,13 +1,6 @@
-.deps
-.libs
-Makefile
-Makefile.in
 *.1
 *.1.xml
 *.1.html
-*.lo
-*.la
-*.o
 api
 dbus.devhelp
 /dbus.devhelp2

diff --git a/test/.gitignore b/test/.gitignore
index 597dbc60e978b0b15e9b15456e16870a7e4a83ba..5365347c5a0060785731a63db5e1c7b246fc53c5 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,18 +1,7 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
-*.o
 echo-server
 echo-client
 test-bus
 unbase64
-*.bb
-*.bbg
-*.da
-*.gcov
 break-loader
 test-spawn
 test-corrupt
@@ -37,4 +26,3 @@ test-printf
 test-refs
 test-syntax
 test-syslog
-internals/.dirstamp

diff --git a/test/name-test/.gitignore b/test/name-test/.gitignore
index 0ecde2f2c47cd61cb688af941fb8db60d7a23060..f55db7b46b56a0b9ff8fde704683163d20bf9356 100644 (file)
--- a/test/name-test/.gitignore
+++ b/test/name-test/.gitignore
@@ -1,7 +1,3 @@
-.deps
-.libs
-Makefile
-Makefile.in
 echo-error-output.tmp
 tmp-session-bus.*.conf
 test-ids

diff --git a/tools/.gitignore b/tools/.gitignore
index 1e0d987a6913546777984e5d50705aa85cb9ce55..14d72e97839ce3b2a60ecd8c9b6be6761b1208ab 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,19 +1,9 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
 dbus-send
 dbus-monitor
 dbus-cleanup-sockets
 dbus-launch
 dbus-uuidgen
 dbus-run-session
-*.bb
-*.bbg
-*.gcov
-*.da
 dbus-viewer
 dbus-glib-bindings.h
 run-with-tmp-session-bus.conf