Perform a major cleanup of the usr.sbin Makefiles.

These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.

1 files changed, 15 insertions, 13 deletions

diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index 8fab2a1..6e22227 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,38 +1,40 @@
 # $FreeBSD$
 
+TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
+.PATH: ${TRACEROUTE_DISTDIR}
+
 PROG=	traceroute
 MAN=	traceroute.8
+SRCS=	version.c traceroute.c
 BINMODE=4555
-CFLAGS+=-DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SYSCTL_H=1 \
-	-DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
-	-DSTDC_HEADERS=1
+CLEANFILES=	version.c
+
+CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SYSCTL_H=1 \
+	 -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
+	 -DSTDC_HEADERS=1
 .ifndef (NOIPSEC)
-CFLAGS+=-DIPSEC
+CFLAGS+= -DIPSEC
 .endif
 # RTT Jitter on the internet these days means printing 3 decimal places on
 # > 1000ms times is plain useless.  Uncomment this to enable variable precision
 # reporting, ie: print a variable precision from 0.001ms through 1000ms
-# CFLAGS+=-DSANE_PRECISION
+# CFLAGS+= -DSANE_PRECISION
 
-SRCS=	version.c traceroute.c
-CLEANFILES+=	version.c
 .ifndef (NOIPSEC)
 DPADD=	${LIBIPSEC}
 LDADD=	-lipsec
 .endif
 
-TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
-
 .if ${MACHINE_ARCH} == "alpha"
 # gcc builtin memcpy causes unaligned access
-CFLAGS+=	-fno-builtin
+CFLAGS+= -fno-builtin
 .endif
 
-CFLAGS+=	-I${TRACEROUTE_DISTDIR}/lbl
-.PATH:	${TRACEROUTE_DISTDIR}
+CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl
 
 version.c: ${TRACEROUTE_DISTDIR}/VERSION
 	@rm -f ${.TARGET}
-	sed -e 's/.*/char version[] = "&";/' ${TRACEROUTE_DISTDIR}/VERSION > ${.TARGET}
+	sed -e 's/.*/char version[] = "&";/' ${TRACEROUTE_DISTDIR}/VERSION \
+	    > ${.TARGET}
 
 .include <bsd.prog.mk>