X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/f9f3a47a274221c512a23a76dceb6b2b1ee1d6a6..30e3dd045f61a8a2e0a237074e6706461c6dd2fd:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index cd7d373..fb85562 100644
--- 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,12 +7,15 @@
 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 =
 
-AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/src
+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 \
+              -I$(top_srcdir)/common/src
 AM_CFLAGS = $(LIBPNG_CFLAGS) $(GTK_CFLAGS)
 
 dist_man_MANS = doc/man/lbxtool.1 doc/man/lbximg.1
@@ -20,10 +23,11 @@ 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 src/pack.h
+noinst_HEADERS = src/misc.h src/tools.h
 
 lib_LTLIBRARIES = liblbx.la
-liblbx_la_SOURCES = src/lbx.c src/fops.c src/image.c src/pack.c src/error.c
+liblbx_la_SOURCES = src/lbx.c src/fops.c src/image.c src/error.c \
+                    common/src/pack.c common/src/pack.h
 liblbx_la_LDFLAGS = -export-symbols-regex '^lbx_'
 
 bin_PROGRAMS = lbxtool lbximg
@@ -35,7 +39,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)
 
@@ -55,9 +59,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/pam-formats.tap tests/moo2-mainmenu.tap \
-	tests/moo2-logo.tap tests/moo2-starbg.tap tests/moo2-ships.tap \
-	tests/moo2-monster.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: