From 2f542b570b490952909cffe930e6f575f2b4caf2 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Fri, 29 Nov 2013 16:42:24 +0000
Subject: [PATCH] consistently name cogl-gles2 pkg-config files

This makes sure we install a cogl-gles2-1.0.pc and
cogl-gles2-2.0-experimental.pc file consistent with other sub-libraries
such that cogl-1.x packages can be parallel installed with cogl master.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
---
 cogl-gles2/Makefile.am                              |  5 ++++-
 cogl-gles2/cogl-gles2-1.0.pc.in                     | 13 +++++++++++++
 ...ntal.pc.in => cogl-gles2-2.0-experimental.pc.in} |  2 +-
 configure.ac                                        |  3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 cogl-gles2/cogl-gles2-1.0.pc.in
 rename cogl-gles2/{cogl-gles2-experimental.pc.in => cogl-gles2-2.0-experimental.pc.in} (88%)

diff --git a/cogl-gles2/Makefile.am b/cogl-gles2/Makefile.am
index 2c78f2798..72ec1eae4 100644
--- a/cogl-gles2/Makefile.am
+++ b/cogl-gles2/Makefile.am
@@ -29,5 +29,8 @@ coglgles2include_HEADERS = \
 	GLES2/gl2ext.h \
 	GLES2/gl2platform.h
 
+pc_files = cogl-gles2-1.0.pc \
+	   cogl-gles2-2.0-experimental.pc
+
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = cogl-gles2-experimental.pc
+pkgconfig_DATA = $(pc_files)
diff --git a/cogl-gles2/cogl-gles2-1.0.pc.in b/cogl-gles2/cogl-gles2-1.0.pc.in
new file mode 100644
index 000000000..698d05c51
--- /dev/null
+++ b/cogl-gles2/cogl-gles2-1.0.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+apiversion=1.0
+requires=@COGL_PKG_REQUIRES@ cogl-1.0
+
+Name: Cogl
+Description: An object oriented GL/GLES Abstraction/Utility Layer
+Version: @COGL_1_VERSION@
+Libs: -L${libdir} -lcogl-gles2
+Cflags: -I${includedir}/cogl
+Requires: ${requires}
diff --git a/cogl-gles2/cogl-gles2-experimental.pc.in b/cogl-gles2/cogl-gles2-2.0-experimental.pc.in
similarity index 88%
rename from cogl-gles2/cogl-gles2-experimental.pc.in
rename to cogl-gles2/cogl-gles2-2.0-experimental.pc.in
index a1a1c9476..89af7df89 100644
--- a/cogl-gles2/cogl-gles2-experimental.pc.in
+++ b/cogl-gles2/cogl-gles2-2.0-experimental.pc.in
@@ -9,5 +9,5 @@ Name: CoglGLES2
 Description: Cogl OpenGL ES 2.0 frontend api
 Version: @COGL_VERSION@
 Libs: -L${libdir} -lcogl-gles2
-Cflags: -I${includedir}/cogl-gles2
+Cflags: -I${includedir}/cogl
 Requires: ${requires}
diff --git a/configure.ac b/configure.ac
index 10782d7bf..b7152356b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1475,7 +1475,8 @@ cogl-path/cogl-path-2.0-experimental.pc
 cogl-gst/Makefile
 cogl-gst/cogl-gst.pc
 cogl-gles2/Makefile
-cogl-gles2/cogl-gles2-experimental.pc
+cogl-gles2/cogl-gles2-1.0.pc
+cogl-gles2/cogl-gles2-2.0-experimental.pc
 doc/Makefile
 doc/reference/Makefile
 doc/reference/cogl/Makefile