1 files changed, 21 insertions, 15 deletions

diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 30ab06eb9ba5..6b7c49d4d05d 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -2,33 +2,39 @@
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR}/cp
+.PATH: ${GCCDIR}/cp ${GCCDIR}
 
 PROG=	cc1plus
-SRCS=	parse.y y.tab.h parse.h
-SRCS+=	call.c class.c cvt.c decl.c decl2.c errfn.c error.c except.c expr.c \
-	friend.c init.c lex.c method.c pt.c ptree.c repo.c rtti.c \
-	search.c semantics.c sig.c spew.c tree.c typeck.c typeck2.c xref.c
+SRCS=	parse.y cfns.h
+SRCS+=	main.c cp-lang.c
+SRCS+=	call.c class.c cvt.c decl.c decl2.c         error.c except.c expr.c \
+	friend.c init.c lex.c mangle.c method.c pt.c ptree.c repo.c rtti.c \
+	search.c semantics.c spew.c tree.c typeck.c typeck2.c        dump.c optimize.c
+
 BINDIR=	/usr/libexec
 NOMAN=	1
-NOSHARED=yes
+NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/cp -I.
 
 DPADD+=	${LIBCC_INT} 
 LDADD+=	${LIBCC_INT}
 
-parse.h: y.tab.h parse.c
-	cp -p y.tab.h ${.TARGET}
-	grep '^#define[   ]*YYEMPTY' parse.c >>${.TARGET}
+CLEANFILES+=	parse.c parse.h y.tab.c y.tab.h cfns.h
 
-CLEANFILES+=	parse.h
+.ORDER: parse.c parse.h
+parse.c: parse.y
+	${YACC} ${YFLAGS} ${GCCDIR}/cp/${.TARGET:S/c$/y/}
+	sed -e "s/malloc/xmalloc/g" \
+	    -e "s/realloc/xrealloc/g" \
+	    y.tab.c >${.TARGET}
 
-CPPHDRS=	exception new new.h typeinfo
+parse.h: parse.c y.tab.h
+	cp -pf y.tab.h ${.TARGET}
+	grep '^#define[   ]*YYEMPTY' ${.TARGET:S/h$/c/} >>${.TARGET}
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${CPPHDRS:S;^;${GCCDIR}/cp/inc/;} \
-	    ${DESTDIR}/usr/include/g++
+cfns.h:
+	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' \
+	    ${GCCDIR}/cp/cfns.gperf > ${.TARGET}
 
 .include <bsd.prog.mk>