From d17ea2c021a9ba19580c013743224d2d40ac1f76 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Wed, 23 Jun 2010 17:29:08 +0100 Subject: [PATCH] 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. --- clutter/cogl/cogl/Makefile.am | 2 ++ clutter/cogl/cogl/driver/gl/Makefile.am | 2 +- clutter/cogl/cogl/driver/gles/Makefile.am | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am index 32f6afd0e..31baa21d6 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 510a5ddb2..72e5bf5d0 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 7fe0c713e..932a37df3 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