build: Use a non-recursive makefile.

diff --git a/.gitignore b/.gitignore
index 92b03e35b18460103320fb8681e19ab6f0beb8d5..553713130c3b909a73e4197adda63faeab8177aa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,10 @@
+*.o
+*.lo
+*.la
+
+lbxtool
+lbximg
+
 config.status
 config.cache
 config.guess
@@ -9,6 +16,9 @@ configure
 
 Makefile.in
 Makefile
+.libs
+.deps
+.dirstamp
 
 libtool
 ltmain.sh

diff --git a/Makefile.am b/Makefile.am
index 98eeac895b1041b35dbf94fe3ee664b7c7ccd11e..8ce94775f74d5497f9ed6b744b07be9e6e5c5882 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,9 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src doc/man
+dist_man_MANS   =
+dist_doc_DATA   =
+lib_LTLIBRARIES =
+bin_PROGRAMS    =
+
+include doc/Makefile.inc
+include src/Makefile.inc

diff --git a/configure.ac b/configure.ac
index bbc14fbcd2f1b3957c0bccd41543f539add91160..8e519e3e06ec15560675c41d9ef18530017c538f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([src/lbx.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 
 AC_PROG_CC_C99
 AC_HEADER_ASSERT
@@ -17,8 +17,6 @@ AM_CONDITIONAL([BUILD_LBXIMG], [test x"$have_libpng" = x"yes"])
 
 AC_CONFIG_FILES([
        Makefile
-       src/Makefile
-       doc/man/Makefile
 ])
 
 AC_OUTPUT

diff --git a/doc/Makefile.inc b/doc/Makefile.inc
new file mode 100644 (file)
index 0000000..b4fc605
--- /dev/null
+++ b/doc/Makefile.inc
@@ -0,0 +1,7 @@
+dist_man_MANS += doc/man/lbxtool.1
+
+if BUILD_LBXIMG
+dist_man_MANS += doc/man/lbximg.1
+endif
+
+dist_doc_DATA += doc/txt/moo2-data.txt

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
deleted file mode 100644 (file)
index e449537..0000000
--- a/doc/man/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-dist_man_MANS = lbxtool.1
-
-if BUILD_LBXIMG
-dist_man_MANS += lbximg.1
-endif

diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644 (file)
index fc61328..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.o
-*.lo
-*.la
-lbxtool
-lbximg

diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644 (file)
index 13e47a1..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-lib_LTLIBRARIES   = liblbx.la
-
-lbxdir = $(includedir)/lbx
-lbx_HEADERS   = lbx.h image.h
-
-liblbx_la_SOURCES = byteorder.h misc.h misc.c lbx.c image.c
-
-bin_PROGRAMS      = lbxtool
-lbxtool_SOURCES   = tools.h lbxtool.c
-lbxtool_LDADD     = liblbx.la
-
-if BUILD_LBXIMG
-bin_PROGRAMS     += lbximg
-lbximg_SOURCES    = tools.h lbximg.c
-lbximg_LDADD      = liblbx.la $(LIBPNG_LIBS)
-lbximg_CFLAGS     = $(LIBPNG_CFLAGS)
-endif

diff --git a/src/Makefile.inc b/src/Makefile.inc
new file mode 100644 (file)
index 0000000..063ca86
--- /dev/null
+++ b/src/Makefile.inc
@@ -0,0 +1,16 @@
+lbxdir = $(includedir)/lbx
+lbx_HEADERS = src/lbx.h src/image.h
+
+lib_LTLIBRARIES  += liblbx.la
+liblbx_la_SOURCES = src/byteorder.h src/misc.h src/misc.c src/lbx.c src/image.c
+
+bin_PROGRAMS    += lbxtool
+lbxtool_SOURCES  = src/tools.h src/lbxtool.c
+lbxtool_LDADD    = liblbx.la
+
+if BUILD_LBXIMG
+bin_PROGRAMS   += lbximg
+lbximg_SOURCES  = src/tools.h src/lbximg.c
+lbximg_LDADD    = liblbx.la $(LIBPNG_LIBS)
+lbximg_CFLAGS   = $(LIBPNG_CFLAGS)
+endif

diff --git a/tests/regress.sh b/tests/regress.sh
index 07867cef8f276c8be44f0f4b2396c9af17629e68..a752bac3488cbd71037cb33e82f779a1de569882 100755 (executable)
--- a/tests/regress.sh
+++ b/tests/regress.sh
@@ -6,8 +6,8 @@
 # Image/tool paths.  Adjust to taste.  The DATADIR must contain the original
 # Moo2 LBX archives, with filenames in lower case.
 DATADIR=$HOME/.2oom/game
-LBXTOOL="`readlink -f ../src/lbxtool`"
-LBXIMG="`readlink -f ../src/lbximg`"
+LBXTOOL="`readlink -f ../lbxtool`"
+LBXIMG="`readlink -f ../lbximg`"
 
 # Status vars
 FAILED=0