lbximg: Add an option to control the output filenames.

[liblbx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ff0b4a124020fe91da3ba2c1d4dd1f633ae6c18a..ccadd435ccd78a300204d67c617714b2930ca1e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@
 # 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
 
 EXTRA_DIST         = m4/gnulib-cache.m4
@@ -11,7 +12,8 @@ CLEANFILES         =
 MOSTLYCLEANFILES   =
 noinst_LTLIBRARIES =
 
-AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/src
+AM_CFLAGS = $(LIBPNG_CFLAGS) $(GTK_CFLAGS)
 
 dist_man_MANS = doc/man/lbxtool.1 doc/man/lbximg.1
 dist_doc_DATA = doc/txt/moo2-data.txt
@@ -24,30 +26,45 @@ lib_LTLIBRARIES = liblbx.la
 liblbx_la_SOURCES = src/lbx.c src/fops.c src/image.c src/pack.c src/error.c
 liblbx_la_LDFLAGS = -export-symbols-regex '^lbx_'
 
-bin_PROGRAMS = lbxtool
-if BUILD_LBXIMG
-bin_PROGRAMS += lbximg
-endif
+bin_PROGRAMS = lbxtool lbximg
 if BUILD_LBXGUI
 bin_PROGRAMS += lbxgui
 endif
 
-lbxtool_SOURCES = src/lbxtool.c
+lbxtool_SOURCES = src/lbxtool.c src/tools.c
 lbxtool_LDADD = liblbx.la libgnu.la
 $(lbxtool_OBJECTS): $(gnulib_headers)
 
-lbximg_SOURCES = src/lbximg.c
+lbximg_SOURCES = src/lbximg.c src/tools.c src/pnm.c
 lbximg_LDADD = liblbx.la libgnu.la $(LIBPNG_LIBS)
-lbximg_CFLAGS = $(LIBPNG_CFLAGS)
 $(lbximg_OBJECTS): $(gnulib_headers)
 
+if HAVE_LIBPNG
+lbximg_SOURCES += src/png.c
+endif
+
 nodist_lbxgui_SOURCES = src/gui/lbxgui.glade.c
 lbxgui_SOURCES = src/gui/lbxgui.c src/gui/render.c src/gui/render.h \
        src/gui/bg.xbm
-lbxgui_LDADD = liblbx.la $(GTK_LIBS)
-lbxgui_CPPFLAGS = -I$(top_srcdir)/src
-lbxgui_CFLAGS = $(GTK_CFLAGS)
 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/empty-image.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
 
 .xml.c:
        $(AM_V_GEN) printf '%s\n' $(*F) | sed -e 's/[^[:alnum:]]/_/g' \