X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/efc068f39f6811cdc0e004d2acf4ef08b2b71c3e..9969a6cd8e946ea3bbcd7f4b357b0e60fc02fe43:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 30a8c5c..8096bb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@
 # This is free software: you are free to do what the fuck you want to.
 # There is NO WARRANTY, to the extent permitted by law.
 
-AUTOMAKE_OPTIONS = parallel-tests color-tests
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 # For Gnulib
@@ -13,6 +12,7 @@ EXTRA_LTLIBRARIES =
 
 EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4
 CLEANFILES = $(EXTRA_LTLIBRARIES)
+DISTCLEANFILES =
 
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
               -I$(top_builddir)/src -I$(top_srcdir)/src \
@@ -56,25 +56,6 @@ lbxgui_SOURCES = src/gui/lbxgui.c src/gui/lbxgui.h src/gui/image.c \
 lbxgui_LDFLAGS = $(AM_LDFLAGS) -export-dynamic
 lbxgui_LDADD = liblbx.la $(GTK_LIBS)
 
-TEST_EXTENSIONS = .tap
-
-TAP_LOG_COMPILER = $(SHELL)
-TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' \
-	$(SHELL) $(srcdir)/tests/util/tap-driver.sh
-
-TESTS = tests/broken-archives.tap tests/empty-image.tap tests/pam-formats.tap \
-	tests/moo2-mainmenu.tap tests/moo2-logo.tap tests/moo2-starbg.tap \
-	tests/moo2-ships.tap tests/moo2-monster.tap
-
-mostlyclean-local: clean-testdirs
-clean-testdirs:
-	for dir in $(TESTS:.tap=.dir); do \
-		case $$dir in \
-		*.dir) rm -rf "$$dir" ;; \
-		esac; \
-	done
-.PHONY: clean-testdirs
-
 OPTFILES = src/toolopts.opt src/imgopts.opt
 .opt.h:
 	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-options.awk $< >$@.tmp
@@ -95,4 +76,23 @@ EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-options.awk $(OPTFILES)
 EXTRA_DIST += src/gui/lbxgui.glade.xml
 CLEANFILES += src/gui/lbxgui.glade.c
 
-include lib/gnulib.mk
+atlocal: config.status
+	$(AM_V_GEN) :; { \
+	  printf ': "$${%s=%s}"\n' \
+	    datadir '$(datadir)' \
+	    LN_S '$(LN_S)' \
+	    MD5SUM '$(MD5SUM)' \
+	    PAMARITH '$(PAMARITH)' \
+	    PAMCHANNEL '$(PAMCHANNEL)' \
+	; } >$@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
+check_DATA = atlocal
+CLEANFILES += atlocal
+
+# Data files used in test cases
+dist_check_DATA = tests/testdata/image-0x0 tests/testdata/image-1x1 \
+                  tests/testdata/image-1x1-mt tests/testdata/palette-ramp \
+                  tests/testdata/arch-trunc.lbx
+
+include $(top_srcdir)/common/snippet/autotest.mk
+include $(top_srcdir)/lib/gnulib.mk