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.

5 files changed, 13 insertions, 9 deletions

diff --git a/usr.sbin/crunch/Makefile b/usr.sbin/crunch/Makefile
index a38e0b9..6bf600f 100644
--- a/usr.sbin/crunch/Makefile
+++ b/usr.sbin/crunch/Makefile
@@ -1,4 +1,5 @@
+# $FreeBSD$
 
-SUBDIR=crunchgen crunchide
+SUBDIR=	crunchgen crunchide
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc
index da42105..f8ffe67 100644
--- a/usr.sbin/crunch/Makefile.inc
+++ b/usr.sbin/crunch/Makefile.inc
@@ -1,2 +1,4 @@
+# $FreeBSD$
+
 # modify to taste
 BINDIR?= /usr/bin
diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile
index 51fa8a7..8d0a78b 100644
--- a/usr.sbin/crunch/crunchgen/Makefile
+++ b/usr.sbin/crunch/crunchgen/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-PROG=crunchgen
-SRCS=crunchgen.c crunched_skel.c
+PROG=	crunchgen
+SRCS=	crunchgen.c crunched_skel.c
 CLEANFILES+= crunched_skel.c
 
 crunched_skel.c: crunched_main.c
diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile
index d7abd44..b03e1f5 100644
--- a/usr.sbin/crunch/crunchide/Makefile
+++ b/usr.sbin/crunch/crunchide/Makefile
@@ -1,6 +1,6 @@
+# $FreeBSD$
 
 PROG=   crunchide
-
 SRCS=	crunchide.c exec_aout.c exec_elf32.c exec_elf64.c
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile
index 861e302..5ff5263 100644
--- a/usr.sbin/crunch/examples/Makefile
+++ b/usr.sbin/crunch/examples/Makefile
@@ -1,5 +1,6 @@
+# $FreeBSD$
 
-CRUNCHED=   fixit
+CRUNCHED=	fixit
 
 # below is boiler-plate to make $(CRUNCHED) from $(CRUNCHED).conf
 # I'd use PROG instead of CRUNCHED, but the system makefiles REALLY want
@@ -8,11 +9,11 @@ CRUNCHED=   fixit
 CONF=	$(CRUNCHED).conf
 
 OUTMK=	$(CRUNCHED).mk
-OUTPUTS=  $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache
+OUTPUTS= $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache
 
-NOMAN=
-CLEANFILES+=$(CRUNCHED) *.o *.lo *.c *.mk *.cache
-CLEANDIRFILES+=$(OUTPUTS)
+NOMAN=	#true
+CLEANFILES+= $(CRUNCHED) *.o *.lo *.c *.mk *.cache
+CLEANDIRFILES+= $(OUTPUTS)
 
 all: $(CRUNCHED)
 exe: $(CRUNCHED)