9 files changed, 19 insertions, 25 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 74e88b88840a1..cbec53bd4594b 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
 PGMDIR=	cc_int cpp cc1 cc cc1plus c++ libgcc
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index d3a8b22744a8d..f18c27845b035 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../include
@@ -19,4 +19,4 @@ LIBDESTDIR=	${.CURDIR}/../cc_int
 
 # XXX LDDESTDIR isn't a directory and there is no standard name for the dir
 LDDESTDIR=	-L${LIBDESTDIR}
-LIBCC_INT=	${LIBDESTDIR}/libcc_int.a
+LIBCC_INT=	${LIBDESTDIR}/libcc_int.so.26.0
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index 6b400b6122fcd..3c9351e4b295e 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,12 +1,10 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
 PROG =	c++
 SRCS =	g++.c
 BINDIR=	/usr/bin
 NOMAN=	1
-DPADD+=	${LIBCC_INT}
-LDADD+=	-lcc_int
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 44fabc5168e3a..8d9caae955264 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,11 +1,10 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
+.PATH:	${.CURDIR}/../cc_int
 PROG =	cc
-SRCS =	gcc.c
+SRCS =	gcc.c obstack.c version.c
 BINDIR=	/usr/bin
-DPADD+=	${LIBCC_INT}
-LDADD+=	-lcc_int
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 7cbe60bbe4fab..3ef7608333564 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
 PROG =	cc1
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index d41934b0fcb78..22bdba3606dbc 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
 PROG =	cc1plus
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 794d760910a1b..aae7fb53e7a6c 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,12 +1,11 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
 SRCS =	aux-output.c bc-emit.c bc-optab.c c-common.c caller-save.c calls.c combine.c convert.c cse.c dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c final.c flow.c fold-const.c function.c getpwd.c global.c insn-attrtab.c insn-emit.c insn-extract.c insn-opinit.c insn-output.c insn-peep.c insn-recog.c integrate.c jump.c local-alloc.c loop.c obstack.c optabs.c print-rtl.c print-tree.c real.c recog.c reg-stack.c regclass.c reload.c reload1.c reorg.c rtl.c rtlanal.c sched.c sdbout.c stmt.c stor-layout.c stupid.c toplev.c tree.c unroll.c varasm.c version.c xcoffout.c
 LIB =	cc_int
-NOPROFILE=	1
-
-install:
-	@true
+INTERNALLIB=
+SHLIB_MAJOR=26
+SHLIB_MINOR=0
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/cccp/Makefile b/gnu/usr.bin/cc/cccp/Makefile
index b7e09c216bb06..0bbc198d9d316 100644
--- a/gnu/usr.bin/cc/cccp/Makefile
+++ b/gnu/usr.bin/cc/cccp/Makefile
@@ -1,11 +1,10 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
+.PATH:	${.CURDIR}/../cc_int
 PROG =	cpp
-SRCS =	cccp.c cexp.c
+SRCS =	cccp.c cexp.c obstack.c version.c
 BINDIR=	/usr/libexec
-DPADD+=	${LIBCC_INT}
-LDADD+=	-lcc_int
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index b7e09c216bb06..0bbc198d9d316 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,11 +1,10 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
+.PATH:	${.CURDIR}/../cc_int
 PROG =	cpp
-SRCS =	cccp.c cexp.c
+SRCS =	cccp.c cexp.c obstack.c version.c
 BINDIR=	/usr/libexec
-DPADD+=	${LIBCC_INT}
-LDADD+=	-lcc_int
 
 .include <bsd.prog.mk>