[libdvdcss-devel] [PATCH 22/47] dvd_region: #include ioctl.c instead of linking against the object file

Diego Biurrun diego at biurrun.de
Wed Oct 29 21:33:22 CET 2014


On non-Linux platform dvd_region uses static functions from ioctl.c,
so just linking against the object file is not enough.
---
 Makefile.am       | 2 +-
 test/dvd_region.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 9a471d3..583a1f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ test_csstest_SOURCES = test/csstest.c
 test_csstest_LDADD = libdvdcss.la
 test_csstest_CFLAGS = -I $(top_srcdir)/src
 
-test_dvd_region_SOURCES = test/dvd_region.c src/ioctl.c
+test_dvd_region_SOURCES = test/dvd_region.c
 test_dvd_region_LDADD = libdvdcss.la
 test_dvd_region_CFLAGS = -I $(top_srcdir)/src
 
diff --git a/test/dvd_region.c b/test/dvd_region.c
index 4b61be5..1488dab 100644
--- a/test/dvd_region.c
+++ b/test/dvd_region.c
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "common.h"
 #include "ioctl.h"
+#include "ioctl.c"
 
 #define DEFAULT_DEVICE "/dev/dvd"
 
-- 
1.9.1



More information about the libdvdcss-devel mailing list