7 files changed, 15 insertions, 7 deletions

diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index ce2f8980dc3a..8e188f16262f 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -8,6 +8,7 @@ PROG=	c++filt
 SRCS=	cplus-dem.c getopt.c getopt1.c underscore.c
 BINDIR=	/usr/libexec/${OBJFORMAT}
 NOMAN=	1
+
 CFLAGS+= -DMAIN -DIN_GCC -DVERSION=\"$(version)\"
 
 CLEANFILES= tmp-dum.c tmp-dum.s underscore.c
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index aacd46ceaa4e..b22524a7ebdd 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -11,6 +11,7 @@ SRCS=	c-parse.c \
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
+
 DPADD+=	${LIBCC_INT} 
 LDADD+=	${LIBCC_INT}
 
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index ac4c5732699f..1251e6c240cd 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -12,9 +12,10 @@ SRCS+=	c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c c-lex.c \
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
-DPADD+=	${LIBCC_INT} 
-LDADD+=	${LIBCC_INT}
 
 CFLAGS+= -I${GCCDIR}/objc
 
+DPADD+=	${LIBCC_INT} 
+LDADD+=	${LIBCC_INT}
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index e68fd305f8af..2f27946045b8 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -14,9 +14,11 @@ SRCS+=	call.c class.c cvt.c decl.c decl2.c errfn.c error.c except.c expr.c \
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
+
+CFLAGS+= -I${GCCDIR}/cp -I.
+
 DPADD+=	${LIBCC_INT} 
 LDADD+=	${LIBCC_INT}
-CFLAGS+= -I${GCCDIR}/cp -I.
 
 .ORDER: parse.c parse.h
 parse.c parse.h: parse.y
diff --git a/gnu/usr.bin/cc/cccp/Makefile b/gnu/usr.bin/cc/cccp/Makefile
index d8ff4ae2fe04..8401a1129339 100644
--- a/gnu/usr.bin/cc/cccp/Makefile
+++ b/gnu/usr.bin/cc/cccp/Makefile
@@ -6,10 +6,11 @@
 
 PROG=	cpp
 SRCS=	cccp.c cexp.y obstack.c prefix.c version.c
-CFLAGS+= -DPREFIX=\"/usr\"
 YFLAGS=
 BINDIR=	/usr/libexec
 MAN1=	cccp.1
 MLINKS=	cccp.1 cpp.1
 
+CFLAGS+= -DPREFIX=\"/usr\"
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index d8ff4ae2fe04..8401a1129339 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -6,10 +6,11 @@
 
 PROG=	cpp
 SRCS=	cccp.c cexp.y obstack.c prefix.c version.c
-CFLAGS+= -DPREFIX=\"/usr\"
 YFLAGS=
 BINDIR=	/usr/libexec
 MAN1=	cccp.1
 MLINKS=	cccp.1 cpp.1
 
+CFLAGS+= -DPREFIX=\"/usr\"
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile
index 4a2ba4066364..fb242b10db73 100644
--- a/gnu/usr.bin/cc/f771/Makefile
+++ b/gnu/usr.bin/cc/f771/Makefile
@@ -11,11 +11,12 @@ SRCS=	bad.c bit.c bld.c com.c data.c equiv.c expr.c global.c implic.c info.c \
 	stw.c symbol.c target.c top.c type.c version.c where.c
 BINDIR=	/usr/libexec
 NOMAN=
-DPADD=	${LIBCC_INT} 
-LDADD=	${LIBCC_INT}
 
 CFLAGS+= -I${GCCDIR}/f -I.
 
+DPADD=	${LIBCC_INT} 
+LDADD=	${LIBCC_INT}
+
 build-tools: fini
 
 fini: fini.o proj.o