Clean up the formatting.

6 files changed, 72 insertions, 82 deletions

diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 8e81c8f..d35bf46 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -4,47 +4,47 @@
 
 .PATH: ${SRCDIR}/ld
 
-PROG=		ld
-SCRIPTDIR=	/usr/libdata/ldscripts
-SRCS+=		ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \
-		ldgram.y ldlang.c ldlex.l ldmain.c ldmisc.c \
-		ldver.c ldwrite.c lexsup.c mri.c
+PROG=	ld
+SCRIPTDIR= /usr/libdata/ldscripts
+SRCS+=	ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \
+	ldgram.y ldlang.c ldlex.l ldmain.c ldmisc.c \
+	ldver.c ldwrite.c lexsup.c mri.c
 
 .if defined(BOOTSTRAPPING) && !exists(/usr/include/elf-hints.h)
-SRCS+=		elf-hints.h
+SRCS+=	elf-hints.h
 CLEANFILES+=	elf-hints.h
 elf-hints.h:
-		ln -sf ${.CURDIR}/../../../../include/${.TARGET} .
+	ln -sf ${.CURDIR}/../../../../include/${.TARGET} .
 .endif
 
-CFLAGS+=	-DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
-CFLAGS+=	-I${SRCDIR}/ld -I${SRCDIR}/bfd
-CFLAGS+=	-DVERSION=\"${VERSION}\" -DBFD_VERSION=\"${VERSION}\"
-NOSHARED?=	yes
-DPADD=		${RELTOP}/libbfd/libbfd.a
-DPADD+=		${RELTOP}/libiberty/libiberty.a
-LDADD=		${DPADD}
+CFLAGS+= -DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
+CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
+CFLAGS+= -DVERSION=\"${VERSION}\" -DBFD_VERSION=\"${VERSION}\"
+NOSHARED?= yes
+DPADD=	${RELTOP}/libbfd/libbfd.a
+DPADD+=	${RELTOP}/libiberty/libiberty.a
+LDADD=	${DPADD}
 CLEANDIRS+=	ldscripts
 CLEANFILES+=	ldemul-list.h stringify.sed
 
 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
 # binutils release. FreeBSD only distributes the bits that are required to
 # build native architectures. BINUTILSDISTDIR is needed to build cross tools.
-.if	defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
-.PATH:		${BINUTILSDISTDIR}/ld
-CFLAGS+=	-I${BINUTILSDISTDIR}/ld
+.if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
+.PATH: ${BINUTILSDISTDIR}/ld
+CFLAGS+= -I${BINUTILSDISTDIR}/ld
 .endif
 
 EMXFR=
 EMLST=
 .for _e in ${EMS}
-EMXFR+= extern ld_emulation_xfer_type ${_e};
+EMXFR+=	extern ld_emulation_xfer_type ${_e};
 EMLST+=	&${_e},
 .endfor
 
 ldemul-list.h:
-	echo "${EMXFR}" > ldemul-list.h
-	echo "#define EMULATION_LIST ${EMLST} 0" >> ldemul-list.h
+	echo "${EMXFR}" > ${.TARGET}
+	echo "#define EMULATION_LIST ${EMLST} 0" >> ${.TARGET}
 
 stringify.sed:
 	ln -sf ${SRCDIR}/ld/emultempl/astring.sed ${.TARGET}
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index bfb9f60..43a2d8f 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -1,11 +1,9 @@
-#
 # $FreeBSD$
-#
 
-.if	${TARGET_ARCH} == "alpha"
-HOST=		alpha-unknown-freebsd
-CFLAGS+=	-DDEFAULT_EMULATION=\"elf64alpha\"
-CFLAGS+=	-DTARGET=\"alpha-unknown-freebsd\"
+.if ${TARGET_ARCH} == "alpha"
+HOST=	alpha-unknown-freebsd
+CFLAGS+= -DDEFAULT_EMULATION=\"elf64alpha\"
+CFLAGS+= -DTARGET=\"alpha-unknown-freebsd\"
 _alpha_path=	\"/usr/lib\"
 .else
 _alpha_path=	\"/usr/cross/alpha-freebsd/usr/lib\"
@@ -14,7 +12,7 @@ EMS+=		ld_elf64alpha_emulation
 LDSCRIPTS+=	elf64alpha.x elf64alpha.xbn elf64alpha.xn elf64alpha.xr \
 		elf64alpha.xs elf64alpha.xu alpha.x alpha.xbn \
 		alpha.xn alpha.xr alpha.xu
-SRCS+=		eelf64alpha.c ealpha.c
+SRCS+=	eelf64alpha.c ealpha.c
 CLEANFILES+=	eelf64alpha.c ealpha.c
 
 eelf64alpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
@@ -23,8 +21,8 @@ eelf64alpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
 	    ${HOST} alpha-unknown-freebsd alpha-unknown-freebsd \
 	    elf64alpha ""  elf64alpha alpha-unknown-freebsd
 
-ealpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
-		scripttempl/elf.sc genscripts.sh stringify.sed
+ealpha.c: emulparams/elf64alpha.sh emultempl/elf32.em scripttempl/elf.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \
 	    ${HOST} alpha-unknown-freebsd alpha-unknown-freebsd \
 	    elf64alpha ""  alpha alpha-unknown-freebsd
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 6e4a4fa..cd3fa55 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,11 +1,9 @@
-#
 # $FreeBSD$
-#
 
-.if	${TARGET_ARCH} == "i386"
-HOST=		i386-unknown-freebsd
-CFLAGS+=	-DDEFAULT_EMULATION=\"elf_i386\"
-CFLAGS+=	-DTARGET=\"i386-unknown-freebsd\"
+.if ${TARGET_ARCH} == "i386"
+HOST=	i386-unknown-freebsd
+CFLAGS+= -DDEFAULT_EMULATION=\"elf_i386\"
+CFLAGS+= -DTARGET=\"i386-unknown-freebsd\"
 _i386_path=	\"/usr/lib\"
 .else
 _i386_path=	\"/usr/cross/i386-freebsd/usr/lib\"
@@ -13,27 +11,27 @@ _i386_path=	\"/usr/cross/i386-freebsd/usr/lib\"
 EMS+=		ld_elf_i386_emulation
 LDSCRIPTS+=	elf_i386.x elf_i386.xbn elf_i386.xn elf_i386.xr \
 		elf_i386.xs elf_i386.xu
-SRCS+=		eelf_i386.c
+SRCS+=	 eelf_i386.c
 CLEANFILES+=	eelf_i386.c
 
-eelf_i386.c:	emulparams/elf_i386.sh emultempl/elf32.em \
-		scripttempl/elf.sc genscripts.sh stringify.sed
+eelf_i386.c: emulparams/elf_i386.sh emultempl/elf32.em scripttempl/elf.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \
 	    ${HOST} i386-unknown-freebsd i386-unknown-freebsd \
 	    elf_i386 "" elf_i386 i386-unknown-freebsd
 
-.if	defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
+.if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
 EMS+=		ld_i386pe_emulation
 LDSCRIPTS+=	i386pe.x	\
 		i386pe.xbn	\
 		i386pe.xn	\
 		i386pe.xr	\
 		i386pe.xu
-SRCS+=		ei386pe.c
+SRCS+=	ei386pe.c
 CLEANFILES+=	ei386pe.c
 
-ei386pe.c:	emulparams/i386pe.sh emultempl/pe.em \
-		scripttempl/pe.sc genscripts.sh stringify.sed
+ei386pe.c: emulparams/i386pe.sh emultempl/pe.em scripttempl/pe.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/winnt/lib ${HOST} i386-unknown-freebsdwinnt \
 	    i386-unknown-freebsdwinnt i386pe "" i386pe \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.m68k b/gnu/usr.bin/binutils/ld/Makefile.m68k
index 030f546..a81c33a 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.m68k
+++ b/gnu/usr.bin/binutils/ld/Makefile.m68k
@@ -1,11 +1,9 @@
-#
 # $FreeBSD$
-#
 
-.if	${TARGET_ARCH} == "m68k"
-HOST=		m68k-unknown-freebsd
-CFLAGS+=	-DDEFAULT_EMULATION=\"elf_m68k\"
-CFLAGS+=	-DTARGET=\"m68k-unknown-freebsd\"
+.if ${TARGET_ARCH} == "m68k"
+HOST=	m68k-unknown-freebsd
+CFLAGS+= -DDEFAULT_EMULATION=\"elf_m68k\"
+CFLAGS+= -DTARGET=\"m68k-unknown-freebsd\"
 _m68k_path=	\"/usr/lib\"
 .else
 _m68k_path=	\"/usr/cross/m68k-freebsd/usr/lib\"
@@ -36,19 +34,19 @@ CLEANFILES+=	em68kelf.c	\
 		em68klynx.c	\
 		em68knbsd.c
 
-em68kelf.c:	emulparams/m68kelf.sh emultempl/elf32.em \
-		scripttempl/elf.sc genscripts.sh stringify.sed
+em68kelf.c: emulparams/m68kelf.sh emultempl/elf32.em scripttempl/elf.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    ${_m68k_path} notused notused notused m68kelf "" m68kelf
 
-em68klynx.c:	emulparams/m68klynx.sh emultempl/generic.em \
-		scripttempl/m68klynx.sc genscripts.sh stringify.sed
+em68klynx.c: emulparams/m68klynx.sh emultempl/generic.em \
+    scripttempl/m68klynx.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/m68k-lynx/usr/lib notused notused notused \
 	    m68klynx "" m68klynx
 
-em68knbsd.c:	emulparams/m68knbsd.sh emultempl/generic.em \
-		scripttempl/aout.sc genscripts.sh stringify.sed
+em68knbsd.c: emulparams/m68knbsd.sh emultempl/generic.em scripttempl/aout.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/m68k-netbsdaout/usr/lib notused notused notused \
 	    m68knbsd "" m68knbsd
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index d5ce74c..59fad24 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -1,11 +1,9 @@
-#
 # $FreeBSD$
-#
 
-.if	${TARGET_ARCH} == "powerpc"
-HOST=		powerpc-unknown-freebsd
-CFLAGS+=	-DDEFAULT_EMULATION=\"elf_powerpc\"
-CFLAGS+=	-DTARGET=\"powerpc-unknown-freebsd\"
+.if ${TARGET_ARCH} == "powerpc"
+HOST=	powerpc-unknown-freebsd
+CFLAGS+= -DDEFAULT_EMULATION=\"elf_powerpc\"
+CFLAGS+= -DTARGET=\"powerpc-unknown-freebsd\"
 _powerpc_path=	\"/usr/lib\"
 .else
 _powerpc_path=	\"/usr/cross/powerpc-freebsd/usr/lib\"
@@ -60,39 +58,39 @@ CLEANFILES+=	eelf32ppc.c		\
 		eaixrs6.c		\
 		ers6000lynx.c
 
-eelf32ppc.c:	emulparams/elf32ppc.sh emultempl/elf32.em \
-		scripttempl/elfppc.sc genscripts.sh stringify.sed
+eelf32ppc.c: emulparams/elf32ppc.sh emultempl/elf32.em scripttempl/elfppc.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    ${_powerpc_path} ${HOST} powerpc-unknown-freebsd \
 	    powerpc-unknown-freebsd elf32ppc "" elf32ppc
 
-eppcmacos.c:	emulparams/ppcmacos.sh emultempl/aix.em \
-		scripttempl/aix.sc genscripts.sh stringify.sed
+eppcmacos.c: emulparams/ppcmacos.sh emultempl/aix.em scripttempl/aix.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/powerpc_macos/usr/lib ${HOST} \
 	    powerpc-unknown-freebsdmacos \
 	    powerpc-unknown-freebsdmacos ppcmacos "" ppcmacos
 
-eppcnw.c:	emulparams/ppcnw.sh emultempl/elf32.em \
-		scripttempl/nw.sc genscripts.sh stringify.sed
+eppcnw.c: emulparams/ppcnw.sh emultempl/elf32.em scripttempl/nw.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/powerpc_nw/usr/lib ${HOST} powerpc-unknown-freebsdnw \
 	    powerpc-unknown-freebsdnw ppcnw "" ppcnw
 
-eppcpe.c:	emulparams/ppcpe.sh emultempl/pe.em \
-		scripttempl/ppcpe.sc genscripts.sh stringify.sed
+eppcpe.c: emulparams/ppcpe.sh emultempl/pe.em scripttempl/ppcpe.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/powerpc_pe/usr/lib ${HOST} powerpc-unknown-freebsdpe \
 	    powerpc-unknown-freebsdpe ppcpe "" ppcpe
 
-eaixrs6.c:	emulparams/aixrs6.sh emultempl/aix.em \
-		scripttempl/aix.sc genscripts.sh stringify.sed
+eaixrs6.c: emulparams/aixrs6.sh emultempl/aix.em scripttempl/aix.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/rs6000-lynx/lib ${HOST} aixcoff-rs6000 \
 	    aixcoff-rs6000 aixrs6 "" aixrs6
 
-ers6000lynx.c:	emulparams/rs6000lynx.sh emultempl/aix.em \
-		scripttempl/aix.sc genscripts.sh stringify.sed
+ers6000lynx.c: emulparams/rs6000lynx.sh emultempl/aix.em scripttempl/aix.sc \
+    genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/rs6000-lynx/lib ${HOST} aixcoff-rs6000 \
 	    aixcoff-rs6000 rs6000lynx "" rs6000lynx
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc64 b/gnu/usr.bin/binutils/ld/Makefile.sparc64
index 018b3d8..a227867 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc64
@@ -1,11 +1,9 @@
-#
 # $FreeBSD$
-#
 
-.if	${TARGET_ARCH} == "sparc64"
-HOST=		sparc64-unknown-freebsd
-CFLAGS+=	-DDEFAULT_EMULATION=\"elf32_sparc\"
-CFLAGS+=	-DTARGET=\"sparc64-unknown-freebsd\"
+.if ${TARGET_ARCH} == "sparc64"
+HOST=	sparc64-unknown-freebsd
+CFLAGS+= -DDEFAULT_EMULATION=\"elf32_sparc\"
+CFLAGS+= -DTARGET=\"sparc64-unknown-freebsd\"
 _sparc_path=	\"/usr/lib\"
 .else
 _sparc_path=	\"/usr/cross/sparc-freebsd/usr/lib\"
@@ -23,14 +21,14 @@ LDSCRIPTS+=	elf32_sparc.x elf32_sparc.xbn elf32_sparc.xn elf32_sparc.xr \
 SRCS+=		eelf32_sparc.c
 CLEANFILES+=	eelf32_sparc.c
 
-eelf64_sparc.c:	emulparams/elf64_sparc.sh emultempl/elf32.em \
-		scripttempl/elf.sc genscripts.sh stringify.sed
+eelf64_sparc.c: emulparams/elf64_sparc.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_sparc_path} \
 	    ${HOST} sparc64-unknown-freebsd sparc64-unknown-freebsd \
 	    elf64_sparc "" elf64_sparc sparc64-unknown-freebsd
 
-eelf32_sparc.c:	emulparams/elf32_sparc.sh emultempl/elf32.em \
-		scripttempl/elf.sc genscripts.sh stringify.sed
+eelf32_sparc.c: emulparams/elf32_sparc.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_sparc_path} \
 	    ${HOST} sparc64-unknown-freebsd sparc64-unknown-freebsd \
 	    elf32_sparc "" elf32_sparc sparc64-unknown-freebsd