Update gnulib/dxcommon to lastest bits.

[liblbx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ccadd435ccd78a300204d67c617714b2930ca1e4..e1599dc54e30b05c952330647d35b31d2309bac2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2009-2010, 2013 Nick Bowler
+# Copyright © 2009-2010,2013-2014,2021 Nick Bowler
 #
 # License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 # This is free software: you are free to do what the fuck you want to.
@@ -7,10 +7,12 @@
 AUTOMAKE_OPTIONS = parallel-tests color-tests
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
-EXTRA_DIST         = m4/gnulib-cache.m4
-CLEANFILES         =
-MOSTLYCLEANFILES   =
-noinst_LTLIBRARIES =
+# For Gnulib
+MOSTLYCLEANFILES =
+EXTRA_LTLIBRARIES =
+
+EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4
+CLEANFILES = $(EXTRA_LTLIBRARIES)
 
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/src
 AM_CFLAGS = $(LIBPNG_CFLAGS) $(GTK_CFLAGS)
@@ -35,7 +37,7 @@ lbxtool_SOURCES = src/lbxtool.c src/tools.c
 lbxtool_LDADD = liblbx.la libgnu.la
 $(lbxtool_OBJECTS): $(gnulib_headers)
 
-lbximg_SOURCES = src/lbximg.c src/tools.c src/pnm.c
+lbximg_SOURCES = src/lbximg.c src/tools.c src/pnm.c src/imgoutput.h
 lbximg_LDADD = liblbx.la libgnu.la $(LIBPNG_LIBS)
 $(lbximg_OBJECTS): $(gnulib_headers)
 
@@ -44,7 +46,7 @@ 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 \
+lbxgui_SOURCES = src/gui/lbxgui.c src/gui/lbxgui.h src/gui/image.c \
        src/gui/bg.xbm
 lbxgui_LDFLAGS = $(AM_LDFLAGS) -export-dynamic
 lbxgui_LDADD = liblbx.la $(GTK_LIBS)
@@ -55,7 +57,9 @@ TAP_LOG_COMPILER = $(SHELL)
 TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' \
        $(SHELL) $(srcdir)/tests/util/tap-driver.sh
 
-TESTS = tests/empty-image.tap
+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: