From e3788338e4105051af7881c95492923e0fc8f0ac Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 3 Nov 2008 23:58:13 +0000 Subject: [PATCH] 2008-11-03 Emmanuele Bassi * clutter/cogl/gl/Makefile.am: Whitespace fixes. * clutter/cogl/gles/Makefile.am: Put back a missing backslash that broke the GLES build. --- ChangeLog | 7 +++++++ clutter/cogl/gl/Makefile.am | 1 - clutter/cogl/gles/Makefile.am | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d45d0c4..0a16b05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-11-03 Emmanuele Bassi + * clutter/cogl/gl/Makefile.am: Whitespace fixes. + + * clutter/cogl/gles/Makefile.am: Put back a missing backslash + that broke the GLES build. + +2008-11-03 Emmanuele Bassi + Bug 1231 - Build fails in gles flavour in revision 3442 * clutter/cogl/gles/cogl-context.h: Fix remaining use of diff --git a/clutter/cogl/gl/Makefile.am b/clutter/cogl/gl/Makefile.am index 64edb80..628cff5 100644 --- a/clutter/cogl/gl/Makefile.am +++ b/clutter/cogl/gl/Makefile.am @@ -10,7 +10,6 @@ libclutterinclude_HEADERS = \ $(top_builddir)/clutter/cogl/cogl-texture.h \ $(top_builddir)/clutter/cogl/cogl-types.h - INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/clutter \ diff --git a/clutter/cogl/gles/Makefile.am b/clutter/cogl/gles/Makefile.am index e0fc03d..207bd46 100644 --- a/clutter/cogl/gles/Makefile.am +++ b/clutter/cogl/gles/Makefile.am @@ -36,7 +36,7 @@ libclutter_cogl_la_SOURCES = \ $(top_builddir)/clutter/cogl/cogl-path.h \ $(top_builddir)/clutter/cogl/cogl-shader.h \ $(top_builddir)/clutter/cogl/cogl-texture.h \ - $(top_builddir)/clutter/cogl/cogl-types.h + $(top_builddir)/clutter/cogl/cogl-types.h \ cogl-internal.h \ cogl-texture-private.h \ cogl-fbo.h \ @@ -66,7 +66,7 @@ EXTRA_DIST = cogl-defines.h.in \ cogl-fixed-vertex-shader.glsl \ cogl-fixed-fragment-shader.glsl -libclutter_cogl_la_LIBADD = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la +libclutter_cogl_la_LIBADD = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la .glsl.h : /bin/sh $(top_srcdir)/clutter/cogl/gles/stringify.sh -h $< -- 2.7.4