Add .deps/, .libs/, and *.la to toplevel .gitignore

To avoid redundancies, this patch also removes .deps, .libs, and *.la
from .gitignore files in subdirectories.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/.gitignore b/.gitignore
index a4394b6da655ff4f77d8a9cc8936207add7b324c..80c4435e30aef384224606d66e0518d294cc4da7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.dll
 *.exe
 *.ilk
+*.la
 *.lo
 *.o
 *.obj
@@ -36,3 +37,5 @@ build
 libtool
 manifest.txt
 .dir-locals.el
+.deps/
+.libs/

diff --git a/src/egl/main/.gitignore b/src/egl/main/.gitignore
index 4d0c7d524f74cb9f22d338f034ba9926faeb0fe9..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/egl/main/.gitignore
+++ b/src/egl/main/.gitignore
@@ -1,5 +1,2 @@
-.deps
-.libs
 Makefile
 Makefile.in
-libEGL.la

diff --git a/src/egl/wayland/.gitignore b/src/egl/wayland/.gitignore
index 407633a1c1df3b0c7ba8b926cdbbf726a42b9125..4cfa463ff64acf12177b6662fcd1465d9e647307 100644 (file)
--- a/src/egl/wayland/.gitignore
+++ b/src/egl/wayland/.gitignore
@@ -1,9 +1,5 @@
-.deps/
-.libs/
 Makefile
 Makefile.in
-libwayland-egl.la
-libwayland-drm.la
 wayland-drm-client-protocol.h
 wayland-drm-server-protocol.h
 wayland-drm-protocol.c

diff --git a/src/gallium/drivers/.gitignore b/src/gallium/drivers/.gitignore
index a963aad2d318ca9ccdae849656f97d4af9a07800..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/gallium/drivers/.gitignore
+++ b/src/gallium/drivers/.gitignore
@@ -1,3 +1,2 @@
 Makefile
 Makefile.in
-.deps/

diff --git a/src/gallium/drivers/r300/.gitignore b/src/gallium/drivers/r300/.gitignore
index e119a078a10e180a4bdaacff17a1314a67a2e1fe..19da1a48eca48515bc3a5d1a9e403485629b8266 100644 (file)
--- a/src/gallium/drivers/r300/.gitignore
+++ b/src/gallium/drivers/r300/.gitignore
@@ -1,5 +1,3 @@
 Makefile
 Makefile.in
 r300_compiler_tests
-.libs/
-.deps/

diff --git a/src/gbm/.gitignore b/src/gbm/.gitignore
index 5c20805c5645eea9a7a88c3ac278445bd4d64afb..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/gbm/.gitignore
+++ b/src/gbm/.gitignore
@@ -1,6 +1,2 @@
-.deps/
-.libs/
 Makefile
 Makefile.in
-libgbm.la
-libgbm_dri.la

diff --git a/src/glsl/glcpp/.gitignore b/src/glsl/glcpp/.gitignore
index fb0be2065b478f120814197645f3fe383efa9836..41b34bb30ea8d9244c55113b6530f50dbfd993e8 100644 (file)
--- a/src/glsl/glcpp/.gitignore
+++ b/src/glsl/glcpp/.gitignore
@@ -5,7 +5,5 @@ glcpp-parse.c
 glcpp-parse.h
 *.o
 *.lo
-*.la
-.libs
 *~
 tests/*.out

diff --git a/src/glx/.gitignore b/src/glx/.gitignore
index ea7b6113565b4a470f7aab643b71ab2b602248ee..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/glx/.gitignore
+++ b/src/glx/.gitignore
@@ -1,5 +1,2 @@
-.deps
-.libs
 Makefile
 Makefile.in
-libGL.la

diff --git a/src/mesa/drivers/dri/common/.gitignore b/src/mesa/drivers/dri/common/.gitignore
deleted file mode 100644 (file)
index 8fc92f8..0000000
--- a/src/mesa/drivers/dri/common/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-.libs
-libdricommon.la

diff --git a/src/mesa/drivers/dri/i915/.gitignore b/src/mesa/drivers/dri/i915/.gitignore
index 1c73565035bb51a1667faf4b647680b97ca457d7..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/mesa/drivers/dri/i915/.gitignore
+++ b/src/mesa/drivers/dri/i915/.gitignore
@@ -1,5 +1,2 @@
-.deps
-.libs
 Makefile
 Makefile.in
-i915_dri.la

diff --git a/src/mesa/drivers/dri/i965/.gitignore b/src/mesa/drivers/dri/i965/.gitignore
index 15575710fdbd345c25562e28b34166abe9a9a98d..5b1108e5970807da3bbc1cf6576fefc83ecc39e3 100644 (file)
--- a/src/mesa/drivers/dri/i965/.gitignore
+++ b/src/mesa/drivers/dri/i965/.gitignore
@@ -1,6 +1,3 @@
-.deps
-.libs
 Makefile
 Makefile.in
-i965_dri.la
 i965_symbols_test

diff --git a/src/mesa/drivers/dri/nouveau/.gitignore b/src/mesa/drivers/dri/nouveau/.gitignore
index 109172494178e5f596c6041adccdc5ae451246dd..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/.gitignore
+++ b/src/mesa/drivers/dri/nouveau/.gitignore
@@ -1,5 +1,2 @@
-.deps
-.libs
 Makefile
 Makefile.in
-nouveau_vieux_dri.la

diff --git a/src/mesa/drivers/dri/r200/.gitignore b/src/mesa/drivers/dri/r200/.gitignore
index 5112c58dccb49c3a77c7093bf72767c1534425ac..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/mesa/drivers/dri/r200/.gitignore
+++ b/src/mesa/drivers/dri/r200/.gitignore
@@ -1,5 +1,2 @@
-.deps
-.libs
 Makefile
 Makefile.in
-r200_dri.la

diff --git a/src/mesa/drivers/dri/radeon/.gitignore b/src/mesa/drivers/dri/radeon/.gitignore
index 2592dc3b57ce2ffa78b0754298e9ac607d2d4c63..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/mesa/drivers/dri/radeon/.gitignore
+++ b/src/mesa/drivers/dri/radeon/.gitignore
@@ -1,5 +1,2 @@
-.deps
-.libs
 Makefile
 Makefile.in
-radeon_dri.la

diff --git a/src/mesa/drivers/dri/swrast/.gitignore b/src/mesa/drivers/dri/swrast/.gitignore
index 7166302b0cfc2f71fe73b91ec60f6c232a9e8efa..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/src/mesa/drivers/dri/swrast/.gitignore
+++ b/src/mesa/drivers/dri/swrast/.gitignore
@@ -1,5 +1,2 @@
-.deps
-.libs
 Makefile
 Makefile.in
-swrast_dri.la

diff --git a/tests/.gitignore b/tests/.gitignore
index a963aad2d318ca9ccdae849656f97d4af9a07800..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,3 +1,2 @@
 Makefile
 Makefile.in
-.deps/