From 9679cf9ba2c12c12bd33b70b8e84519b7c6f4a34 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 6 Feb 2014 15:43:19 -0500
Subject: [PATCH] Update .gitignore

---
 .gitignore         | 50 +++++++++++++++++++++++++++++++++++++++++++++-
 clients/.gitignore | 33 ------------------------------
 src/.gitignore     |  5 -----
 3 files changed, 49 insertions(+), 39 deletions(-)
 delete mode 100644 clients/.gitignore
 delete mode 100644 src/.gitignore

diff --git a/.gitignore b/.gitignore
index 616a1a8b..e0a73c03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,52 @@ Makefile
 Makefile.in
 TAGS
 protocol/.*.valid
-protocol/src/
+protocol/*.[ch]
+
+weston-calibrator
+weston-clickdot
+weston-cliptest
+weston-dnd
+weston-editor
+weston-eventdemo
+weston-flower
+weston-fullscreen
+weston-gears
+weston-image
+weston-nested
+weston-nested-client
+weston-resizor
+weston-scaler
+weston-simple-egl
+weston-simple-shm
+weston-simple-touch
+weston-smoke
+weston-stacking
+weston-subsurfaces
+weston-transformed
+weston-view
+
+weston-keyboard
+libtoytoolkit.a
+weston-desktop-shell
+weston-info
+weston-screensaver
+weston-screenshooter
+weston-tablet-shell
+weston-terminal
+weston-multi-resource
+weston-simple-im
+git-version.h
+version.h
+weston
+weston-launch
+spring-tool
+
+*.weston
+*.test
+wcap-decode
+matrix-test
+setbacklight
+weston.1
+weston-drm.7
+weston.ini.5
diff --git a/clients/.gitignore b/clients/.gitignore
deleted file mode 100644
index 1c685c7f..00000000
--- a/clients/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-weston-calibrator
-weston-clickdot
-weston-cliptest
-weston-dnd
-weston-editor
-weston-eventdemo
-weston-flower
-weston-fullscreen
-weston-gears
-weston-image
-weston-nested
-weston-nested-client
-weston-resizor
-weston-scaler
-weston-simple-egl
-weston-simple-shm
-weston-simple-touch
-weston-smoke
-weston-stacking
-weston-subsurfaces
-weston-transformed
-weston-view
-
-weston-keyboard
-libtoytoolkit.a
-weston-desktop-shell
-weston-info
-weston-screensaver
-weston-screenshooter
-weston-tablet-shell
-weston-terminal
-weston-multi-resource
-weston-simple-im
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 886651d7..00000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-git-version.h
-version.h
-weston
-weston-launch
-spring-tool