From c95873e5370fe6286a5d09455f582cabe570cb15 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 14 Dec 2018 12:46:35 +0000
Subject: [PATCH] .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>
---
 .gitignore                |  5 +++++
 bus/.gitignore            | 10 ----------
 dbus/.gitignore           | 12 ------------
 doc/.gitignore            |  7 -------
 test/.gitignore           | 12 ------------
 test/name-test/.gitignore |  4 ----
 tools/.gitignore          | 10 ----------
 7 files changed, 5 insertions(+), 55 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82d27563f..ee80d4f8b 100644
--- 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 37b04778f..feeeee391 100644
--- 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 fd91ccee5..11b9f0a43 100644
--- 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 3f0dba888..1636e348e 100644
--- 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 597dbc60e..5365347c5 100644
--- 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 0ecde2f2c..f55db7b46 100644
--- 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 1e0d987a6..14d72e978 100644
--- 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
-- 
2.47.3