gitignore: merge gitignore files

For the most part, we only have one main .gitignore file.

There were a few nested files, merge them into the main file.

I find it better to have only one gitignore file, otherwise the
list of ignored files is spread out through the working directory.

5 files changed, 21 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index fa4a67c554..e30ef9eb95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,10 @@ test-*.trs
 /conftest.[ch]
 /conftest.o.*
 
+/contrib/fedora/rpm/NetworkManager.*.??????/
+/contrib/fedora/rpm/latest0
+/contrib/fedora/rpm/latest
+
 /dispatcher/nm-avahi-autoipd.action
 /dispatcher/nm-dispatcher
 /dispatcher/nmdbus-dispatcher.*
@@ -120,14 +124,14 @@ test-*.trs
 /examples/C/qt/add-connection-wired
 /examples/C/qt/list-connections
 /examples/C/qt/change-ipv4-addresses
+/examples/C/qt/monitor-nm-running
+/examples/C/qt/monitor-nm-running.moc
 
 /shared/nm-utils/tests/test-shared-general
 /shared/nm-version-macros.h
 
 /introspection/org.freedesktop.NetworkManager*.[ch]
 
-/libgsystem/
-
 /libnm-core/tests/test-compare
 /libnm-core/tests/test-crypto
 /libnm-core/tests/test-settings-defaults
@@ -217,6 +221,17 @@ test-*.trs
 /src/nm-iface-helper
 /src/ndisc/tests/test-ndisc-fake
 /src/ndisc/tests/test-ndisc-linux
+/src/platform/tests/monitor
+/src/platform/tests/test-address-fake
+/src/platform/tests/test-address-linux
+/src/platform/tests/test-cleanup-fake
+/src/platform/tests/test-cleanup-linux
+/src/platform/tests/test-link-fake
+/src/platform/tests/test-link-linux
+/src/platform/tests/test-nmp-object
+/src/platform/tests/test-platform-general
+/src/platform/tests/test-route-fake
+/src/platform/tests/test-route-linux
 /src/settings/plugins/ibft/tests/test-ibft
 /src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.[ch]
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
@@ -281,6 +296,7 @@ test-*.trs
 /introspection/nmdbus-*.c
 /introspection/nmdbus-*.h
 /introspection/nmdbus-*.xml
+/libgsystem/
 /libnm-core/tests/test-setting-8021x
 /libnm-core/tests/test-setting-bond
 /libnm-core/tests/test-setting-dcb
@@ -314,6 +330,9 @@ test-*.trs
 /src/dhcp-manager/tests/test-dhcp-options
 /src/dhcp-manager/tests/test-dhcp-utils
 /src/dnsmasq-manager/tests/test-dnsmasq-utils
+/src/platform/tests/dump
+/src/platform/tests/platform
+/src/platform/tests/test-general
 /src/rdisc/
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
 /src/settings/plugins/ifnet
diff --git a/contrib/fedora/rpm/.gitignore b/contrib/fedora/rpm/.gitignore
deleted file mode 100644
index 47f09d2afe..0000000000
--- a/contrib/fedora/rpm/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/NetworkManager.*.??????/
-/latest0
-/latest
diff --git a/examples/C/qt/.gitignore b/examples/C/qt/.gitignore
deleted file mode 100644
index 8c97223318..0000000000
--- a/examples/C/qt/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/monitor-nm-running
-/monitor-nm-running.moc
diff --git a/src/ndisc/tests/.gitignore b/src/ndisc/tests/.gitignore
deleted file mode 100644
index 605f4b0125..0000000000
--- a/src/ndisc/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ndisc
diff --git a/src/platform/tests/.gitignore b/src/platform/tests/.gitignore
deleted file mode 100644
index 7ebc980c2f..0000000000
--- a/src/platform/tests/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/monitor
-/platform
-/test-address-fake
-/test-address-linux
-/test-cleanup-fake
-/test-cleanup-linux
-/test-link-fake
-/test-link-linux
-/test-nmp-object
-/test-platform-general
-/test-route-fake
-/test-route-linux
-
-# no longer exists but was used in the past.
-/dump
-/test-general