mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

libXv is now linked against by test/* and gstplay if it is present.

Browse source 
Original commit message from CVS:
libXv is now linked against by test/* and gstplay if it is present.
-lXv isn't leaked all over the place due to AC_CHECK_LIB test.
This is still messy though - we shouldn't have to link explicitly
with extra things just because we use certain plugins.

Build Makefile in tests, but don't recurse into tests when doing the
build  (tests no longer in SUBDIRS).
This commit is contained in:
Richard Boulton 2000-08-19 00:29:57 +00:00
parent 9ae673e291
commit cf0a34528d
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -8,7 +8,7 @@ gstplay_subdir=
endif endif
# These are the subdirs which might get used. # These are the subdirs which might get used.
SUBDIRS = gst libs plugins . $(gstplay_subdir) test editor tools docs tests SUBDIRS = gst libs plugins . $(gstplay_subdir) test editor tools docs # tests
# These are all the possible subdirs # These are all the possible subdirs
DIST_SUBDIRS = gst libs plugins . gstplay test editor tools docs tests DIST_SUBDIRS = gst libs plugins . gstplay test editor tools docs tests

3
config.h.in
View file

@ -24,9 +24,6 @@
#undef DEBUG_ENABLED #undef DEBUG_ENABLED
/* Define if you have the Xv library (-lXv). */
#undef HAVE_LIBXV
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE

8
configure.in
View file

@ -129,7 +129,6 @@ else
[Couldn't find gnome libraries for libglade - Can't build gstplay]) [Couldn't find gnome libraries for libglade - Can't build gstplay])
) )
CFLAGS=${libglade_save_CFLAGS} CFLAGS=${libglade_save_CFLAGS}
AC_MSG_WARN()
fi fi
dnl Check for atomic.h dnl Check for atomic.h
@ -183,8 +182,9 @@ AC_SUBST(X_PRE_LIBS)
AC_SUBST(X_EXTRA_LIBS) AC_SUBST(X_EXTRA_LIBS)
AC_SUBST(X_LIBS) AC_SUBST(X_LIBS)
AC_CHECK_LIB(Xv, XvQueryExtension,,, xvsave_LIBS=${LIBS}
$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS) AC_CHECK_LIB(Xv, XvQueryExtension, HAVE_LIBXV=yes, HAVE_LIBXV=no, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
LIBS=${xvsave_LIBS}
dnl Check for xaudio dnl Check for xaudio
AC_CHECK_HEADER(xaudio/decoder.h,[ AC_CHECK_HEADER(xaudio/decoder.h,[
@ -339,6 +339,7 @@ AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes") AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes")
AM_CONDITIONAL(HAVE_NASM, test "x$HAVE_NASM" = "xyes") AM_CONDITIONAL(HAVE_NASM, test "x$HAVE_NASM" = "xyes")
AM_CONDITIONAL(HAVE_LIBGLADE_GNOME, test "x$HAVE_LIBGLADE_GNOME" = "xyes") AM_CONDITIONAL(HAVE_LIBGLADE_GNOME, test "x$HAVE_LIBGLADE_GNOME" = "xyes")
AM_CONDITIONAL(HAVE_LIBXV, test "x$HAVE_LIBXV" = "xyes")
AM_CONDITIONAL(HAVE_GTK_DOC, $HAVE_GTK_DOC) AM_CONDITIONAL(HAVE_GTK_DOC, $HAVE_GTK_DOC)
@ -426,6 +427,7 @@ test/Makefile
test/xml/Makefile test/xml/Makefile
test/bindings/Makefile test/bindings/Makefile
test/cothreads/Makefile test/cothreads/Makefile
tests/Makefile
editor/Makefile editor/Makefile
tools/Makefile tools/Makefile
docs/Makefile docs/Makefile

8
gstplay/Makefile.am
View file

@ -22,7 +22,13 @@ CFLAGS += -O2 -Wall -DDATADIR=\""$(gladedir)/"\"
gstplay_CFLAGS = $(shell gnome-config --cflags gnomeui) $(shell libglade-config --cflags gnome) gstplay_CFLAGS = $(shell gnome-config --cflags gnomeui) $(shell libglade-config --cflags gnome)
gstplay_LDFLAGS = $(shell gnome-config --libs gnomeui) $(shell libglade-config --libs gnome) gstplay_LDFLAGS = $(shell gnome-config --libs gnomeui) $(shell libglade-config --libs gnome)
if HAVE_LIBXV
xvlibs=-lXv
else
xvlibs=
endif
gstplay_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la \ gstplay_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la \
$(top_builddir)/plugins/videosink/gdkxvimage.lo -lXv -lXxf86vm $(top_builddir)/plugins/videosink/gdkxvimage.lo ${xvlibs} -lXxf86vm

11
test/Makefile.am
View file

@ -15,8 +15,15 @@ ac3play_SOURCES = ac3play.c mem.c
noinst_HEADERS = mem.h noinst_HEADERS = mem.h
LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la \ if HAVE_LIBXV
$(top_builddir)/plugins/videosink/gdkxvimage.lo -lXv -lXxf86vm xvlibs=-lXv
else
xvlibs=
endif
LDADD = $(top_builddir)/gst/libgst.la \
$(GLIB_LIBS) $(GTK_LIBS) \
$(top_builddir)/plugins/videosink/gdkxvimage.lo ${xvlibs} -lXxf86vm
#LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la \ #LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(top_builddir)/gst/libgst.la \
# $(top_builddir)/plugins/videosink/libvideosink.la -L/usr/X11/lib -lXxf86dga # $(top_builddir)/plugins/videosink/libvideosink.la -L/usr/X11/lib -lXxf86dga