mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-27 14:31:01 +00:00
Port some changes from 0.6.0/0.6.1 back to HEAD (.pc files moved to pkg-config/, .m4 file moved from plugins to core)
Original commit message from CVS: Port some changes from 0.6.0/0.6.1 back to HEAD (.pc files moved to pkg-config/, .m4 file moved from plugins to core)
This commit is contained in:
parent
815fb8543b
commit
d2499c35b3
11 changed files with 129 additions and 31 deletions
32
Makefile.am
32
Makefile.am
|
@ -19,25 +19,27 @@ else
|
||||||
SUBDIRS_EXAMPLES =
|
SUBDIRS_EXAMPLES =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
all-local: gst-element-check-@GST_MAJORMINOR@.m4
|
||||||
|
|
||||||
|
gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
|
||||||
|
cp $(srcdir)/gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
|
||||||
|
|
||||||
|
aclocaldir = $(datadir)/aclocal
|
||||||
|
aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
|
||||||
|
|
||||||
SUBDIRS = include gst libs tools \
|
SUBDIRS = include gst libs tools \
|
||||||
$(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS)
|
$(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS) \
|
||||||
|
pkgconfig
|
||||||
|
|
||||||
# These are all the possible subdirs
|
# These are all the possible subdirs
|
||||||
DIST_SUBDIRS = include libs gst tools tests testsuite examples docs
|
DIST_SUBDIRS = include libs gst \
|
||||||
|
tools \
|
||||||
|
tests testsuite \
|
||||||
|
examples \
|
||||||
|
docs \
|
||||||
|
pkgconfig
|
||||||
|
|
||||||
all-local: gstreamer-@GST_MAJORMINOR@.pc gstreamer-@GST_MAJORMINOR@-uninstalled.pc
|
EXTRA_DIST = gstreamer.spec.in gst-element-check.m4 \
|
||||||
|
|
||||||
gstreamer-@GST_MAJORMINOR@.pc: gstreamer.pc gstreamer.pc.in
|
|
||||||
cp gstreamer.pc gstreamer-@GST_MAJORMINOR@.pc
|
|
||||||
gstreamer-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-uninstalled.pc gstreamer-uninstalled.pc.in
|
|
||||||
cp gstreamer-uninstalled.pc gstreamer-@GST_MAJORMINOR@-uninstalled.pc
|
|
||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
|
||||||
pkgconfig_DATA = gstreamer-@GST_MAJORMINOR@.pc
|
|
||||||
|
|
||||||
EXTRA_DIST = gstreamer.spec.in \
|
|
||||||
gstreamer.pc.in \
|
|
||||||
gstreamer-uninstalled.pc.in \
|
|
||||||
configure.ac autogen.sh depcomp \
|
configure.ac autogen.sh depcomp \
|
||||||
REQUIREMENTS ABOUT-NLS RELEASE DOCBUILDING DEVEL \
|
REQUIREMENTS ABOUT-NLS RELEASE DOCBUILDING DEVEL \
|
||||||
idiottest.mak common
|
idiottest.mak common
|
||||||
|
|
|
@ -554,9 +554,12 @@ docs/pwg/Makefile
|
||||||
docs/plugins/Makefile
|
docs/plugins/Makefile
|
||||||
docs/plugins/gstreamer-plugins.types
|
docs/plugins/gstreamer-plugins.types
|
||||||
docs/xsl/Makefile
|
docs/xsl/Makefile
|
||||||
|
pkgconfig/Makefile
|
||||||
stamp.h
|
stamp.h
|
||||||
gstreamer.pc
|
pkgconfig/gstreamer.pc
|
||||||
gstreamer-uninstalled.pc
|
pkgconfig/gstreamer-uninstalled.pc
|
||||||
|
pkgconfig/gstreamer-control.pc
|
||||||
|
pkgconfig/gstreamer-control-uninstalled.pc
|
||||||
gstreamer.spec,
|
gstreamer.spec,
|
||||||
echo "$infomessages", infomessages="$infomessages"
|
echo "$infomessages", infomessages="$infomessages"
|
||||||
)
|
)
|
||||||
|
|
20
gst-element-check.m4
Normal file
20
gst-element-check.m4
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
dnl Perform a check for a GStreamer element using gst-inspect
|
||||||
|
dnl Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
dnl Last modification: 23/10/2002
|
||||||
|
|
||||||
|
dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
|
||||||
|
|
||||||
|
AC_DEFUN(AM_GST_ELEMENT_CHECK,
|
||||||
|
[
|
||||||
|
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
|
||||||
|
if test "x$GST_INSPECT" != "x"; then
|
||||||
|
AC_MSG_CHECKING(GStreamer element $1)
|
||||||
|
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
|
||||||
|
AC_MSG_RESULT(found.)
|
||||||
|
$2
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(not found.)
|
||||||
|
$3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
])
|
20
gst-element-check.m4.in
Normal file
20
gst-element-check.m4.in
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
dnl Perform a check for a GStreamer element using gst-inspect
|
||||||
|
dnl Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
dnl Last modification: 23/10/2002
|
||||||
|
|
||||||
|
dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
|
||||||
|
|
||||||
|
AC_DEFUN(AM_GST_ELEMENT_CHECK,
|
||||||
|
[
|
||||||
|
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
|
||||||
|
if test "x$GST_INSPECT" != "x"; then
|
||||||
|
AC_MSG_CHECKING(GStreamer element $1)
|
||||||
|
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
|
||||||
|
AC_MSG_RESULT(found.)
|
||||||
|
$2
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(not found.)
|
||||||
|
$3
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
])
|
|
@ -1,14 +0,0 @@
|
||||||
# the standard variables don't make sense for an uninstalled copy
|
|
||||||
prefix=
|
|
||||||
exec_prefix=
|
|
||||||
libdir=${pcfiledir}
|
|
||||||
includedir=${pcfiledir}
|
|
||||||
toolsdir=${pcfiledir}/tools
|
|
||||||
gstcontrol_libs=-lgstcontrol-@GST_MAJORMINOR@
|
|
||||||
|
|
||||||
Name: GStreamer Uninstalled
|
|
||||||
Description: Streaming-media framework, Not Installed
|
|
||||||
Version: @VERSION@
|
|
||||||
Requires: @GST_PKG_DEPS@@LIBXML_PKG@
|
|
||||||
Libs: ${libdir}/gst/libgstreamer-@GST_MAJORMINOR@.la -L${libdir}/libs/gst/control/
|
|
||||||
Cflags: -I${includedir} -I${includedir}/libs -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/libs @GST_PKG_CFLAGS@
|
|
|
@ -203,6 +203,7 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
|
||||||
# %{_libdir}/libgstreamer.a
|
# %{_libdir}/libgstreamer.a
|
||||||
%{_libdir}/libgstreamer-%{majorminor}.so
|
%{_libdir}/libgstreamer-%{majorminor}.so
|
||||||
%{_libdir}/libgstcontrol-%{majorminor}.so
|
%{_libdir}/libgstcontrol-%{majorminor}.so
|
||||||
|
%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4
|
||||||
%{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc
|
%{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc
|
||||||
## we specify the API docs as regular files since %docs doesn't fail when
|
## we specify the API docs as regular files since %docs doesn't fail when
|
||||||
# files aren't found anymore for RPM >= 4
|
# files aren't found anymore for RPM >= 4
|
||||||
|
|
27
pkgconfig/Makefile.am
Normal file
27
pkgconfig/Makefile.am
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
### all of the standard pc files we need to generate
|
||||||
|
pcfiles = \
|
||||||
|
gstreamer-@GST_MAJORMINOR@.pc \
|
||||||
|
gstreamer-control-@GST_MAJORMINOR@.pc
|
||||||
|
|
||||||
|
pcfiles_uninstalled = \
|
||||||
|
gstreamer-@GST_MAJORMINOR@-uninstalled.pc \
|
||||||
|
gstreamer-control-@GST_MAJORMINOR@-uninstalled.pc
|
||||||
|
|
||||||
|
all-local: $(pcfiles) $(pcfiles_uninstalled)
|
||||||
|
|
||||||
|
### how to generate pc files
|
||||||
|
$(pcfiles): %-@GST_MAJORMINOR@.pc: %.pc
|
||||||
|
cp $< $@
|
||||||
|
$(pcfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
|
||||||
|
cp $< $@
|
||||||
|
|
||||||
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
|
pkgconfig_DATA = $(pcfiles)
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
gstreamer.pc.in \
|
||||||
|
gstreamer-uninstalled.pc.in \
|
||||||
|
gstreamer-control.pc.in \
|
||||||
|
gstreamer-control-uninstalled.pc.in
|
||||||
|
|
||||||
|
CLEANFILES = $(pcfiles) $(pcfiles_uninstalled)
|
14
pkgconfig/gstreamer-control-uninstalled.pc.in
Normal file
14
pkgconfig/gstreamer-control-uninstalled.pc.in
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
# the standard variables don't make sense for an uninstalled copy
|
||||||
|
prefix=
|
||||||
|
exec_prefix=
|
||||||
|
libdir=${pcfiledir}/../libs
|
||||||
|
includedir=${pcfiledir}/..
|
||||||
|
gstcontrol_libs=-lgstcontrol-@GST_MAJORMINOR@
|
||||||
|
|
||||||
|
Name: GStreamer control library, uninstalled
|
||||||
|
Description: Dynamic parameters for plug-ins
|
||||||
|
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
|
||||||
|
Version: @VERSION@
|
||||||
|
|
||||||
|
Libs: ${libdir}/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
|
||||||
|
Cflags: -I${includedir} -I${includedir}/libs @GST_PKG_CFLAGS@
|
11
pkgconfig/gstreamer-control.pc.in
Normal file
11
pkgconfig/gstreamer-control.pc.in
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
|
||||||
|
|
||||||
|
Name: GStreamer control library
|
||||||
|
Description: Dynamic parameters for plug-ins
|
||||||
|
Requires: gstreamer-@GST_MAJORMINOR@
|
||||||
|
Version: @VERSION@
|
||||||
|
Libs: -L${libdir} -lgstcontrol-@GST_MAJORMINOR@
|
||||||
|
Cflags: -I${includedir} @GST_PKG_CFLAGS@
|
14
pkgconfig/gstreamer-uninstalled.pc.in
Normal file
14
pkgconfig/gstreamer-uninstalled.pc.in
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
# the standard variables don't make sense for an uninstalled copy
|
||||||
|
prefix=
|
||||||
|
exec_prefix=
|
||||||
|
libdir=${pcfiledir}/..
|
||||||
|
includedir=${pcfiledir}/..
|
||||||
|
toolsdir=${pcfiledir}/../tools
|
||||||
|
gstcontrol_libs=-lgstcontrol-@GST_MAJORMINOR@
|
||||||
|
|
||||||
|
Name: GStreamer Uninstalled
|
||||||
|
Description: Streaming-media framework, Not Installed
|
||||||
|
Version: @VERSION@
|
||||||
|
Requires: @GST_PKG_DEPS@@LIBXML_PKG@
|
||||||
|
Libs: ${libdir}/gst/libgstreamer-@GST_MAJORMINOR@.la
|
||||||
|
Cflags: -I${includedir} -I${includedir}/libs @GST_PKG_CFLAGS@
|
Loading…
Reference in a new issue