summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kondrashov <spbnick@gmail.com>2010-11-08 19:38:40 +0300
committerKristian Høgsberg <krh@bitplanet.net>2010-11-11 20:11:27 -0500
commit7637ff0839488ae4fe7be569e0e0f9ce8e77b5bf (patch)
treeaa6b57740b988ae65bdb9278fab59d783da04864
parentb97b28c339a94223119e122ab899f500d7a4bd9e (diff)
Clean up .gitignore files
Sort the contents and update .gitignore files to hide generated files from git status output. Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
-rw-r--r--.gitignore32
-rw-r--r--clients/.gitignore8
-rw-r--r--compositor/.gitignore3
-rw-r--r--m4/.gitignore5
-rw-r--r--wayland/.gitignore4
5 files changed, 42 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 435df939..7c5bfe5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,28 @@
*.deps
+*.jpg
+*.la
+*.lo
*.o
-*.so
*.pc
-*.jpg
+*.so
+*.swp
*~
-aclocal.m4
-autom4te.cache/
-config.log
-config.status
-configure
-config.mk
+.libs
+/aclocal.m4
+/autom4te.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.mk
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/stamp-h1
+Makefile
+Makefile.in
diff --git a/clients/.gitignore b/clients/.gitignore
index 14a78c6b..24013584 100644
--- a/clients/.gitignore
+++ b/clients/.gitignore
@@ -1,6 +1,10 @@
-gears
+dnd
flower
+gears
+image
+screenshooter-client-protocol.h
+screenshooter-protocol.c
screenshot
+smoke
terminal
-image
view
diff --git a/compositor/.gitignore b/compositor/.gitignore
new file mode 100644
index 00000000..dc926c13
--- /dev/null
+++ b/compositor/.gitignore
@@ -0,0 +1,3 @@
+compositor
+screenshooter-protocol.c
+screenshooter-server-protocol.h
diff --git a/m4/.gitignore b/m4/.gitignore
index e69de29b..38066ddf 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -0,0 +1,5 @@
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
diff --git a/wayland/.gitignore b/wayland/.gitignore
new file mode 100644
index 00000000..0d28ba58
--- /dev/null
+++ b/wayland/.gitignore
@@ -0,0 +1,4 @@
+scanner
+wayland-client-protocol.h
+wayland-protocol.c
+wayland-server-protocol.h