* clutter/cogl/gles/Makefile.am (libclutterinclude_HEADERS):

	* clutter/cogl/gl/Makefile.am (libclutterinclude_HEADERS):
	* clutter/cogl/common/Makefile.am
	(libclutter_cogl_common_la_SOURCES): Move cogl-mesh.h into the
	headers for libclutter so that it will get installed.

diff --git a/ChangeLog b/ChangeLog
index 5b29855..0877734 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-11-12  Neil Roberts  <neil@linux.intel.com>
 
+       * clutter/cogl/gles/Makefile.am (libclutterinclude_HEADERS):
+       * clutter/cogl/gl/Makefile.am (libclutterinclude_HEADERS):
+       * clutter/cogl/common/Makefile.am
+       (libclutter_cogl_common_la_SOURCES): Move cogl-mesh.h into the
+       headers for libclutter so that it will get installed.
+
+2008-11-12  Neil Roberts  <neil@linux.intel.com>
+
        Fix warnings in mesh tests
 
        * tests/conform/test-mesh-mutability.c (on_paint):

diff --git a/clutter/cogl/common/Makefile.am b/clutter/cogl/common/Makefile.am
index 446d994..db0f0b4 100644 (file)
--- a/clutter/cogl/common/Makefile.am
+++ b/clutter/cogl/common/Makefile.am
@@ -29,5 +29,4 @@ libclutter_cogl_common_la_SOURCES =   \
        cogl-clip-stack.c               \
         cogl-fixed.c                    \
         cogl-color.c                   \
-       cogl-mesh.c                     \
-       cogl-mesh.h
+       cogl-mesh.c

diff --git a/clutter/cogl/gl/Makefile.am b/clutter/cogl/gl/Makefile.am
index 628cff5..ec7750f 100644 (file)
--- a/clutter/cogl/gl/Makefile.am
+++ b/clutter/cogl/gl/Makefile.am
@@ -8,7 +8,8 @@ libclutterinclude_HEADERS = \
         $(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 \
+        $(top_builddir)/clutter/cogl/cogl-mesh.h
 
 INCLUDES = \
        -I$(top_srcdir) \

diff --git a/clutter/cogl/gles/Makefile.am b/clutter/cogl/gles/Makefile.am
index 207bd46..19867d9 100644 (file)
--- a/clutter/cogl/gles/Makefile.am
+++ b/clutter/cogl/gles/Makefile.am
@@ -8,7 +8,8 @@ libclutterinclude_HEADERS = \
         $(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 \
+        $(top_builddir)/clutter/cogl/cogl-mesh.h
 
 INCLUDES = \
        -I$(top_srcdir) \