ref: 3599a6829e4e120c0e7e5d5b6bcac44105e580d9
parent: 2361630346254812d7f130f362c361701ad10fbd
author: Diego Biurrun <diego@biurrun.de>
date: Mon Oct 20 07:58:57 EDT 2014
build: Generate csstest and dvd_region binaries below test/ directory
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
.deps
-/*.exe
/*.la
/.auto
/.libs
@@ -11,9 +10,7 @@
/compile
/config.*
/configure
-/csstest
/depcomp
-/dvd_region
/install-sh
/libdvdcss*.tar.bz2
/libdvdcss*.tar.gz
@@ -30,5 +27,9 @@
/src/.dirstamp
/src/.libs
/src/libdvdcss.pc
+/test/*.exe
/test/*.o
/test/.dirstamp
+/test/.libs
+/test/csstest
+/test/dvd_region
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@
test -e $(@) || touch $(@)
lib_LTLIBRARIES = libdvdcss.la
-EXTRA_PROGRAMS = csstest dvd_region
+EXTRA_PROGRAMS = test/csstest test/dvd_region
libdvdcss_la_SOURCES = \
src/libdvdcss.c \
@@ -35,13 +35,13 @@
libdvdcss_la_LDFLAGS += -no-undefined
endif
-csstest_SOURCES = test/csstest.c
-csstest_LDADD = libdvdcss.la
-csstest_CFLAGS = -I $(top_srcdir)/src
+test_csstest_SOURCES = test/csstest.c
+test_csstest_LDADD = libdvdcss.la
+test_csstest_CFLAGS = -I $(top_srcdir)/src
-dvd_region_SOURCES = test/dvd_region.c src/ioctl.c
-dvd_region_LDADD = libdvdcss.la
-dvd_region_CFLAGS = -I $(top_srcdir)/src
+test_dvd_region_SOURCES = test/dvd_region.c src/ioctl.c
+test_dvd_region_LDADD = libdvdcss.la
+test_dvd_region_CFLAGS = -I $(top_srcdir)/src
pkgincludedir = $(includedir)/dvdcss
pkginclude_HEADERS = src/dvdcss/dvdcss.h