From fb30f07866d7b48e036dd0333be32b9460e22273 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 29 Jan 2016 04:50:42 +1100 Subject: pkg-config: Don't generate and install pkg-config with relative paths Don't put relative paths in pkg-config files, including uninstalled ones. For those, use @abs_topbuilddir@ and @abs_topsrcdir@ as we do elsewhere. Remove libraries= directives, which doesn't seem to be a pkg-config variable that actually exists, but has been in all our pkg-config files for as long as they've existed. --- pkgconfig/gstreamer-bad-audio-uninstalled.pc.in | 13 +++++-------- pkgconfig/gstreamer-bad-audio.pc.in | 8 +++----- pkgconfig/gstreamer-bad-base-uninstalled.pc.in | 13 ++++++------- pkgconfig/gstreamer-bad-base.pc.in | 15 ++++++++------- pkgconfig/gstreamer-bad-video-uninstalled.pc.in | 17 ++++++++--------- pkgconfig/gstreamer-bad-video.pc.in | 17 +++++++++-------- pkgconfig/gstreamer-gl-uninstalled.pc.in | 15 +++++++-------- pkgconfig/gstreamer-gl.pc.in | 6 +++--- 8 files changed, 49 insertions(+), 55 deletions(-) (limited to 'pkgconfig') diff --git a/pkgconfig/gstreamer-bad-audio-uninstalled.pc.in b/pkgconfig/gstreamer-bad-audio-uninstalled.pc.in index 11c3ebbf1..4053f69e1 100644 --- a/pkgconfig/gstreamer-bad-audio-uninstalled.pc.in +++ b/pkgconfig/gstreamer-bad-audio-uninstalled.pc.in @@ -1,15 +1,12 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/audio -includedir=${pcfiledir}/../gst-libs -pluginsdir=${pcfiledir}/.. +libdir=@abs_top_builddir@/gst-libs/gst/audio +includedir=@abs_top_srcdir@/gst-libs Name: GStreamer bad audio library, uninstalled Description: Bad audio library for GStreamer, Not Installed Version: @VERSION@ -Requires: gstreamer-@GST_API_VERSION@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-bad-base-@GST_API_VERSION@ -Libs: -L${libdir} ${libdir}/libgstbadaudio-@GST_API_VERSION@.la @BADBASE_LIBS@ -Cflags: -I${includedir} -I@srcdir@/.. @BADBASE_CFLAGS@ - -libraries=badaudio +Libs: @abs_top_builddir@/gst-libs/gst/audio/libgstbadaudio-@GST_API_VERSION@.la +Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-bad-audio.pc.in b/pkgconfig/gstreamer-bad-audio.pc.in index e861649c6..be90d67da 100644 --- a/pkgconfig/gstreamer-bad-audio.pc.in +++ b/pkgconfig/gstreamer-bad-audio.pc.in @@ -7,9 +7,7 @@ pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@ Name: GStreamer bad audio library, uninstalled Description: Bad audio library for GStreamer elements, Not Installed Version: @VERSION@ -Requires: gstreamer-@GST_API_VERSION@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-bad-base-@GST_API_VERSION@ -Libs: -L${libdir} ${libdir}/libgstbadaudio-@GST_API_VERSION@.la @BADBASE_LIBS@ -Cflags: -I${includedir} -I@srcdir@/.. @BADBASE_CFLAGS@ - -libraries=badaudio +Libs: -L${libdir} ${libdir}/libgstbadaudio-@GST_API_VERSION@.la +Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-bad-base-uninstalled.pc.in b/pkgconfig/gstreamer-bad-base-uninstalled.pc.in index 560eb13bd..bec40f423 100644 --- a/pkgconfig/gstreamer-bad-base-uninstalled.pc.in +++ b/pkgconfig/gstreamer-bad-base-uninstalled.pc.in @@ -1,15 +1,14 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/base -includedir=${pcfiledir}/../gst-libs -pluginsdir=${pcfiledir}/.. +libdir= +includedir=@abs_top_builddir@/gst-libs +girdir=@abs_top_builddir@/gst-libs/gst/base +typelibdir=@abs_top_builddir@/gst-libs/gst/base Name: GStreamer bad base classes, uninstalled Description: Bad base classes for GStreamer elements, Not Installed Version: @VERSION@ Requires: gstreamer-@GST_API_VERSION@ -Libs: -L${libdir} ${libdir}/libgstbadbase-@GST_API_VERSION@.la @BADBASE_LIBS@ -Cflags: -I${includedir} -I@srcdir@/.. @BADBASE_CFLAGS@ - -libraries=badbase +Libs: @abs_top_builddir@/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la +Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-bad-base.pc.in b/pkgconfig/gstreamer-bad-base.pc.in index a03013b2b..10afe0ecd 100644 --- a/pkgconfig/gstreamer-bad-base.pc.in +++ b/pkgconfig/gstreamer-bad-base.pc.in @@ -2,14 +2,15 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/gstreamer-@GST_API_VERSION@ -pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@ +datarootdir=${prefix}/share +datadir=${datarootdir} +girdir=${datadir}/gir-1.0 +typelibdir=${libdir}/girepository-1.0 -Name: GStreamer bad base classes, uninstalled -Description: Bad base classes for GStreamer elements, Not Installed +Name: GStreamer bad base classes +Description: Bad base classes for GStreamer elements Version: @VERSION@ Requires: gstreamer-@GST_API_VERSION@ -Libs: -L${libdir} ${libdir}/libgstbadbase-@GST_API_VERSION@.la @BADBASE_LIBS@ -Cflags: -I${includedir} -I@srcdir@/.. @BADBASE_CFLAGS@ - -libraries=badbase +Libs: -L${libdir} ${libdir}/libgstbadbase-@GST_API_VERSION@.la +Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-bad-video-uninstalled.pc.in b/pkgconfig/gstreamer-bad-video-uninstalled.pc.in index 6a2a206e3..c2aa90702 100644 --- a/pkgconfig/gstreamer-bad-video-uninstalled.pc.in +++ b/pkgconfig/gstreamer-bad-video-uninstalled.pc.in @@ -1,15 +1,14 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/video -includedir=${pcfiledir}/../gst-libs -pluginsdir=${pcfiledir}/.. +libdir= +includedir=@abs_top_builddir@/gst-libs +girdir=@abs_top_builddir@/gst-libs/gst/video +typelibdir=@abs_top_builddir@/gst-libs/gst/video Name: GStreamer bad video library, uninstalled -Description: Bad video library for GStreamer, Not Installed +Description: Bad video library for GStreamer elements, Not Installed Version: @VERSION@ -Requires: gstreamer-@GST_API_VERSION@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-bad-base-@GST_API_VERSION@ -Libs: -L${libdir} ${libdir}/libgstbadvideo-@GST_API_VERSION@.la @BADBASE_LIBS@ -Cflags: -I${includedir} -I@srcdir@/.. @BADBASE_CFLAGS@ - -libraries=badvideo +Libs: @abs_top_builddir@/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la +Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-bad-video.pc.in b/pkgconfig/gstreamer-bad-video.pc.in index 4fdf88906..40127be8d 100644 --- a/pkgconfig/gstreamer-bad-video.pc.in +++ b/pkgconfig/gstreamer-bad-video.pc.in @@ -2,14 +2,15 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/gstreamer-@GST_API_VERSION@ -pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@ +datarootdir=${prefix}/share +datadir=${datarootdir} +girdir=${datadir}/gir-1.0 +typelibdir=${libdir}/girepository-1.0 -Name: GStreamer bad video library, uninstalled -Description: Bad video library for GStreamer elements, Not Installed +Name: GStreamer bad video library +Description: Bad video library for GStreamer elements Version: @VERSION@ -Requires: gstreamer-@GST_API_VERSION@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-bad-base-@GST_API_VERSION@ -Libs: -L${libdir} ${libdir}/libgstbadvideo-@GST_API_VERSION@.la @BADBASE_LIBS@ -Cflags: -I${includedir} -I@srcdir@/.. @BADBASE_CFLAGS@ - -libraries=badvideo +Libs: -L${libdir} ${libdir}/libgstbadvideo-@GST_API_VERSION@.la +Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-gl-uninstalled.pc.in b/pkgconfig/gstreamer-gl-uninstalled.pc.in index 76eefb970..5049f4e85 100644 --- a/pkgconfig/gstreamer-gl-uninstalled.pc.in +++ b/pkgconfig/gstreamer-gl-uninstalled.pc.in @@ -1,15 +1,14 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst/gl -includedir=${pcfiledir}/../gst-libs -pluginsdir=${pcfiledir}/.. +libdir= +includedir=@abs_top_builddir@/gst-libs +girdir=@abs_top_builddir@/gst-libs/gst/base +typelibdir=@abs_top_builddir@/gst-libs/gst/base Name: GStreamer OpenGL Plugins Libraries, Uninstalled Description: Streaming media framework, OpenGL plugins libraries, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_API_VERSION@ +Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ -Libs: -L${libdir} ${libdir}/libgstgl-@GST_API_VERSION@.la @GL_LIBS@ -Cflags: -I${includedir} -I@srcdir@/.. @GL_CFLAGS@ - -libraries=gl +Libs: @abs_top_builddir@/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la +Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in index 1b98762e1..5589e2a47 100644 --- a/pkgconfig/gstreamer-gl.pc.in +++ b/pkgconfig/gstreamer-gl.pc.in @@ -6,8 +6,8 @@ pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@ Name: GStreamer OpenGL Plugins Libraries Description: Streaming media framework, OpenGL plugins libraries -Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ @GL_LIBS@ -Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@ +Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ +Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ @GL_LIBS@ +Cflags: -I${includedir} @GL_CFLAGS@ -- cgit v1.2.1