diff options
| author | tv <tv@NetBSD.org> | 1998-04-01 21:13:24 +0000 |
|---|---|---|
| committer | tv <tv@NetBSD.org> | 1998-04-01 21:13:24 +0000 |
| commit | 3d2ef58a4344f2652bf8edd5bfe883134c98fe54 (patch) | |
| tree | 15439d76d3d5f4e87e7b814ec9cdb5d8b9d9c2cf /gnu | |
| parent | d88a338146fa81b012bd63a34c5204e8aa763b07 (diff) | |
Cleanup of the previous fixes, and it all now compiles cleanly without
.PATH: hackage.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/egcs/cc1obj/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/cc1plus/Makefile | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/common/Makefile | 5 | ||||
| -rw-r--r-- | gnu/usr.bin/egcs/libgcc/Makefile | 11 |
4 files changed, 11 insertions, 18 deletions
diff --git a/gnu/usr.bin/egcs/cc1obj/Makefile b/gnu/usr.bin/egcs/cc1obj/Makefile index befee91ab9c..77cfee58541 100644 --- a/gnu/usr.bin/egcs/cc1obj/Makefile +++ b/gnu/usr.bin/egcs/cc1obj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/04/01 01:50:01 tv Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/01 21:13:24 tv Exp $ PROG= cc1obj SRCS= objc-parse.c objc-act.c @@ -7,7 +7,7 @@ CLEANFILES+= objc-parse.c # XXX needs to be before dist/gcc or tree.c comes from the # wrong place.. -.PATH: $(.OBJDIR) $(.CURDIR)/../../../dist/gcc/objc +.PATH: $(.CURDIR)/../../../dist/gcc/objc .include "../Makefile.cc1" diff --git a/gnu/usr.bin/egcs/cc1plus/Makefile b/gnu/usr.bin/egcs/cc1plus/Makefile index d458bd3ed26..b85082c997b 100644 --- a/gnu/usr.bin/egcs/cc1plus/Makefile +++ b/gnu/usr.bin/egcs/cc1plus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/04/01 01:50:02 tv Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/01 21:13:24 tv Exp $ PROG= cc1plus @@ -11,7 +11,8 @@ lex.o pt.o spew.o: parse.h CLEANFILES+= parse.c parse.h -parse.c parse.h: parse.y +parse.h: parse.c +parse.c: parse.y $(YACC) -d $(.IMPSRC) grep '^#define[ ]*YYEMPTY' y.tab.c >>y.tab.h mv -f y.tab.c parse.c @@ -19,8 +20,8 @@ parse.c parse.h: parse.y # XXX needs to be before dist/gcc or tree.c comes from the # wrong place.. -.PATH: $(.OBJDIR) $(.CURDIR)/../../../dist/gcc/cp +.PATH: $(.CURDIR)/../../../dist/gcc/cp .include "../Makefile.cc1" -CPPFLAGS+= -I$(DIST)/cp +CPPFLAGS+= -I. -I$(DIST)/cp diff --git a/gnu/usr.bin/egcs/common/Makefile b/gnu/usr.bin/egcs/common/Makefile index f8c6b04c70f..c8725d06f60 100644 --- a/gnu/usr.bin/egcs/common/Makefile +++ b/gnu/usr.bin/egcs/common/Makefile @@ -1,7 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/04/01 01:50:02 tv Exp $ - -# XXX: seems to need to be first in the path; this may not be necessary -.PATH: $(.OBJDIR) +# $NetBSD: Makefile,v 1.3 1998/04/01 21:13:24 tv Exp $ .include "../Makefile.inc" diff --git a/gnu/usr.bin/egcs/libgcc/Makefile b/gnu/usr.bin/egcs/libgcc/Makefile index d53b79ff211..049dd9b836c 100644 --- a/gnu/usr.bin/egcs/libgcc/Makefile +++ b/gnu/usr.bin/egcs/libgcc/Makefile @@ -1,11 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/04/01 03:14:55 tv Exp $ - -INCS= exception new new.h typeinfo -#INCSDIR=/usr/include/g++ - -# XXX hack -exception: - @/bin/true +# $NetBSD: Makefile,v 1.3 1998/04/01 21:13:25 tv Exp $ .PATH: ${.CURDIR}/../../../dist/gcc/cp ${.CURDIR}/../../../dist/gcc/cp/inc LIB= gcc @@ -36,6 +29,8 @@ LIB2OBJS+=__gcc_bcmp.o _varargs.o _eprintf.o _op_new.o _new_handler.o \ SRCS+= tinfo.cc tinfo2.cc new.cc new1.cc new2.cc exception.cc CXXFLAGS+= -I$(DIST)/cp/inc LIB2OBJS+= _eh.o +INCS= exception new new.h typeinfo +INCSDIR= /usr/include/g++ .endif .if (${MACHINE_ARCH} == "m68k") || (${MACHINE_ARCH} == "i386") |
