From c2130e95560fbf53e75bd1e6c435c41a6af61a99 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 29 Nov 2013 16:49:08 +0000 Subject: [PATCH] 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 --- 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(-) create mode 100644 cogl-gst/cogl-gst-1.0.pc.in create mode 100644 cogl-gst/cogl-gst-2.0-experimental.pc.in diff --git a/cogl-gst/Makefile.am b/cogl-gst/Makefile.am index 621158ac8..49c68ad9a 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 000000000..b3189ca0d --- /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 000000000..b3189ca0d --- /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 b7152356b..c570436fa 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