[cogl/cogl-1.18] Consistently name cogl-gst pkg-config files
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.18] Consistently name cogl-gst pkg-config files
- Date: Thu, 9 Jan 2014 16:08:41 +0000 (UTC)
commit c2130e95560fbf53e75bd1e6c435c41a6af61a99
Author: Robert Bragg <robert linux intel com>
Date: Fri Nov 29 16:49:08 2013 +0000
Consistently name cogl-gst pkg-config files
This makes sure we install a cogl-gst-1.0.pc and
cogl-gst-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-gst/Makefile.am | 4 ++--
cogl-gst/cogl-gst-1.0.pc.in | 13 +++++++++++++
cogl-gst/cogl-gst-2.0-experimental.pc.in | 13 +++++++++++++
configure.ac | 3 ++-
4 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/cogl-gst/Makefile.am b/cogl-gst/Makefile.am
index 621158a..49c68ad 100644
--- a/cogl-gst/Makefile.am
+++ b/cogl-gst/Makefile.am
@@ -60,8 +60,8 @@ libgstcogl_la_LDFLAGS = \
-avoid-version -no-undefined \
$(NULL)
-
-pc_files = cogl-gst.pc
+pc_files = cogl-gst-1.0.pc \
+ cogl-gst-2.0-experimental.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pc_files)
diff --git a/cogl-gst/cogl-gst-1.0.pc.in b/cogl-gst/cogl-gst-1.0.pc.in
new file mode 100644
index 0000000..b3189ca
--- /dev/null
+++ b/cogl-gst/cogl-gst-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: A GStreamer integration library for Cogl
+Version: @COGL_1_VERSION@
+Libs: -L${libdir} -lcogl-gst
+Cflags: -I${includedir}/cogl
+Requires: ${requires}
diff --git a/cogl-gst/cogl-gst-2.0-experimental.pc.in b/cogl-gst/cogl-gst-2.0-experimental.pc.in
new file mode 100644
index 0000000..b3189ca
--- /dev/null
+++ b/cogl-gst/cogl-gst-2.0-experimental.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: A GStreamer integration library for Cogl
+Version: @COGL_1_VERSION@
+Libs: -L${libdir} -lcogl-gst
+Cflags: -I${includedir}/cogl
+Requires: ${requires}
diff --git a/configure.ac b/configure.ac
index b715235..c570436 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1473,7 +1473,8 @@ cogl-path/Makefile
cogl-path/cogl-path-1.0.pc
cogl-path/cogl-path-2.0-experimental.pc
cogl-gst/Makefile
-cogl-gst/cogl-gst.pc
+cogl-gst/cogl-gst-1.0.pc
+cogl-gst/cogl-gst-2.0-experimental.pc
cogl-gles2/Makefile
cogl-gles2/cogl-gles2-1.0.pc
cogl-gles2/cogl-gles2-2.0-experimental.pc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]