Clean up .gitignore files

108 files changed, 4 insertions, 122 deletions

diff --git a/.gitignore b/.gitignore
index 8f39b533493..faf2ca38397 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.ilk
 *.la
 *.lo
+*.log
 *.o
 *.obj
 *.os
@@ -17,6 +18,7 @@
 *.tar
 *.tar.bz2
 *.tar.gz
+*.trs
 *.zip
 *~
 depend
@@ -36,9 +38,9 @@ config.py
 build
 libtool
 manifest.txt
-Makefile.in
 .dir-locals.el
 .deps/
 .dirstamp
 .libs/
-/Makefile
+Makefile
+Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index ddfb4058659..00000000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile
-*.trs
-*.log
diff --git a/src/egl/.gitignore b/src/egl/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/egl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/egl/drivers/.gitignore b/src/egl/drivers/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/egl/drivers/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/egl/main/.gitignore b/src/egl/main/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/egl/main/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/egl/wayland/.gitignore b/src/egl/wayland/.gitignore
index 762383e128f..f4ed848476f 100644
--- a/src/egl/wayland/.gitignore
+++ b/src/egl/wayland/.gitignore
@@ -1,4 +1,3 @@
-Makefile
 wayland-drm-client-protocol.h
 wayland-drm-server-protocol.h
 wayland-drm-protocol.c
diff --git a/src/gallium/.gitignore b/src/gallium/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/gallium/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/gallium/auxiliary/.gitignore b/src/gallium/auxiliary/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/auxiliary/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/auxiliary/pipe-loader/.gitignore b/src/gallium/auxiliary/pipe-loader/.gitignore
deleted file mode 100644
index 73954b716d6..00000000000
--- a/src/gallium/auxiliary/pipe-loader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
\ No newline at end of file
diff --git a/src/gallium/drivers/.gitignore b/src/gallium/drivers/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/i915/.gitignore b/src/gallium/drivers/i915/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/i915/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/llvmpipe/.gitignore b/src/gallium/drivers/llvmpipe/.gitignore
index 01873eb0899..add93e8600f 100644
--- a/src/gallium/drivers/llvmpipe/.gitignore
+++ b/src/gallium/drivers/llvmpipe/.gitignore
@@ -3,4 +3,3 @@ lp_test_blend
 lp_test_conv
 lp_test_format
 lp_test_printf
-Makefile
diff --git a/src/gallium/drivers/nouveau/.gitignore b/src/gallium/drivers/nouveau/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/nouveau/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/nv30/.gitignore b/src/gallium/drivers/nv30/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/nv30/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/nv50/.gitignore b/src/gallium/drivers/nv50/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/nv50/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/nvc0/.gitignore b/src/gallium/drivers/nvc0/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/nvc0/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/r300/.gitignore b/src/gallium/drivers/r300/.gitignore
index aac15cada09..155b661c853 100644
--- a/src/gallium/drivers/r300/.gitignore
+++ b/src/gallium/drivers/r300/.gitignore
@@ -1,2 +1 @@
-Makefile
 r300_compiler_tests
diff --git a/src/gallium/drivers/radeonsi/.gitignore b/src/gallium/drivers/radeonsi/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/radeonsi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/rbug/.gitignore b/src/gallium/drivers/rbug/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/rbug/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/softpipe/.gitignore b/src/gallium/drivers/softpipe/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/softpipe/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/svga/.gitignore b/src/gallium/drivers/svga/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/drivers/svga/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/drivers/trace/.gitignore b/src/gallium/drivers/trace/.gitignore
deleted file mode 100644
index 282522db034..00000000000
--- a/src/gallium/drivers/trace/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/gallium/state_trackers/.gitignore b/src/gallium/state_trackers/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/clover/.gitignore b/src/gallium/state_trackers/clover/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/gallium/state_trackers/clover/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/gallium/state_trackers/dri/.gitignore b/src/gallium/state_trackers/dri/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/dri/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/dri/drm/.gitignore b/src/gallium/state_trackers/dri/drm/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/dri/drm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/dri/sw/.gitignore b/src/gallium/state_trackers/dri/sw/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/dri/sw/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/egl/.gitignore b/src/gallium/state_trackers/egl/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/egl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/gbm/.gitignore b/src/gallium/state_trackers/gbm/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/gbm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/glx/.gitignore b/src/gallium/state_trackers/glx/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/glx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/vdpau/.gitignore b/src/gallium/state_trackers/vdpau/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/vdpau/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/vega/.gitignore b/src/gallium/state_trackers/vega/.gitignore
index dcd83d0a02f..c452229f7f4 100644
--- a/src/gallium/state_trackers/vega/.gitignore
+++ b/src/gallium/state_trackers/vega/.gitignore
@@ -1,2 +1 @@
 api_tmp.h
-Makefile
diff --git a/src/gallium/state_trackers/xa/.gitignore b/src/gallium/state_trackers/xa/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/xa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/xorg/.gitignore b/src/gallium/state_trackers/xorg/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/xorg/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/state_trackers/xvmc/.gitignore b/src/gallium/state_trackers/xvmc/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/state_trackers/xvmc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/.gitignore b/src/gallium/targets/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/dri-i915/.gitignore b/src/gallium/targets/dri-i915/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/dri-i915/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/dri-nouveau/.gitignore b/src/gallium/targets/dri-nouveau/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/dri-nouveau/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/dri-r300/.gitignore b/src/gallium/targets/dri-r300/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/dri-r300/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/dri-r600/.gitignore b/src/gallium/targets/dri-r600/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/dri-r600/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/dri-radeonsi/.gitignore b/src/gallium/targets/dri-radeonsi/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/dri-radeonsi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/dri-swrast/.gitignore b/src/gallium/targets/dri-swrast/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/dri-swrast/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/dri-vmwgfx/.gitignore b/src/gallium/targets/dri-vmwgfx/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/dri-vmwgfx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/egl-static/.gitignore b/src/gallium/targets/egl-static/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/egl-static/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/gbm/.gitignore b/src/gallium/targets/gbm/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/gbm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/libgl-xlib/.gitignore b/src/gallium/targets/libgl-xlib/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/libgl-xlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/opencl/.gitignore b/src/gallium/targets/opencl/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/gallium/targets/opencl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/gallium/targets/pipe-loader/.gitignore b/src/gallium/targets/pipe-loader/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/pipe-loader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/vdpau-nouveau/.gitignore b/src/gallium/targets/vdpau-nouveau/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/vdpau-nouveau/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/vdpau-r300/.gitignore b/src/gallium/targets/vdpau-r300/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/vdpau-r300/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/vdpau-r600/.gitignore b/src/gallium/targets/vdpau-r600/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/vdpau-r600/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/vdpau-radeonsi/.gitignore b/src/gallium/targets/vdpau-radeonsi/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/vdpau-radeonsi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/vdpau-softpipe/.gitignore b/src/gallium/targets/vdpau-softpipe/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/vdpau-softpipe/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xa-vmwgfx/.gitignore b/src/gallium/targets/xa-vmwgfx/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xa-vmwgfx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xorg-i915/.gitignore b/src/gallium/targets/xorg-i915/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xorg-i915/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xorg-nouveau/.gitignore b/src/gallium/targets/xorg-nouveau/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xorg-nouveau/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xorg-r300/.gitignore b/src/gallium/targets/xorg-r300/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xorg-r300/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xorg-r600/.gitignore b/src/gallium/targets/xorg-r600/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xorg-r600/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xorg-radeonsi/.gitignore b/src/gallium/targets/xorg-radeonsi/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xorg-radeonsi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xvmc-nouveau/.gitignore b/src/gallium/targets/xvmc-nouveau/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xvmc-nouveau/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xvmc-r300/.gitignore b/src/gallium/targets/xvmc-r300/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xvmc-r300/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xvmc-r600/.gitignore b/src/gallium/targets/xvmc-r600/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xvmc-r600/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/targets/xvmc-softpipe/.gitignore b/src/gallium/targets/xvmc-softpipe/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/targets/xvmc-softpipe/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/.gitignore b/src/gallium/winsys/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/i915/drm/.gitignore b/src/gallium/winsys/i915/drm/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/i915/drm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/i915/sw/.gitignore b/src/gallium/winsys/i915/sw/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/i915/sw/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/nouveau/drm/.gitignore b/src/gallium/winsys/nouveau/drm/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/nouveau/drm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/radeon/drm/.gitignore b/src/gallium/winsys/radeon/drm/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/radeon/drm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/svga/drm/.gitignore b/src/gallium/winsys/svga/drm/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/svga/drm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/sw/.gitignore b/src/gallium/winsys/sw/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/sw/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/sw/dri/.gitignore b/src/gallium/winsys/sw/dri/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/sw/dri/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/sw/fbdev/.gitignore b/src/gallium/winsys/sw/fbdev/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/sw/fbdev/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/sw/null/.gitignore b/src/gallium/winsys/sw/null/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/sw/null/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/sw/wayland/.gitignore b/src/gallium/winsys/sw/wayland/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/sw/wayland/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/sw/wrapper/.gitignore b/src/gallium/winsys/sw/wrapper/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/sw/wrapper/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gallium/winsys/sw/xlib/.gitignore b/src/gallium/winsys/sw/xlib/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gallium/winsys/sw/xlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/gbm/.gitignore b/src/gbm/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/gbm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/glsl/.gitignore b/src/glsl/.gitignore
index 068d4874b3f..4eb4fef9bb8 100644
--- a/src/glsl/.gitignore
+++ b/src/glsl/.gitignore
@@ -5,4 +5,3 @@ glsl_parser.h
 glsl_parser.output
 builtin_function.cpp
 glsl_test
-/Makefile
diff --git a/src/glsl/builtin_compiler/.gitignore b/src/glsl/builtin_compiler/.gitignore
index 40c551baa22..ea7d5de9c3a 100644
--- a/src/glsl/builtin_compiler/.gitignore
+++ b/src/glsl/builtin_compiler/.gitignore
@@ -3,4 +3,3 @@ glcpp-lex.c
 glcpp-parse.c
 glcpp-parse.h
 glcpp-parse.output
-/Makefile
diff --git a/src/glsl/glcpp/.gitignore b/src/glsl/glcpp/.gitignore
index 64033e2aacb..01d2888e768 100644
--- a/src/glsl/glcpp/.gitignore
+++ b/src/glsl/glcpp/.gitignore
@@ -3,5 +3,3 @@ glcpp-lex.c
 glcpp-parse.output
 glcpp-parse.c
 glcpp-parse.h
-tests/*.out
-/Makefile
diff --git a/src/glsl/tests/.gitignore b/src/glsl/tests/.gitignore
index f7733774804..c06ab2b5ac6 100644
--- a/src/glsl/tests/.gitignore
+++ b/src/glsl/tests/.gitignore
@@ -1,3 +1,2 @@
-Makefile
 ralloc-test
 uniform-initializer-test
diff --git a/src/glx/.gitignore b/src/glx/.gitignore
index 87c2d5896f1..71ad7856797 100644
--- a/src/glx/.gitignore
+++ b/src/glx/.gitignore
@@ -1,10 +1,5 @@
-Makefile
-Makefile.in
-libGL.la
-libglx.la
 indirect.c
 indirect.h
 indirect_init.c
 indirect_size.c
 indirect_size.h
-
diff --git a/src/gtest/.gitignore b/src/gtest/.gitignore
index acf7b5fa820..3dac369451c 100644
--- a/src/gtest/.gitignore
+++ b/src/gtest/.gitignore
@@ -1,5 +1 @@
-.deps
-.libs
-Makefile
-Makefile.in
 libgtest.la
diff --git a/src/mapi/es1api/.gitignore b/src/mapi/es1api/.gitignore
index 39b0e7ce680..dfe465677c4 100644
--- a/src/mapi/es1api/.gitignore
+++ b/src/mapi/es1api/.gitignore
@@ -1,2 +1 @@
 glapi_mapi_tmp.h
-Makefile
diff --git a/src/mapi/es2api/.gitignore b/src/mapi/es2api/.gitignore
index 39b0e7ce680..dfe465677c4 100644
--- a/src/mapi/es2api/.gitignore
+++ b/src/mapi/es2api/.gitignore
@@ -1,2 +1 @@
 glapi_mapi_tmp.h
-Makefile
diff --git a/src/mapi/glapi/.gitignore b/src/mapi/glapi/.gitignore
index 25d3dfdcf8f..ecae56a3f3f 100644
--- a/src/mapi/glapi/.gitignore
+++ b/src/mapi/glapi/.gitignore
@@ -7,4 +7,3 @@ glapi_x86.S
 glapitable.h
 glapitemp.h
 glprocs.h
-\Makefile
diff --git a/src/mapi/glapi/gen/.gitignore b/src/mapi/glapi/gen/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/mapi/glapi/gen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/mapi/glapi/tests/.gitignore b/src/mapi/glapi/tests/.gitignore
index 6e92e45d817..0f373508d8f 100644
--- a/src/mapi/glapi/tests/.gitignore
+++ b/src/mapi/glapi/tests/.gitignore
@@ -1,2 +1 @@
-/Makefile
 /glapi-test
diff --git a/src/mapi/shared-glapi/.gitignore b/src/mapi/shared-glapi/.gitignore
index 39b0e7ce680..dfe465677c4 100644
--- a/src/mapi/shared-glapi/.gitignore
+++ b/src/mapi/shared-glapi/.gitignore
@@ -1,2 +1 @@
 glapi_mapi_tmp.h
-Makefile
diff --git a/src/mapi/shared-glapi/tests/.gitignore b/src/mapi/shared-glapi/tests/.gitignore
index b525d7d10ad..3defc40dbfb 100644
--- a/src/mapi/shared-glapi/tests/.gitignore
+++ b/src/mapi/shared-glapi/tests/.gitignore
@@ -1,3 +1,2 @@
-/Makefile
 /glapi-test
 /shared-glapi-test
diff --git a/src/mapi/vgapi/.gitignore b/src/mapi/vgapi/.gitignore
index feff21d7d7f..5becb993861 100644
--- a/src/mapi/vgapi/.gitignore
+++ b/src/mapi/vgapi/.gitignore
@@ -1,2 +1 @@
 vgapi_tmp.h
-Makefile
diff --git a/src/mesa/.gitignore b/src/mesa/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/mesa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/mesa/drivers/.gitignore b/src/mesa/drivers/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/mesa/drivers/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/mesa/drivers/dri/.gitignore b/src/mesa/drivers/dri/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/mesa/drivers/dri/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/mesa/drivers/dri/i915/.gitignore b/src/mesa/drivers/dri/i915/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/mesa/drivers/dri/i915/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/mesa/drivers/dri/i965/.gitignore b/src/mesa/drivers/dri/i965/.gitignore
index 82082952830..07ca7f1a87e 100644
--- a/src/mesa/drivers/dri/i965/.gitignore
+++ b/src/mesa/drivers/dri/i965/.gitignore
@@ -1,5 +1,3 @@
-Makefile
 i965_symbols_test
-libi965_dri.la
 test_eu_compact
 test_vec4_register_coalesce
diff --git a/src/mesa/drivers/dri/nouveau/.gitignore b/src/mesa/drivers/dri/nouveau/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/mesa/drivers/dri/nouveau/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/mesa/drivers/dri/r200/.gitignore b/src/mesa/drivers/dri/r200/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/mesa/drivers/dri/r200/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/mesa/drivers/dri/radeon/.gitignore b/src/mesa/drivers/dri/radeon/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/mesa/drivers/dri/radeon/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/mesa/drivers/dri/swrast/.gitignore b/src/mesa/drivers/dri/swrast/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/src/mesa/drivers/dri/swrast/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/mesa/drivers/osmesa/.gitignore b/src/mesa/drivers/osmesa/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/mesa/drivers/osmesa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/mesa/drivers/x11/.gitignore b/src/mesa/drivers/x11/.gitignore
deleted file mode 100644
index 5fc607b9e2f..00000000000
--- a/src/mesa/drivers/x11/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/src/mesa/libdricore/.gitignore b/src/mesa/libdricore/.gitignore
deleted file mode 100644
index 282522db034..00000000000
--- a/src/mesa/libdricore/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/mesa/main/tests/.gitignore b/src/mesa/main/tests/.gitignore
index efd1896b73c..6f58215b977 100644
--- a/src/mesa/main/tests/.gitignore
+++ b/src/mesa/main/tests/.gitignore
@@ -1,2 +1 @@
-/Makefile
 /main-test
diff --git a/src/mesa/main/tests/hash_table/.gitignore b/src/mesa/main/tests/hash_table/.gitignore
index 3123ac5e139..1b9aaf4a27e 100644
--- a/src/mesa/main/tests/hash_table/.gitignore
+++ b/src/mesa/main/tests/hash_table/.gitignore
@@ -1,4 +1,3 @@
-Makefile
 collision
 delete_and_lookup
 delete_management
diff --git a/src/mesa/program/.gitignore b/src/mesa/program/.gitignore
index bc48ef673ed..4c20872e14a 100644
--- a/src/mesa/program/.gitignore
+++ b/src/mesa/program/.gitignore
@@ -1,4 +1,3 @@
-/Makefile
 program_parse.output
 lex.yy.c
 program_parse.tab.c
diff --git a/src/mesa/x86-64/.gitignore b/src/mesa/x86-64/.gitignore
index ba7486c0b1a..ca3130d9fe2 100644
--- a/src/mesa/x86-64/.gitignore
+++ b/src/mesa/x86-64/.gitignore
@@ -1,3 +1,2 @@
-Makefile
 gen_matypes
 matypes.h
diff --git a/src/mesa/x86/.gitignore b/src/mesa/x86/.gitignore
index ba7486c0b1a..ca3130d9fe2 100644
--- a/src/mesa/x86/.gitignore
+++ b/src/mesa/x86/.gitignore
@@ -1,3 +1,2 @@
-Makefile
 gen_matypes
 matypes.h