From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 14 Aug 2016 21:05:03 +0000 (+0100)
Subject: build-sys; do not use subdirectory object
X-Git-Tag: v0.88~38^2~1^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2555cc3a704fcf5eeccb0066c5f2438cd16c2170;p=thirdparty%2Fmtr.git

build-sys; do not use subdirectory object

None-recursive builds are quicker, and less problematic from make(1) object
tracking point of view.  See reference for full explanation.

References: http://miller.emu.id.au/pmiller/books/rmch/
---

diff --git a/Makefile.am b/Makefile.am
index fa9a2dd..03b49a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = img
+EXTRA_DIST = img/mtr_icon.xpm
 
 sbin_PROGRAMS = mtr
 man_MANS = mtr.8
diff --git a/configure.ac b/configure.ac
index 95b84e2..1679902 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,6 +199,6 @@ fi
 
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile img/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
diff --git a/img/Makefile.am b/img/Makefile.am
deleted file mode 100644
index b8679df..0000000
--- a/img/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = mtr_icon.xpm