From: Neil Roberts <neil@linux.intel.com>
Date: Wed, 23 Jun 2010 16:29:08 +0000 (+0100)
Subject: cogl: Remove cogl-defines.h.in from the driver make files
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d17ea2c021a9ba19580c013743224d2d40ac1f76;p=profile%2Fivi%2Fclutter.git

cogl: Remove cogl-defines.h.in from the driver make files

Commit 7fae8ac051292 changed cogl-defines.h.in so there is only a
single copy in clutter/cogl/ instead of one for each driver. However
the old files were still mentioned in the EXTRA_DIST of the
Makefile.am so make distcheck was failing.
---

diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am
index 32f6afd..31baa21 100644
--- a/clutter/cogl/cogl/Makefile.am
+++ b/clutter/cogl/cogl/Makefile.am
@@ -49,6 +49,8 @@ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 BUILT_SOURCES += cogl-defines.h
 DISTCLEANFILES += cogl-defines.h
 
+EXTRA_DIST += cogl-defines.h.in
+
 # public headers
 cogl_public_h = \
 	$(srcdir)/cogl-object.h 		\
diff --git a/clutter/cogl/cogl/driver/gl/Makefile.am b/clutter/cogl/cogl/driver/gl/Makefile.am
index 510a5dd..72e5bf5 100644
--- a/clutter/cogl/cogl/driver/gl/Makefile.am
+++ b/clutter/cogl/cogl/driver/gl/Makefile.am
@@ -32,5 +32,5 @@ libclutter_cogl_driver_la_SOURCES = \
 	cogl-feature-functions.h \
 	$(NULL)
 
-EXTRA_DIST = cogl-defines.h.in
+
 
diff --git a/clutter/cogl/cogl/driver/gles/Makefile.am b/clutter/cogl/cogl/driver/gles/Makefile.am
index 7fe0c71..932a37d 100644
--- a/clutter/cogl/cogl/driver/gles/Makefile.am
+++ b/clutter/cogl/cogl/driver/gles/Makefile.am
@@ -42,7 +42,6 @@ libclutter_cogl_driver_la_SOURCES += \
 endif
 
 EXTRA_DIST = \
-	cogl-defines.h.in \
 	stringify.sh \
 	cogl-fixed-vertex-shader.glsl \
 	cogl-fixed-fragment-shader.glsl