Trivial manual fixes.

[liblbx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fb85562931092adf02af0bc37809c350a8ad3b15..e5c0d8b0b539ee110a8a8e079f5ade49ec76dc6e 100644 (file)
--- 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,8 +12,10 @@ 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_srcdir)/src \
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
+              -I$(top_builddir)/src -I$(top_srcdir)/src \
               -I$(top_srcdir)/common/src
 AM_CFLAGS = $(LIBPNG_CFLAGS) $(GTK_CFLAGS)
 
@@ -23,7 +24,7 @@ dist_doc_DATA = doc/txt/moo2-data.txt
 
 lbxdir = $(includedir)/lbx
 lbx_HEADERS = src/lbx.h src/image.h src/error.h
-noinst_HEADERS = src/misc.h src/tools.h
+noinst_HEADERS = src/misc.h src/tools.h src/imgoutput.h common/src/help.h
 
 lib_LTLIBRARIES = liblbx.la
 liblbx_la_SOURCES = src/lbx.c src/fops.c src/image.c src/error.c \
@@ -35,13 +36,15 @@ if BUILD_LBXGUI
 bin_PROGRAMS += lbxgui
 endif
 
-lbxtool_SOURCES = src/lbxtool.c src/tools.c
+lbxtool_SOURCES = src/lbxtool.c src/tools.c common/src/help.c
 lbxtool_LDADD = liblbx.la libgnu.la
 $(lbxtool_OBJECTS): $(gnulib_headers)
+$(lbxtool_OBJECTS): src/toolopts.h
 
-lbximg_SOURCES = src/lbximg.c src/tools.c src/pnm.c src/imgoutput.h
+lbximg_SOURCES = src/lbximg.c src/tools.c src/pnm.c common/src/help.c
 lbximg_LDADD = liblbx.la libgnu.la $(LIBPNG_LIBS)
 $(lbximg_OBJECTS): $(gnulib_headers)
+$(lbximg_OBJECTS): src/imgopts.h
 
 if HAVE_LIBPNG
 lbximg_SOURCES += src/png.c
@@ -53,24 +56,13 @@ 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
+       $(AM_V_at) mv -f $@.tmp $@
+$(OPTFILES:.opt=.h): $(DX_BASEDIR)/scripts/gen-options.awk
+CLEANFILES += $(OPTFILES:.opt=.h)
+EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-options.awk $(OPTFILES)
 
 .xml.c:
        $(AM_V_GEN) printf '%s\n' $(*F) | sed -e 's/[^[:alnum:]]/_/g' \
@@ -84,4 +76,23 @@ clean-testdirs:
 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)' \
+           MD5 '$(MD5)' \
+           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