[cogl/wip/cogl-1.7.0: 9/12] Fixes for make distcheck

[Robert Bragg <rbragg src gnome org>]

commit bc8f3e8030d64f21d05b3d1b35a87883fc651765
Author: Robert Bragg <robert linux intel com>
Date:   Mon Jun 13 12:42:25 2011 +0100

    Fixes for make distcheck

 cogl/Makefile.am    |    4 +++-
 cogl/cogl-context.c |    2 +-
 configure.ac        |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 2e501d9..714dc13 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -51,7 +51,7 @@ cogl-gl-1.0.pc: cogl-1.0.pc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)
 
-EXTRA_DIST += cogl.pc.in
+EXTRA_DIST += cogl-1.0.pc.in cogl-$(COGL_API_VERSION)-experimental.pc.in
 DISTCLEANFILES += $(pc_files)
 
 # public headers
@@ -234,6 +234,7 @@ cogl_sources_c = \
 	$(srcdir)/cogl-matrix.c				\
 	$(srcdir)/cogl-vector.c				\
 	$(srcdir)/cogl-euler.c				\
+	$(srcdir)/cogl-quaternion-private.h 		\
 	$(srcdir)/cogl-quaternion.c			\
 	$(srcdir)/cogl-matrix-private.h			\
 	$(srcdir)/cogl-matrix-stack.c			\
@@ -303,6 +304,7 @@ cogl_sources_c = \
 	$(srcdir)/cogl-point-in-poly-private.h       	\
 	$(srcdir)/cogl-point-in-poly.c       		\
 	$(srcdir)/cogl-clutter.c       			\
+	$(srcdir)/winsys/cogl-winsys-stub-private.h	\
 	$(srcdir)/winsys/cogl-winsys-stub.c		\
 	$(NULL)
 
diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c
index bb8e5b1..ca24d00 100644
--- a/cogl/cogl-context.c
+++ b/cogl/cogl-context.c
@@ -30,7 +30,7 @@
 #include "cogl-internal.h"
 #include "cogl-private.h"
 #include "cogl-winsys-private.h"
-#include "cogl-winsys-stub-private.h"
+#include "winsys/cogl-winsys-stub-private.h"
 #include "cogl-profile.h"
 #include "cogl-util.h"
 #include "cogl-context-private.h"
diff --git a/configure.ac b/configure.ac
index af9fdc6..b469f2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ m4_define([xfixes_req_version],         [3])
 m4_define([xcomposite_req_version],     [0.4])
 
 
-AC_INIT(cogl, [cogl_version])
+AC_INIT(cogl, [cogl_1_version])
 AC_CONFIG_SRCDIR(cogl/cogl.h)
 AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build/autotools])