On Fri, May 10, 2002 at 01:54:50AM -0700, David E. O'Brien wrote: > obrien 2002/05/10 01:54:50 PDT > > Modified files: > gnu/lib/csu Makefile > gnu/lib/libgcc Makefile > gnu/lib/libiberty Makefile > gnu/lib/libobjc Makefile > gnu/lib/libstdc++ Makefile config.h > gnu/lib/libsupc++ Makefile > gnu/usr.bin/cc Makefile Makefile.fe Makefile.inc > Makefile.tgt > gnu/usr.bin/cc/c++ Makefile > gnu/usr.bin/cc/c++filt Makefile > gnu/usr.bin/cc/cc Makefile > gnu/usr.bin/cc/cc1 Makefile > gnu/usr.bin/cc/cc1obj Makefile > gnu/usr.bin/cc/cc1plus Makefile > gnu/usr.bin/cc/cc_drv Makefile > gnu/usr.bin/cc/cc_fbsd Makefile > gnu/usr.bin/cc/cc_int Makefile > gnu/usr.bin/cc/cc_tools Makefile auto-host.h freebsd-native.h > gnu/usr.bin/cc/cccp Makefile > gnu/usr.bin/cc/collect2 Makefile > gnu/usr.bin/cc/cpp Makefile > gnu/usr.bin/cc/cpp0 Makefile > gnu/usr.bin/cc/doc Makefile > gnu/usr.bin/cc/f77 Makefile > gnu/usr.bin/cc/f771 Makefile > gnu/usr.bin/cc/f77doc Makefile > gnu/usr.bin/cc/gcov Makefile > gnu/usr.bin/cc/protoize Makefile > gnu/usr.bin/cc/tradcpp0 Makefile > Log: > Bmake bits for Gcc 3.1. > > Partially made possible by: [EMAIL PROTECTED] > This also vanished my YACC building fixes and broke world while attempting to build `cc1plus' in a cross-tools stage. The changes below fix this and CLEANFILES.
(David, I'm copying -current so that others may benefit from this
patch while you're asleep.)
%%%
Index: cc1/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- cc1/Makefile 10 May 2002 08:54:45 -0000 1.26
+++ cc1/Makefile 10 May 2002 14:54:51 -0000
@@ -2,10 +2,10 @@
.include "../Makefile.inc"
-.PATH: ../cc_tools ${GCCDIR}
+.PATH: ${GCCDIR}
PROG= cc1
-SRCS= main.c c-parse.c c-lang.c c-decl.c
+SRCS= main.c c-parse.y c-lang.c c-decl.c
BINDIR= /usr/libexec
NOMAN= 1
NOSHARED?=yes
@@ -17,17 +17,14 @@
#-----------------------------------------------------------------------
# C parser
-.ORDER: c-parse.c
-c-parse.c: c-parse.in
+c-parse.y: c-parse.in
sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
-e "/^ifc$$/d" \
-e "/^end ifc$$/d" \
- ${GCCDIR}/c-parse.in > c-parse.y
- ${YACC} -o c-parse.c.in c-parse.y
- sed -e "s/malloc/xmalloc/g" \
+ -e "s/malloc/xmalloc/g" \
-e "s/realloc/xrealloc/g" \
- c-parse.c.in >c-parse.c
+ ${.ALLSRC} > ${.TARGET}
-CLEANFILES+= c-parse.c c-parse.y # insurance
+CLEANFILES= c-parse.y
.include <bsd.prog.mk>
Index: cc1obj/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1obj/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- cc1obj/Makefile 10 May 2002 08:54:46 -0000 1.20
+++ cc1obj/Makefile 10 May 2002 14:54:51 -0000
@@ -2,10 +2,10 @@
.include "../Makefile.inc"
-.PATH: ../cc_tools ${GCCDIR}/objc ${GCCDIR}
+.PATH: ${GCCDIR}/objc ${GCCDIR}
PROG= cc1obj
-SRCS= objc-parse.c objc-act.c objc-lang.c main.c c-decl.c
+SRCS= objc-parse.y objc-act.c objc-lang.c main.c c-decl.c
BINDIR= /usr/libexec
NOMAN= 1
NOSHARED?=yes
@@ -17,18 +17,16 @@
#-----------------------------------------------------------------------
# objc parser
-.ORDER: objc-parse.c
-objc-parse.c: c-parse.in
+
+objc-parse.y: c-parse.in
sed -e "/^ifc$$/,/^end ifc$$/d" \
-e "/^ifobjc$$/d" \
-e "/^end ifobjc$$/d" \
- ${GCCDIR}/c-parse.in > objc-parse.y
- ${YACC} -o objc-parse.c.in objc-parse.y
- sed -e "s/malloc/xmalloc/g" \
+ -e "s/malloc/xmalloc/g" \
-e "s/realloc/xrealloc/g" \
- objc-parse.c.in >objc-parse.c
+ ${.ALLSRC} > ${.TARGET}
-CLEANFILES+= objc-parse.c objc-parse.y # insurance
+CLEANFILES+= objc-parse.y
#-----------------------------------------------------------------------
Index: cc1plus/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc1plus/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- cc1plus/Makefile 10 May 2002 08:54:46 -0000 1.27
+++ cc1plus/Makefile 10 May 2002 14:54:51 -0000
@@ -5,7 +5,7 @@
.PATH: ${GCCDIR}/cp ${GCCDIR}
PROG= cc1plus
-SRCS= parse.y cfns.h
+SRCS= parse.y y.tab.h parse.h 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 \
@@ -20,21 +20,19 @@
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
-CLEANFILES+= parse.c parse.h y.tab.c y.tab.h cfns.h
+CLEANFILES= parse.y parse.h cfns.h
-.ORDER: parse.c parse.h
-parse.c: parse.y
- ${YACC} ${YFLAGS} ${GCCDIR}/cp/${.TARGET:S/c$/y/}
+parse.y: ${GCCDIR}/cp/parse.y
sed -e "s/malloc/xmalloc/g" \
-e "s/realloc/xrealloc/g" \
- y.tab.c >${.TARGET}
+ ${.ALLSRC} > ${.TARGET}
parse.h: parse.c y.tab.h
- cp -pf y.tab.h ${.TARGET}
- grep '^#define[ ]*YYEMPTY' ${.TARGET:S/h$/c/} >>${.TARGET}
+ cp -p y.tab.h ${.TARGET}
+ grep '^#define[ ]*YYEMPTY' parse.c >>${.TARGET}
-cfns.h:
+cfns.h: cfns.gperf
gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' \
- ${GCCDIR}/cp/cfns.gperf > ${.TARGET}
+ ${.ALLSRC} > ${.TARGET}
.include <bsd.prog.mk>
Index: cpp0/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/cc/cpp0/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- cpp0/Makefile 10 May 2002 08:54:47 -0000 1.3
+++ cpp0/Makefile 10 May 2002 14:54:51 -0000
@@ -5,7 +5,7 @@
.PATH: ${GCCDIR}
PROG= cpp0
-SRCS= cppmain.c c-parse.c c-lang.c c-decl.c
+SRCS= cppmain.c c-parse.y c-lang.c c-decl.c
BINDIR= /usr/libexec
NOMAN= 1
@@ -16,18 +16,16 @@
#-----------------------------------------------------------------------
# C parser
-.ORDER: c-parse.c
-c-parse.c: c-parse.in
+
+c-parse.y: c-parse.in
sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
-e "/^ifc$$/d" \
-e "/^end ifc$$/d" \
- ${GCCDIR}/c-parse.in > c-parse.y
- ${YACC} -o c-parse.c.in c-parse.y
- sed -e "s/malloc/xmalloc/g" \
+ -e "s/malloc/xmalloc/g" \
-e "s/realloc/xrealloc/g" \
- c-parse.c.in >c-parse.c
+ ${.ALLSRC} > ${.TARGET}
-CLEANFILES+= c-parse.c c-parse.y # insurance
+CLEANFILES+= c-parse.y
#-----------------------------------------------------------------------
Index: tradcpp0/Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/cc/tradcpp0/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- tradcpp0/Makefile 10 May 2002 08:54:50 -0000 1.2
+++ tradcpp0/Makefile 10 May 2002 14:54:51 -0000
@@ -5,18 +5,18 @@
.PATH: ${GCCDIR}
PROG= tradcpp0
-SRCS= tradcpp.c tradcif.c
+SRCS= tradcpp.c tradcif.y
BINDIR= /usr/libexec
NOMAN= 1
DPADD+= ${LIBCC_INT}
LDADD+= ${LIBCC_INT}
-# ${YACC} ${GCCDIR}/tradcif.y
-tradcif.c: tradcif.y
- ${YACC} ${.ALLSRC}
+tradcif.y: ${GCCDIR}/tradcif.y
sed -e "s/malloc/xmalloc/g" \
-e "s/realloc/xrealloc/g" \
- y.tab.c >${.TARGET}
+ ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES= tradcif.y
.include <bsd.prog.mk>
%%%
Now back to my <bsd.inc.mk> testing...
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
[EMAIL PROTECTED] Sunbay Software AG,
[EMAIL PROTECTED] FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
msg38135/pgp00000.pgp
Description: PGP signature
