This commit was generated by cvs2svn to track changes on a CVS vendor

[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 46388e3..2d7210f 100644 (file)
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -4,16 +4,21 @@ 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-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 
+               cp-spew.c

 
 

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

 NOMAN=         noman
 YFLAGS=
 
 .if exists(${.CURDIR}/../lib/obj)
 NOMAN=         noman
 YFLAGS=
 
 .if exists(${.CURDIR}/../lib/obj)

-LDADD=  -L${.CURDIR}/../lib/obj -lgcc2
+LDADD= -L${.CURDIR}/../lib/obj -lgcc2
+DPADD= ${.CURDIR}../lib/obj/libgcc2.a

 .else
 .else

-LDADD=  -L${.CURDIR}/../lib/ -lgcc2
+LDADD= -L${.CURDIR}/../lib/ -lgcc2
+DPADD= ${.CURDIR}../lib/libgcc2.a

 .endif
 
 .endif
 

+LDADD+=        -lgnumalloc
+DPADD+=        ${LIBGNUMALLOC}
+

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