From 01cf713e51283a114039544fab920ae7116c7c24 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Thu, 7 Oct 2010 11:04:16 +0300
Subject: [PATCH] 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.
---
 .gitignore                            | 14 ++++++++++++++
 hostapd/.gitignore                    |  7 -------
 wpa_supplicant/.gitignore             |  7 -------
 wpa_supplicant/wpa_gui-qt4/.gitignore |  2 --
 wpa_supplicant/wpa_gui/.gitignore     |  2 --
 5 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 hostapd/.gitignore

diff --git a/.gitignore b/.gitignore
index f533957f0..4a1ad860e 100644
--- 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
index 6dd2c2fd3..000000000
--- 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 e7e034c7f..1f89d9f88 100644
--- 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 efcb66600..da818cb66 100644
--- 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 11963c84d..4df64a9ba 100644
--- a/wpa_supplicant/wpa_gui/.gitignore
+++ b/wpa_supplicant/wpa_gui/.gitignore
@@ -1,5 +1,3 @@
 .moc
 .obj
 .ui
-Makefile
-wpa_gui