This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / gnu / usr.bin / cc / cc1plus / Makefile

diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index def6f2b..2d7210f 100644 (file)
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,14 +1,24 @@
-PROG=          cc1plus
+PROG=          gcc1plus

 BINDIR=                /usr/libexec
 SRCS=          cp-parse.c cp-decl.c cp-decl2.c cp-typeck.c cp-type2.c \
                cp-tree.c cp-ptree.c cp-cvt.c cp-search.c cp-lex.c \
                cp-gc.c cp-call.c cp-class.c cp-init.c cp-method.c \
                cp-except.c cp-expr.c cp-pt.c cp-edsel.c cp-xref.c \
 BINDIR=                /usr/libexec
 SRCS=          cp-parse.c cp-decl.c cp-decl2.c cp-typeck.c cp-type2.c \
                cp-tree.c cp-ptree.c cp-cvt.c cp-search.c cp-lex.c \
                cp-gc.c cp-call.c cp-class.c cp-init.c cp-method.c \
                cp-except.c cp-expr.c cp-pt.c cp-edsel.c cp-xref.c \

-               cp-spew.c $(COMMON_SRC)
+               cp-spew.c

 
 

-CFLAGS+=        -I. -I$(.CURDIR) -I$(.CURDIR)/../common
+CFLAGS+=       -I. -I$(.CURDIR) -I$(.CURDIR)/../lib

 NOMAN=         noman
 YFLAGS=
 NOMAN=         noman
 YFLAGS=

-.PATH:          $(.CURDIR)/../common
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD= -L${.CURDIR}/../lib/obj -lgcc2
+DPADD= ${.CURDIR}../lib/obj/libgcc2.a
+.else
+LDADD= -L${.CURDIR}/../lib/ -lgcc2
+DPADD= ${.CURDIR}../lib/libgcc2.a
+.endif
+
+LDADD+=        -lgnumalloc
+DPADD+=        ${LIBGNUMALLOC}

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>