Cleaning up merge from master

diff --git a/.gitignore b/.gitignore
index 1653c29..920d7c6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,58 +1,6 @@
-Makefile.in
-Makefile
-aclocal.m4
+# On build branches, almost everything goes into git (?!)
 autom4te.cache
-configure
-config.*
-ltmain.sh
-libtool
-depcomp
-m4
-!m4/minuso.m4
-build-aux
-!build-aux/compile
 mech_eap.spec
 mech_eap*tar*
 *.lo
-*.a
-*.o
-*.d
-*.gcno
-*.gcda
-*.gcov
-*.pyc
 *#
-*~
-*.orig
-.config
-tests/hwsim/logs
-wpaspy/build
-wpa_supplicant/eapol_test
-wpa_supplicant/nfc_pw_token
-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
-wpa_supplicant/libwpa_test1
-wpa_supplicant/libwpa_test2
-hostapd/hostapd
-hostapd/hostapd_cli
-hostapd/hlr_auc_gw
-hostapd/nt_password_hash
-mac80211_hwsim/tools/hwsim_test
-wlantest/libwlantest.a
-wlantest/test_vectors
-wlantest/wlantest
-wlantest/wlantest_cli
-libeap/.deps
-libeap/.libs
-libeap/Makefile
-libeap/libeap.la
-libeap/tests/hwsim/logs/
-libeap/tests/test-rsa-sig-ver
-stamp-h1