From 6b0d697a0bb44f845c819a5978f437da867f70a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 31 May 2007 23:12:20 +0200 Subject: Fix dependencies for vcd libraries. --- m4/input.m4 | 8 ++++++++ src/input/vcd/Makefile.am | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/m4/input.m4 b/m4/input.m4 index 9c86240e3..a0de77dc0 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -220,10 +220,14 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ LIBCDIO_CFLAGS='-I$(top_srcdir)/contrib/libcdio' LIBCDIO_LIBS='$(top_builddir)/contrib/libcdio/libcdio.la' + LIBCDIO_DEPS='$(top_builddir)/contrib/libcdio/libcdio.la' LIBISO9660_LIBS='$(top_builddir)/contrib/libcdio/libiso9660.la' + LIBISO9660_DEPS='$(top_builddir)/contrib/libcdio/libiso9660.la' LIBVCD_CFLAGS='-I$(top_srcdir)/contrib/libvcd' LIBVCD_LIBS='$(top_builddir)/contrib/libvcd/libvcd.la' + LIBVCD_DEPS='$(top_builddir)/contrib/libvcd/libvcd.la' LIBVCDINFO_LIBS='$(top_builddir)/contrib/libvcd/libvcdinfo.la' + LIBVCDINFO_DEPS='$(top_builddir)/contrib/libvcd/libvcdinfo.la' case "$host_os" in bsdi*) @@ -270,10 +274,14 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ AC_DEFINE([EXTERNAL_LIBCDIO_CONFIG_H], 1, [Get of rid system libcdio build configuration]) AC_SUBST(LIBCDIO_CFLAGS) AC_SUBST(LIBCDIO_LIBS) + AC_SUBST(LIBCDIO_DEPS) AC_SUBST(LIBISO9660_LIBS) + AC_SUBST(LIBISO9660_DEPS) AC_SUBST(LIBVCD_CFLAGS) AC_SUBST(LIBVCD_LIBS) + AC_SUBST(LIBVCD_DEPS) AC_SUBST(LIBVCDINFO_LIBS) + AC_SUBST(LIBVCDINFO_DEPS) AM_CONDITIONAL([WITH_EXTERNAL_VCDLIBS], [test x"$with_internal_vcdlibs" = x"no"]) AM_CONDITIONAL([ENABLE_VCD], [test x"$enable_vcd" != x"no"]) AM_CONDITIONAL([ENABLE_VCDO], [test x"$enable_vcdo" != x"no"]) diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index aa36ff65f..e08396ef7 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -1,5 +1,17 @@ include $(top_srcdir)/misc/Makefile.common +$(top_builddir)/contrib/libcdio/libcdio.la: + $(MAKE) -C $(top_builddir)/contrib/libcdio + +$(top_builddir)/contrib/libcdio/libiso9660.la: + $(MAKE) -C $(top_builddir)/contrib/libcdio + +$(top_builddir)/contrib/libvcd/libvcd.la: + $(MAKE) -C $(top_builddir)/contrib/libvcd + +$(top_builddir)/contrib/libvcd/libvcdinfo.la: + $(MAKE) -C $(top_builddir)/contrib/libvcd + AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) @@ -9,4 +21,5 @@ xineplug_LTLIBRARIES = xineplug_inp_vcd.la xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm +xineplug_inp_vcd_la_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBVCD_DEPS) $(LIBVCDINFO_DEPS) $(LIBISO9660_DEPS) xineplug_inp_vcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) -- cgit v1.2.3