mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
pkgconfig: add back support for builddir != srcdir case in uninstalled setup
Attempt to add back support for builddir != srcdir. Use absolute paths instead of relative paths based on pcfiledir this time to make things clearer - there's not really any need for uninstalled trees to be relocatable without re-running configure.
This commit is contained in:
parent
9b6f93dcf3
commit
b2383c78c3
6 changed files with 28 additions and 27 deletions
|
@ -1,13 +1,13 @@
|
||||||
# the standard variables don't make sense for an uninstalled copy
|
# the standard variables don't make sense for an uninstalled copy
|
||||||
prefix=
|
prefix=
|
||||||
exec_prefix=
|
exec_prefix=
|
||||||
libdir=${pcfiledir}/../libs/gst/base
|
libdir=
|
||||||
includedir=${pcfiledir}/..
|
includedir=
|
||||||
|
|
||||||
Name: GStreamer base classes, uninstalled
|
Name: GStreamer base classes, uninstalled
|
||||||
Description: Base classes for GStreamer elements, Not Installed
|
Description: Base classes for GStreamer elements, Not Installed
|
||||||
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
|
|
||||||
Libs: ${libdir}/libgstbase-@GST_MAJORMINOR@.la
|
Libs: @abs_top_builddir@/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la
|
||||||
Cflags: -I${includedir}
|
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# the standard variables don't make sense for an uninstalled copy
|
# the standard variables don't make sense for an uninstalled copy
|
||||||
prefix=
|
prefix=
|
||||||
exec_prefix=
|
exec_prefix=
|
||||||
libdir=${pcfiledir}/../libs/gst/check
|
libdir=
|
||||||
includedir=${pcfiledir}/..
|
includedir=
|
||||||
|
|
||||||
Name: GStreamer check unit testing, uninstalled
|
Name: GStreamer check unit testing, uninstalled
|
||||||
Description: Unit testing helper library for GStreamer modules, Not Installed
|
Description: Unit testing helper library for GStreamer modules, Not Installed
|
||||||
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
|
|
||||||
Libs: ${libdir}/libgstcheck-@GST_MAJORMINOR@.la -lm
|
Libs: @abs_top_builddir@/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la @LIBM@
|
||||||
Cflags: -I${includedir}
|
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# the standard variables don't make sense for an uninstalled copy
|
# the standard variables don't make sense for an uninstalled copy
|
||||||
prefix=
|
prefix=
|
||||||
exec_prefix=
|
exec_prefix=
|
||||||
libdir=${pcfiledir}/../libs/gst/controller
|
libdir=
|
||||||
includedir=${pcfiledir}/..
|
includedir=
|
||||||
|
|
||||||
Name: GStreamer controller, uninstalled
|
Name: GStreamer controller, uninstalled
|
||||||
Description: Dynamic parameter control for GStreamer elements, Not Installed
|
Description: Dynamic parameter control for GStreamer elements, Not Installed
|
||||||
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
|
|
||||||
Libs: ${libdir}/libgstcontroller-@GST_MAJORMINOR@.la
|
Libs: @abs_top_builddir@/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la
|
||||||
Cflags: -I${includedir}
|
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# the standard variables don't make sense for an uninstalled copy
|
# the standard variables don't make sense for an uninstalled copy
|
||||||
prefix=
|
prefix=
|
||||||
exec_prefix=
|
exec_prefix=
|
||||||
libdir=${pcfiledir}/../libs
|
libdir=
|
||||||
includedir=${pcfiledir}/..
|
includedir=
|
||||||
|
|
||||||
Name: GStreamer data protocol library, uninstalled
|
Name: GStreamer data protocol library, uninstalled
|
||||||
Description: Data protocol for plug-ins, Not Installed
|
Description: Data protocol for plug-ins, Not Installed
|
||||||
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
|
|
||||||
Libs: ${libdir}/gst/dataprotocol/libgstdataprotocol-@GST_MAJORMINOR@.la
|
Libs: @abs_top_builddir@/libs/gst/dataprotocol/libgstdataprotocol-@GST_MAJORMINOR@.la
|
||||||
Cflags: -I${includedir} -I${includedir}/libs
|
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
# the standard variables don't make sense for an uninstalled copy
|
# the standard variables don't make sense for an uninstalled copy
|
||||||
prefix=
|
prefix=
|
||||||
exec_prefix=
|
exec_prefix=
|
||||||
libdir=${pcfiledir}/../libs/gst/net
|
libdir=
|
||||||
|
includedir=
|
||||||
includedir=${pcfiledir}/..
|
|
||||||
|
|
||||||
Name: GStreamer networking library, uninstalled
|
Name: GStreamer networking library, uninstalled
|
||||||
Description: Network-enabled GStreamer plug-ins and clocking, uninstalled
|
Description: Network-enabled GStreamer plug-ins and clocking, uninstalled
|
||||||
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
|
|
||||||
Libs: ${libdir}/libgstnet-@GST_MAJORMINOR@.la
|
Libs: @abs_top_builddir@/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la
|
||||||
Cflags: -I${includedir}
|
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs
|
||||||
|
|
|
@ -1,14 +1,16 @@
|
||||||
# the standard variables don't make sense for an uninstalled copy
|
# the standard variables don't make sense for an uninstalled copy
|
||||||
prefix=
|
prefix=
|
||||||
exec_prefix=
|
exec_prefix=
|
||||||
libdir=${pcfiledir}/..
|
libdir=
|
||||||
includedir=${pcfiledir}/..
|
# includedir is builddir because it is used to find gstconfig.h in places
|
||||||
toolsdir=${pcfiledir}/../tools
|
includedir=@abs_top_builddir@
|
||||||
pluginsdir=${pcfiledir}/..
|
toolsdir=@abs_top_builddir@/tools
|
||||||
|
pluginsdir=@abs_top_builddir@
|
||||||
|
|
||||||
Name: GStreamer Uninstalled
|
Name: GStreamer Uninstalled
|
||||||
Description: Streaming media framework, Not Installed
|
Description: Streaming media framework, Not Installed
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Requires: @GST_PKG_DEPS@@LIBXML_PKG@
|
Requires: @GST_PKG_DEPS@@LIBXML_PKG@
|
||||||
Libs: ${libdir}/gst/libgstreamer-@GST_MAJORMINOR@.la
|
Libs: @abs_top_builddir@/gst/libgstreamer-@GST_MAJORMINOR@.la
|
||||||
Cflags: -I${includedir} -I${includedir}/libs
|
# FIXME: the libs dir doesn't really belong here
|
||||||
|
Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/libs -I@abs_top_builddir@ -I@abs_top_builddir@/libs
|
||||||
|
|
Loading…
Reference in a new issue