From b535c2d4f8d84adb22c741170e6fd11b3cfc4478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 31 May 2007 22:24:29 +0200 Subject: Move libcdio and libvcd into contrib/ --HG-- rename : src/input/vcd/libcdio/FreeBSD/freebsd.c => contrib/libcdio/FreeBSD/freebsd.c rename : src/input/vcd/libcdio/FreeBSD/freebsd.h => contrib/libcdio/FreeBSD/freebsd.h rename : src/input/vcd/libcdio/FreeBSD/freebsd_cam.c => contrib/libcdio/FreeBSD/freebsd_cam.c rename : src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c => contrib/libcdio/FreeBSD/freebsd_ioctl.c rename : src/input/vcd/libcdio/MSWindows/Makefile.am => contrib/libcdio/MSWindows/Makefile.am rename : src/input/vcd/libcdio/MSWindows/aspi32.c => contrib/libcdio/MSWindows/aspi32.c rename : src/input/vcd/libcdio/MSWindows/aspi32.h => contrib/libcdio/MSWindows/aspi32.h rename : src/input/vcd/libcdio/MSWindows/win32.c => contrib/libcdio/MSWindows/win32.c rename : src/input/vcd/libcdio/MSWindows/win32.h => contrib/libcdio/MSWindows/win32.h rename : src/input/vcd/libcdio/MSWindows/win32_ioctl.c => contrib/libcdio/MSWindows/win32_ioctl.c rename : src/input/vcd/libcdio/Makefile.am => contrib/libcdio/Makefile.am rename : src/input/vcd/libcdio/_cdio_bsdi.c => contrib/libcdio/_cdio_bsdi.c rename : src/input/vcd/libcdio/_cdio_generic.c => contrib/libcdio/_cdio_generic.c rename : src/input/vcd/libcdio/_cdio_linux.c => contrib/libcdio/_cdio_linux.c rename : src/input/vcd/libcdio/_cdio_osx.c => contrib/libcdio/_cdio_osx.c rename : src/input/vcd/libcdio/_cdio_stdio.c => contrib/libcdio/_cdio_stdio.c rename : src/input/vcd/libcdio/_cdio_stdio.h => contrib/libcdio/_cdio_stdio.h rename : src/input/vcd/libcdio/_cdio_stream.c => contrib/libcdio/_cdio_stream.c rename : src/input/vcd/libcdio/_cdio_stream.h => contrib/libcdio/_cdio_stream.h rename : src/input/vcd/libcdio/_cdio_sunos.c => contrib/libcdio/_cdio_sunos.c rename : src/input/vcd/libcdio/cd_types.c => contrib/libcdio/cd_types.c rename : src/input/vcd/libcdio/cdio.c => contrib/libcdio/cdio.c rename : src/input/vcd/libcdio/cdio/Makefile.am => contrib/libcdio/cdio/Makefile.am rename : src/input/vcd/libcdio/cdio/bytesex.h => contrib/libcdio/cdio/bytesex.h rename : src/input/vcd/libcdio/cdio/bytesex_asm.h => contrib/libcdio/cdio/bytesex_asm.h rename : src/input/vcd/libcdio/cdio/cd_types.h => contrib/libcdio/cdio/cd_types.h rename : src/input/vcd/libcdio/cdio/cdio.h => contrib/libcdio/cdio/cdio.h rename : src/input/vcd/libcdio/cdio/cdtext.h => contrib/libcdio/cdio/cdtext.h rename : src/input/vcd/libcdio/cdio/ds.h => contrib/libcdio/cdio/ds.h rename : src/input/vcd/libcdio/cdio/dvd.h => contrib/libcdio/cdio/dvd.h rename : src/input/vcd/libcdio/cdio/iso9660.h => contrib/libcdio/cdio/iso9660.h rename : src/input/vcd/libcdio/cdio/logging.h => contrib/libcdio/cdio/logging.h rename : src/input/vcd/libcdio/cdio/scsi_mmc.h => contrib/libcdio/cdio/scsi_mmc.h rename : src/input/vcd/libcdio/cdio/sector.h => contrib/libcdio/cdio/sector.h rename : src/input/vcd/libcdio/cdio/types.h => contrib/libcdio/cdio/types.h rename : src/input/vcd/libcdio/cdio/util.h => contrib/libcdio/cdio/util.h rename : src/input/vcd/libcdio/cdio/version.h => contrib/libcdio/cdio/version.h rename : src/input/vcd/libcdio/cdio/xa.h => contrib/libcdio/cdio/xa.h rename : src/input/vcd/libcdio/cdio_assert.h => contrib/libcdio/cdio_assert.h rename : src/input/vcd/libcdio/cdio_private.h => contrib/libcdio/cdio_private.h rename : src/input/vcd/libcdio/cdtext.c => contrib/libcdio/cdtext.c rename : src/input/vcd/libcdio/cdtext_private.h => contrib/libcdio/cdtext_private.h rename : src/input/vcd/libcdio/ds.c => contrib/libcdio/ds.c rename : src/input/vcd/libcdio/generic.h => contrib/libcdio/generic.h rename : src/input/vcd/libcdio/image.h => contrib/libcdio/image.h rename : src/input/vcd/libcdio/image/Makefile.am => contrib/libcdio/image/Makefile.am rename : src/input/vcd/libcdio/image/bincue.c => contrib/libcdio/image/bincue.c rename : src/input/vcd/libcdio/image/cdrdao.c => contrib/libcdio/image/cdrdao.c rename : src/input/vcd/libcdio/image/nrg.c => contrib/libcdio/image/nrg.c rename : src/input/vcd/libcdio/image/nrg.h => contrib/libcdio/image/nrg.h rename : src/input/vcd/libcdio/image_common.h => contrib/libcdio/image_common.h rename : src/input/vcd/libcdio/iso9660.c => contrib/libcdio/iso9660.c rename : src/input/vcd/libcdio/iso9660_fs.c => contrib/libcdio/iso9660_fs.c rename : src/input/vcd/libcdio/iso9660_private.h => contrib/libcdio/iso9660_private.h rename : src/input/vcd/libcdio/logging.c => contrib/libcdio/logging.c rename : src/input/vcd/libcdio/portable.h => contrib/libcdio/portable.h rename : src/input/vcd/libcdio/scsi_mmc.c => contrib/libcdio/scsi_mmc.c rename : src/input/vcd/libcdio/scsi_mmc.h => contrib/libcdio/scsi_mmc.h rename : src/input/vcd/libcdio/scsi_mmc_private.h => contrib/libcdio/scsi_mmc_private.h rename : src/input/vcd/libcdio/sector.c => contrib/libcdio/sector.c rename : src/input/vcd/libcdio/util.c => contrib/libcdio/util.c rename : src/input/vcd/libcdio/xa.c => contrib/libcdio/xa.c rename : src/input/vcd/libvcd/Makefile.am => contrib/libvcd/Makefile.am rename : src/input/vcd/libvcd/bitvec.h => contrib/libvcd/bitvec.h rename : src/input/vcd/libvcd/bytesex.h => contrib/libvcd/bytesex.h rename : src/input/vcd/libvcd/bytesex_asm.h => contrib/libvcd/bytesex_asm.h rename : src/input/vcd/libvcd/data_structures.c => contrib/libvcd/data_structures.c rename : src/input/vcd/libvcd/data_structures.h => contrib/libvcd/data_structures.h rename : src/input/vcd/libvcd/dict.h => contrib/libvcd/dict.h rename : src/input/vcd/libvcd/directory.c => contrib/libvcd/directory.c rename : src/input/vcd/libvcd/directory.h => contrib/libvcd/directory.h rename : src/input/vcd/libvcd/files.c => contrib/libvcd/files.c rename : src/input/vcd/libvcd/image.c => contrib/libvcd/image.c rename : src/input/vcd/libvcd/image_bincue.c => contrib/libvcd/image_bincue.c rename : src/input/vcd/libvcd/image_cdrdao.c => contrib/libvcd/image_cdrdao.c rename : src/input/vcd/libvcd/image_nrg.c => contrib/libvcd/image_nrg.c rename : src/input/vcd/libvcd/image_sink.h => contrib/libvcd/image_sink.h rename : src/input/vcd/libvcd/inf.c => contrib/libvcd/inf.c rename : src/input/vcd/libvcd/info.c => contrib/libvcd/info.c rename : src/input/vcd/libvcd/info_private.c => contrib/libvcd/info_private.c rename : src/input/vcd/libvcd/info_private.h => contrib/libvcd/info_private.h rename : src/input/vcd/libvcd/libvcd/Makefile.am => contrib/libvcd/libvcd/Makefile.am rename : src/input/vcd/libvcd/libvcd/files.h => contrib/libvcd/libvcd/files.h rename : src/input/vcd/libvcd/libvcd/files_private.h => contrib/libvcd/libvcd/files_private.h rename : src/input/vcd/libvcd/libvcd/inf.h => contrib/libvcd/libvcd/inf.h rename : src/input/vcd/libvcd/libvcd/info.h => contrib/libvcd/libvcd/info.h rename : src/input/vcd/libvcd/libvcd/logging.h => contrib/libvcd/libvcd/logging.h rename : src/input/vcd/libvcd/libvcd/sector.h => contrib/libvcd/libvcd/sector.h rename : src/input/vcd/libvcd/libvcd/types.h => contrib/libvcd/libvcd/types.h rename : src/input/vcd/libvcd/libvcd/version.h => contrib/libvcd/libvcd/version.h rename : src/input/vcd/libvcd/logging.c => contrib/libvcd/logging.c rename : src/input/vcd/libvcd/mpeg.c => contrib/libvcd/mpeg.c rename : src/input/vcd/libvcd/mpeg.h => contrib/libvcd/mpeg.h rename : src/input/vcd/libvcd/mpeg_stream.c => contrib/libvcd/mpeg_stream.c rename : src/input/vcd/libvcd/mpeg_stream.h => contrib/libvcd/mpeg_stream.h rename : src/input/vcd/libvcd/obj.h => contrib/libvcd/obj.h rename : src/input/vcd/libvcd/pbc.c => contrib/libvcd/pbc.c rename : src/input/vcd/libvcd/pbc.h => contrib/libvcd/pbc.h rename : src/input/vcd/libvcd/salloc.c => contrib/libvcd/salloc.c rename : src/input/vcd/libvcd/salloc.h => contrib/libvcd/salloc.h rename : src/input/vcd/libvcd/sector.c => contrib/libvcd/sector.c rename : src/input/vcd/libvcd/sector_private.h => contrib/libvcd/sector_private.h rename : src/input/vcd/libvcd/stream.c => contrib/libvcd/stream.c rename : src/input/vcd/libvcd/stream.h => contrib/libvcd/stream.h rename : src/input/vcd/libvcd/stream_stdio.c => contrib/libvcd/stream_stdio.c rename : src/input/vcd/libvcd/stream_stdio.h => contrib/libvcd/stream_stdio.h rename : src/input/vcd/libvcd/util.c => contrib/libvcd/util.c rename : src/input/vcd/libvcd/util.h => contrib/libvcd/util.h rename : src/input/vcd/libvcd/vcd.c => contrib/libvcd/vcd.c rename : src/input/vcd/libvcd/vcd.h => contrib/libvcd/vcd.h rename : src/input/vcd/libvcd/vcd_assert.h => contrib/libvcd/vcd_assert.h rename : src/input/vcd/libvcd/vcd_read.c => contrib/libvcd/vcd_read.c rename : src/input/vcd/libvcd/vcd_read.h => contrib/libvcd/vcd_read.h --- m4/input.m4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'm4') diff --git a/m4/input.m4 b/m4/input.m4 index 76ad12ad9..9c86240e3 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -218,12 +218,12 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ fi fi - LIBCDIO_CFLAGS='-I$(top_srcdir)/src/input/vcd/libcdio' - LIBCDIO_LIBS='$(top_builddir)/src/input/vcd/libcdio/libcdio.la' - LIBISO9660_LIBS='$(top_builddir)/src/input/vcd/libcdio/libiso9660.la' - LIBVCD_CFLAGS='-I$(top_srcdir)/src/input/vcd/libvcd' - LIBVCD_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcd.la' - LIBVCDINFO_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcdinfo.la' + LIBCDIO_CFLAGS='-I$(top_srcdir)/contrib/libcdio' + LIBCDIO_LIBS='$(top_builddir)/contrib/libcdio/libcdio.la' + LIBISO9660_LIBS='$(top_builddir)/contrib/libcdio/libiso9660.la' + LIBVCD_CFLAGS='-I$(top_srcdir)/contrib/libvcd' + LIBVCD_LIBS='$(top_builddir)/contrib/libvcd/libvcd.la' + LIBVCDINFO_LIBS='$(top_builddir)/contrib/libvcd/libvcdinfo.la' case "$host_os" in bsdi*) -- cgit v1.2.3