[libdvdcss-devel] [PATCH 04/25] build: Generate csstest and dvd_region binaries below test/ directory

[Diego Biurrun]

---
 .gitignore  |  7 ++++---
 Makefile.am | 14 +++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1611fcb..90caa18 100644
--- 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
diff --git a/Makefile.am b/Makefile.am
index f41cb9e..bd4ca5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD)
 	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 @@ if !SYS_MSVC
 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
-- 
1.9.1