6 files changed, 16 insertions, 28 deletions

diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile
index 05ce09d66e5fb..356ecb706b42a 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@@ -1,14 +1,12 @@
-#
 # $FreeBSD$
-#
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/opcodes
 
-LIB=		opcodes
-SRCS+=		dis-buf.c disassemble.c
-CFLAGS+=	-I${SRCDIR}/opcodes -I${SRCDIR}/bfd
+LIB=	opcodes
+SRCS+=	dis-buf.c disassemble.c
+CFLAGS+= -I${SRCDIR}/opcodes -I${SRCDIR}/bfd
 NOPROFILE=	true
 NOPIC=		true
 INTERNALLIB=	true
@@ -18,9 +16,9 @@ INTERNALSTATICLIB=true
 # 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}/bfd ${BINUTILSDISTDIR}/opcodes
-CFLAGS+=	-I${BINUTILSDISTDIR}/opcodes -I${BINUTILSDISTDIR}/bfd
-CFLAGS+=	-I${BINUTILSDISTDIR}/include
+.PATH: ${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes
+CFLAGS+= -I${BINUTILSDISTDIR}/opcodes -I${BINUTILSDISTDIR}/bfd
+CFLAGS+= -I${BINUTILSDISTDIR}/include
 .endif
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
index b2f7a7912c0ba..03d911dbd73be 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		alpha-dis.c alpha-opc.c
-CFLAGS+=	-DARCH_alpha
+SRCS+=	alpha-dis.c alpha-opc.c
+CFLAGS+= -DARCH_alpha
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
index 96c0bc74af5b9..5b1ce3a96896d 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		i386-dis.c
-CFLAGS+=	-DARCH_i386
+SRCS+=	i386-dis.c
+CFLAGS+= -DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.i386 b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
index 96c0bc74af5b9..5b1ce3a96896d 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.i386
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		i386-dis.c
-CFLAGS+=	-DARCH_i386
+SRCS+=	i386-dis.c
+CFLAGS+= -DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
index 08fa527d5ff6b..cc010ec4a3060 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		ppc-dis.c ppc-opc.c
-CFLAGS+=	-DARCH_powerpc -DARCH_rs6000
+SRCS+=	ppc-dis.c ppc-opc.c
+CFLAGS+= -DARCH_powerpc -DARCH_rs6000
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64 b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
index 190b76621cc0f..e795ad494bba7 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.sparc64
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		sparc-dis.c sparc-opc.c
-CFLAGS+=	-DARCH_sparc
+SRCS+=	sparc-dis.c sparc-opc.c
+CFLAGS+= -DARCH_sparc