build-sys: remove old dist Makefile kludge

Autotools dist works, there is no longer need for this.

diff --git a/Makefile.am b/Makefile.am
index 93d3fd1fc1b62de570bd76c18dd27f1f0d0ba3e0..f58c13341c147a92c52a562799e4ce0e98ff9ce9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
-EXTRA_DIST = img/mtr_icon.xpm
+EXTRA_DIST = SECURITY img/mtr_icon.xpm
 
 sbin_PROGRAMS = mtr
-man_MANS = mtr.8
+dist_man_MANS = mtr.8
 install-exec-hook: 
        `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr` \
        || chmod u+s $(DESTDIR)$(sbindir)/mtr
@@ -43,11 +43,3 @@ version.h: version.h.tmp Makefile $(mtr_SOURCES)
            -e "/#define *MTR_VERSION */{s/\"\([^\"]*\)\"/\"\1$$xver\"/;}" \
            version.h.tmp > $@; \
        fi;
-
-EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
-distclean-local:
-       (sleep 3; cp Makefile.dist Makefile) &
-       rm -f *.orig
-
-DISTCLEANFILES = *~
-

diff --git a/Makefile.dist b/Makefile.dist
deleted file mode 100644 (file)
index a0ea2d1..0000000
--- a/Makefile.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# This is an attempt on simplifying the compilation of mtr to a simple "make". 
-#
-
-firstrule: 
-       ./configure 
-       $(MAKE)
-
-clean: 
-       rm -f *.o *~ core
-
-distclean: clean
-       rm -f mtr config.cache config.status config.log \
-                 stamp-h stamp-h[0-9]* TAGS ID
-