From f1b7b41b8dbcbd260ba8df045a0c2cd36fc04671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Fri, 6 May 2016 14:26:11 +0800
Subject: [PATCH] Update .gitignore

The cogl/clutter merge made the .gitignore files in the respective
directories incorrect, due to the using absolute paths.

https://bugzilla.gnome.org/show_bug.cgi?id=768976
---
 .gitignore         |  2 ++
 clutter/.gitignore | 18 ++++++++----------
 cogl/.gitignore    | 34 +++++++++-------------------------
 3 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab5e2ac02..043127afe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,8 @@ mutter-wayland.desktop
 stamp-h1
 *.gmo
 *.make
+*.log
+*.trs
 *~
 stamp-it
 .intltool-merge-cache
diff --git a/clutter/.gitignore b/clutter/.gitignore
index 7cfe18cc2..9bcbf4501 100644
--- a/clutter/.gitignore
+++ b/clutter/.gitignore
@@ -18,17 +18,15 @@ stamp-enum-types
 stamp-marshal
 tags
 /ChangeLog*
-/clutter/clutter-config.h
-/clutter/clutter-enum-types.[ch]
-/clutter/clutter-marshal.[ch]
-/clutter/clutter-version.h
-/clutter/gcov-report.txt
-/clutter/clutter-json.h
-/clutter/*.log
-/clutter/*.trs
-/clutter-lcov.info
-/clutter-lcov
 clutter-build-config.h
+clutter-config.h
+clutter-enum-types.[ch]
+clutter-marshal.[ch]
+clutter-version.h
+gcov-report.txt
+clutter-json.h
+clutter-lcov.info
+clutter-lcov
 !/build/autotools/introspection.m4
 !/build/autotools/as-linguas.m4
 !/build/autotools/as-compiler-flag.m4
diff --git a/cogl/.gitignore b/cogl/.gitignore
index 3fbebd82c..288080850 100644
--- a/cogl/.gitignore
+++ b/cogl/.gitignore
@@ -29,17 +29,15 @@ stamp-marshal
 /build/config.sub
 *.gir
 *.typelib
-/cogl-pango/cogl-pango.rc
-/cogl/cogl.rc
-/cogl/cogl-defines.h
-/cogl/cogl-defines.h.win32
-/cogl/cogl-defines.h.win32_SDL
-/cogl/cogl-egl-defines.h
-/cogl/cogl-enum-types.c
-/cogl/cogl-enum-types.h
-/cogl/cogl-gl-header.h
-/cogl-path/cogl-path-enum-types.c
-/cogl-path/cogl-path-enum-types.h
+cogl-pango.rc
+cogl.rc
+cogl-defines.h
+cogl-egl-defines.h
+cogl-enum-types.c
+cogl-enum-types.h
+cogl-gl-header.h
+cogl-path-enum-types.c
+cogl-path-enum-types.h
 cogl-config.h
 cogl-config.h.in
 config.log
@@ -52,20 +50,6 @@ depcomp
 /doc/reference/cogl/cogl-docs.xml
 /doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml
 /doc/reference/cogl-gst/cogl-gst-docs.xml
-/examples/cogl-basic-video-player
-/examples/cogl-crate
-/examples/cogl-gles2-context
-/examples/cogl-gles2-gears
-/examples/cogl-hello
-/examples/cogl-info
-/examples/cogl-msaa
-/examples/cogl-point-sprites
-/examples/cogl-sdl-hello
-/examples/cogl-sdl2-hello
-/examples/cogl-stereo
-/examples/cogl-x11-foreign
-/examples/cogl-x11-tfp
-/examples/cogland
 gtk-doc.make
 install-sh
 libtool