shithub: libdvdcss

Info  •  Files  •  Log  •  Branches

Fix so that the bsdi_*.[hc] files make it into the dist tar-ball.
Correct the include path for the programs in test/.

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -1,8 +1,8 @@

 SUBDIRS = dvdcss

 lib_LTLIBRARIES = libdvdcss.la

-libdvdcss_la_SOURCES = libdvdcss.c css.c ioctl.c @EXTRA_SRC@

+libdvdcss_la_SOURCES = libdvdcss.c css.c ioctl.c bsdi_ioctl.c

 libdvdcss_la_LIBADD = @EXTRA_LIB@

 libdvdcss_la_LDFLAGS = -version-info 2:1:0

-noinst_HEADERS = csstables.h ioctl.h common.h css.h libdvdcss.h

+noinst_HEADERS = csstables.h ioctl.h common.h css.h libdvdcss.h bsdi_dvd.h

--- a/src/bsdi_ioctl.c

+++ b/src/bsdi_ioctl.c

@@ -1,3 +1,5 @@

+#ifdef NEED_BSDI_LIBDVD

+

 /*

  * Hacked version of the linux cdrom.c kernel module - everything except the

  * DVD handling ripped out and the rest rewritten to use raw SCSI commands

@@ -694,3 +696,5 @@

 	mh.block_length_lo = size & 0xff;

 	return(scsi_cmd(fd, &cgc));

 	}

+

+#endif

--- a/test/Makefile.am

+++ b/test/Makefile.am

@@ -1,7 +1,10 @@

-noinst_PROGRAMS = csstest

+noinst_PROGRAMS = csstest dvd_region

 csstest_SOURCES = csstest.c

 csstest_LDADD = $(top_builddir)/src/libdvdcss.la

-csstest_CFLAGS = -I../src

+csstest_CFLAGS = -I$(top_srcdir)/src

+dvd_region_SOURCES = dvd_region.c

+dvd_region_LDADD = $(top_builddir)/src/libdvdcss.la

+dvd_region_CFLAGS = -I$(top_srcdir)/src