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 fa9a2ddb2221095ca2948d8ce0520cbd6ad197b1..03b49a1853751580fa1cb0dd528cba185e08d1eb 100644 (file)
--- 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 95b84e27bd18e4ffb39ab2cd20a4fa2e129b61e6..1679902a9d5791b4c8165b7ab462e311cb21be9a 100644 (file)
--- 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 (file)
index b8679df..0000000
--- a/img/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = mtr_icon.xpm