Fix .gitignore files to not ignore subdirectory matches

The previous used .gitignore files were mathing some files that
were actually already in the repository (e.g.,
hostapd/logwatch/hostapd). Avoid this by listing the conflicting
entries in the root directory .gitignore with full path.

diff --git a/.gitignore b/.gitignore
index f533957f073a9c789e1687b19af430f08a7548d7..4a1ad860e9f0acb24ca2e799f316fa85d98987a9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
 *.o
 *.d
 *~
+wpa_supplicant/eapol_test
+wpa_supplicant/preauth_test
+wpa_supplicant/wpa_cli
+wpa_supplicant/wpa_passphrase
+wpa_supplicant/wpa_supplicant
+wpa_supplicant/wpa_priv
+wpa_supplicant/wpa_gui/Makefile
+wpa_supplicant/wpa_gui/wpa_gui
+wpa_supplicant/wpa_gui-qt4/Makefile
+wpa_supplicant/wpa_gui-qt4/wpa_gui
+hostapd/hostapd
+hostapd/hostapd_cli
+hostapd/hlr_auc_gw
+hostapd/nt_password_hash

diff --git a/hostapd/.gitignore b/hostapd/.gitignore
deleted file mode 100644 (file)
index 6dd2c2f..0000000
--- a/hostapd/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.d
-.config
-driver_conf.c
-hostapd
-hostapd_cli
-hlr_auc_gw
-nt_password_hash

diff --git a/wpa_supplicant/.gitignore b/wpa_supplicant/.gitignore
index e7e034c7fe801369704e4e215a40a6f948982cc9..1f89d9f8894a6ad6600ab6640ceefb59e2a73c9b 100644 (file)
--- a/wpa_supplicant/.gitignore
+++ b/wpa_supplicant/.gitignore
@@ -1,8 +1 @@
-*.d
 .config
-eapol_test
-preauth_test
-wpa_cli
-wpa_passphrase
-wpa_supplicant
-wpa_priv

diff --git a/wpa_supplicant/wpa_gui-qt4/.gitignore b/wpa_supplicant/wpa_gui-qt4/.gitignore
index efcb6660002e5b6bf0a5782795fe52c930090d61..da818cb665579fc26c263382a1f33ccce9b7d507 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/.gitignore
+++ b/wpa_supplicant/wpa_gui-qt4/.gitignore
@@ -1,6 +1,4 @@
 .moc
 .obj
 .ui
-Makefile
-wpa_gui
 qrc_icons.cpp

diff --git a/wpa_supplicant/wpa_gui/.gitignore b/wpa_supplicant/wpa_gui/.gitignore
index 11963c84daa338fd10c2300456e9ba2f25902d2c..4df64a9bae8587f69369ed84b3203c3972a2a02a 100644 (file)
--- a/wpa_supplicant/wpa_gui/.gitignore
+++ b/wpa_supplicant/wpa_gui/.gitignore
@@ -1,5 +1,3 @@
 .moc
 .obj
 .ui
-Makefile
-wpa_gui