From b41ab3b42c989926389e599d5794412a628f277f Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Thu, 15 Mar 2012 16:43:53 -0700 Subject: 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 --- .gitignore | 3 +++ src/egl/main/.gitignore | 3 --- src/egl/wayland/.gitignore | 4 ---- src/gallium/drivers/.gitignore | 1 - src/gallium/drivers/r300/.gitignore | 2 -- src/gbm/.gitignore | 4 ---- src/glsl/glcpp/.gitignore | 2 -- src/glx/.gitignore | 3 --- src/mesa/drivers/dri/common/.gitignore | 3 --- src/mesa/drivers/dri/i915/.gitignore | 3 --- src/mesa/drivers/dri/i965/.gitignore | 3 --- src/mesa/drivers/dri/nouveau/.gitignore | 3 --- src/mesa/drivers/dri/r200/.gitignore | 3 --- src/mesa/drivers/dri/radeon/.gitignore | 3 --- src/mesa/drivers/dri/swrast/.gitignore | 3 --- tests/.gitignore | 1 - 16 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 src/mesa/drivers/dri/common/.gitignore diff --git a/.gitignore b/.gitignore index a4394b6..80c4435 100644 --- 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 4d0c7d5..282522d 100644 --- 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 407633a..4cfa463 100644 --- 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 a963aad..282522d 100644 --- 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 e119a07..19da1a4 100644 --- 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 5c20805..282522d 100644 --- 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 fb0be20..41b34bb 100644 --- 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 ea7b611..282522d 100644 --- 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 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 1c73565..282522d 100644 --- 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 1557571..5b1108e 100644 --- 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 1091724..282522d 100644 --- 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 5112c58..282522d 100644 --- 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 2592dc3..282522d 100644 --- 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 7166302..282522d 100644 --- 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 a963aad..282522d 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,3 +1,2 @@ Makefile Makefile.in -.deps/ -- cgit v1.1