More fixing with the build system

10 files changed, 27 insertions, 171 deletions

diff --git a/Makefile.am b/Makefile.am
index 0f1ed7a..72c315e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 # arping/Makefile.am
 #
-AUTOMAKE_OPTIONS = foreign
+include $(top_srcdir)/Makefile.am.common
+
 SUBDIRS=src doc
 
 mrproper: maintainer-clean
diff --git a/Makefile.am.common b/Makefile.am.common
new file mode 100644
index 0000000..7591fde
--- /dev/null
+++ b/Makefile.am.common
@@ -0,0 +1,3 @@
+AUTOMAKE_OPTIONS = foreign
+DISTCLEANFILES = *~
+
diff --git a/Makefile.in b/Makefile.in
index 7ae5cab..d49ba80 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,11 +32,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure INSTALL config.guess config.sub \
-	depcomp install-sh missing
+	$(top_srcdir)/Makefile.am.common $(top_srcdir)/configure \
+	INSTALL config.guess config.sub depcomp install-sh missing
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -168,10 +168,11 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign
+DISTCLEANFILES = *~
 
 # arping/Makefile.am
 #
-AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src doc
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -179,7 +180,7 @@ all: config.h
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -531,6 +532,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/arping.8 b/arping.8
deleted file mode 100644
index 72b38a5..0000000
--- a/arping.8
+++ /dev/null
@@ -1,152 +0,0 @@
-.TH "arping" "8" "21th June, 2003" "arping" ""
-
-.PP 
-.SH "NAME"
-arping \- sends arp and/or ip pings to a given host
-.PP 
-.SH "SYNOPSIS"
-\fBarping\fP [-abdDFhpqrRd0uv] [-S \fIhost/ip\fP] [-T \fIhost/ip\fP] [-s \fIMAC\fP]    [-t \fIMAC\fP] [-c \fIcount\fP] [-i \fIinterface\fP] [ -w \fIus\fP ] <\fIhost\fP | -B>
-.PP 
-\fBarping\fP --help
-.PP 
-.SH "DESCRIPTION"
-The \fIarping\fP utility sends \fBARP\fP and/or \fBICMP\fP requests to the specified \fIhost\fP and displays the replies\&. The \fIhost\fP may be specified by its \fBhostname\fP, its \fBIP\fP address, or its \fBMAC\fP address\&.
-.PP 
-One request is sent each second\&.
-.PP 
-When pinging an IP an ARP who-has query is sent\&. When pinging a MAC
-address a directed broadcast ICMP Echo request is sent\&. For more
-technical explaination and an FAQ, see the README file\&.
-.PP 
-\fINote on timing\fP
-.PP 
-ARP packets are usually replied to (on a LAN) so fast that the OS task
-scheduler can\&'t keep up to get exact enough timing\&.
-On an idle system the roundtrip times will be pretty much accurate, but
-with more load the timing gets less exact\&.
-.PP 
-To get more exact timing on a non-idle system, re-nice arping to -15 or so\&.
-.PP 
-# nice -n -15 arping foobar
-.PP 
-This is not just an issue with arping, it is with normal ping also
-(at least it is on my system)\&. But it doesn\&'t show up as much with ping
-since arping packets (when pinging IP) doesn\&'t traverse the IP stack when
-received and are therefore replied to faster\&.
-.PP 
-.SH "OPTIONS"
-
-.PP 
-.IP "--help"
-Show extended help\&. Not quite as extensive as this manpage,
-but more than -h\&.
-.IP "-0"
-Use this option to ping with source IP address 0\&.0\&.0\&.0\&. Use this
-when you haven\&'t configured your interface yet\&.
-Note that this may get the MAC-ping unanswered\&.
-This is an alias for -S 0\&.0\&.0\&.0\&.
-.IP "-a"
-Audible ping\&.
-.IP "-A"
-Only count addresses matching requested address (This *WILL*
-break most things you do\&. Only useful if you are arpinging many
-hosts at once\&. See arping-scan-net\&.sh for an example)\&.
-.IP "-b"
-Like -0 but source broadcast source address (255\&.255\&.255\&.255)\&.
-Note that this may get the arping unanswered since it\&'s not normal behavior
-for a host\&.
-.IP "-B"
-Use instead of host if you want to address 255\&.255\&.255\&.255\&.
-.IP "-c \fIcount\fP"
-Only send \fIcount\fP requests\&.
-.IP "-d"
-Find duplicate replies\&.
-.IP "-D"
-Display answers as dots and missing packets as exclamation points\&.
-Like flood ping on a Cisco\&.
-.IP "-F"
-Don\&'t try to be smart about the interface name\&. Even if this
-switch is not given, -i disables this smartness\&.
-.IP "-h"
-Displays a help message and exits\&.
-.IP "-i \fIinterface\fP"
-Don\&'t guess, use the specified interface\&.
-.IP "-p"
-Turn on promiscious mode on interface, use this if you don\&'t
-"own" the MAC address you are using\&.
-.IP "-q"
-Does not display messages, except error messages\&.
-.IP "-r"
-Raw output: only the MAC/IP address is displayed for each reply\&.
-.IP "-R"
-Raw output: Like -r but shows "the other one", can be combined with
--r\&.
-.IP "-s \fIMAC\fP"
-Set source MAC address\&. You may need to use -p with this\&.
-.IP "-S \fIIP\fP"
-Like -b and -0 but with set source address\&.
-Note that this may get the arping unanswered if the target does not have
-routing to the IP\&. If you don\&'t own the IP you are using, you may need to turn
-on promiscious mode on the interface (with -p)\&. With this switch you can find
-out what IP-address a host has without taking an IP-address yourself\&.
-.IP "-t \fIMAC\fP"
-Set target MAC address to use when pinging IP address\&.
-.IP "-T \fIIP\fP"
-Use -T as target address when pinging MACs that won\&'t
-respond to a broadcast ping but perhaps to a directed broadcast\&.
-.IP 
-\fIExample\fP:                                                                To check the address of MAC-A, use knowledge of MAC-B and IP-B\&.
-.IP 
-$ arping -S <IP-B> -s <MAC-B> -p <MAC-A>
-.IP "-u"
-Show index=received/sent instead of just index=received when
-pinging MACs\&.
-.IP "-v"
-Verbose output\&. Use twice for more messages\&.
-.IP "-w"
-Time to wait between pings, in microseconds\&.
-
-.PP 
-.SH "EXAMPLES"
-.nf
-.sp
-# \fBarping -c 3 88\&.123\&.180\&.225\fP
-ARPING 88\&.123\&.180\&.225
-60 bytes from 00:11:85:4c:01:01 (88\&.123\&.180\&.225): index=0 time=13\&.910 msec
-60 bytes from 00:11:85:4c:01:01 (88\&.123\&.180\&.225): index=1 time=13\&.935 msec
-60 bytes from 00:11:85:4c:01:01 (88\&.123\&.180\&.225): index=2 time=13\&.944 msec
-.PP 
---- 88\&.123\&.180\&.225 statistics ---
-3 packets transmitted, 3 packets received,   0% unanswered
-.PP 
-# \fBarping -c 3 00:11:85:4c:01:01\fP
-ARPING 00:11:85:4c:01:01
-60 bytes from 88\&.123\&.180\&.225 (00:11:85:4c:01:01): icmp_seq=0 time=13\&.367 msec
-60 bytes from 88\&.123\&.180\&.225 (00:11:85:4c:01:01): icmp_seq=1 time=13\&.929 msec
-60 bytes from 88\&.123\&.180\&.225 (00:11:85:4c:01:01): icmp_seq=2 time=13\&.929 msec
-.PP 
---- 00:11:85:4c:01:01 statistics ---
-3 packets transmitted, 3 packets received,   0% unanswered
-.PP 
-.fi
-.in
-.PP 
-.SH "BUGS"
-
-.PP 
-You have to use -B instead of arpinging 255\&.255\&.255\&.255, and -b
-instead of -S 255\&.255\&.255\&.255\&. This is libnets fault\&.
-.PP 
-.SH "SEE ALSO"
-
-.PP 
-\fBping(8)\fP, \fBarp(8)\fP, \fBrarp(8)\fP
-.PP 
-.SH "AUTHOR"
-
-.PP 
-Arping was written by Thomas Habets <thomas@habets\&.pp\&.se>\&.
-.PP 
-http://www\&.habets\&.pp\&.se/synscan/
-.PP 
-git clone http://github\&.com/ThomasHabets/arping\&.git
diff --git a/configure b/configure
index 115a359..bed6495 100755
--- a/configure
+++ b/configure
@@ -5998,7 +5998,6 @@ fi
 done
 
 
-echo $target_os
 case "$target_os" in
      *linux*)
           case " $LIBOBJS " in
diff --git a/configure.ac b/configure.ac
index 507ca57..a329e1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,6 @@ AC_FUNC_SETVBUF_REVERSED
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([gettimeofday memset select strchr strdup strerror strstr])
 
-echo $target_os
 case "$target_os" in
      *linux*)
           AC_LIBOBJ([findif_linux])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 786d1c8..725ba02 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,7 @@
 # arping/doc/Makefile.am
 #
-AUTOMAKE_OPTIONS = foreign
+include $(top_srcdir)/Makefile.am.common
+
 man_MANS = arping.8
 arping.8:
 	yodl2man -o arping.8 arping.yodl
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 40c6957..3340a05 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -32,8 +32,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/Makefile.am.common
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -145,15 +146,16 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign
+DISTCLEANFILES = *~
 
 # arping/doc/Makefile.am
 #
-AUTOMAKE_OPTIONS = foreign
 man_MANS = arping.8
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -287,6 +289,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f71ae4..1590deb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,5 @@
 # arping/Makefile.am
-
-AUTOMAKE_OPTIONS = foreign
+include $(top_srcdir)/Makefile.am.common
 
 sbin_PROGRAMS = arping
 arping_SOURCES = arping.c
diff --git a/src/Makefile.in b/src/Makefile.in
index e6a0e58..222aa01 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-# arping/Makefile.am
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,10 +33,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/Makefile.am.common findif_linux.c findif_other.c \
+	memcmp.c
 sbin_PROGRAMS = arping$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	findif_linux.c findif_other.c memcmp.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -162,13 +161,14 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
+DISTCLEANFILES = *~
 arping_SOURCES = arping.c
 arping_LDADD = $(LIBOBJS)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -349,6 +349,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"