diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 1999-05-26 16:02:56 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 1999-05-26 16:02:56 +0000 |
| commit | 2ef8ed646e3810abe02a02ae43ee116ea06db925 (patch) | |
| tree | e6ad1e82f1be54ec8d0ab89b0f984b67fa3e4fe5 | |
| parent | 65fa0603a58b26cc81d37e4a378857741f566f9b (diff) | |
Link in egcs, kill gcc and libg++
| -rw-r--r-- | gnu/lib/Makefile | 5 | ||||
| -rw-r--r-- | gnu/usr.bin/Makefile | 8 | ||||
| -rw-r--r-- | include/Makefile | 12 |
3 files changed, 16 insertions, 9 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index e17ac1b55f7..75bcbde15a6 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 1997/06/24 21:36:21 provos Exp $ +# $OpenBSD: Makefile,v 1.5 1999/05/26 16:02:54 espie Exp $ # $NetBSD: Makefile,v 1.7 1995/04/23 07:50:21 cgd Exp $ -SUBDIR+= libg++ libgmp +SUBDIR+=../egcs libgmp +#SUBDIR+= libg++ libgmp .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 66064e6c49d..7706ef70651 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.26 1998/11/17 23:14:14 millert Exp $ +# $OpenBSD: Makefile,v 1.27 1999/05/26 16:02:54 espie Exp $ # $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $ -SUBDIR+= bc cvs deroff diff diff3 gcc grep groff -SUBDIR+= gzip lynx rcs sdiff sendbug sudo +SUBDIR+= bc cvs deroff diff diff3 +SUBDIR+=../egcs/gcc +#SUBDIR+= gcc +SUBDIR+= grep groff gzip lynx rcs sdiff sendbug sudo SUBDIR+= binutils # some ports use binutils gas and ld, most do not (yet). diff --git a/include/Makefile b/include/Makefile index 61c119e18c7..8175db7f3ca 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.65 1999/05/18 15:43:58 espie Exp $ +# $OpenBSD: Makefile,v 1.66 1999/05/26 16:02:55 espie Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -45,9 +45,13 @@ RDIRS= ../lib/libc_r ../lib/libcom_err ../lib/libcompat ../lib/libcurses \ PRDIRS= # Directories with an includes target that use Makefile.bsd-wrapper -WDIRS= ../lib/libssl ../gnu/lib/libg++/libg++ ../gnu/lib/libg++/libio \ - ../gnu/lib/libg++/librx ../gnu/lib/libg++/libstdc++ \ - ../gnu/usr.bin/gcc ../gnu/lib/libgmp +WDIRS= ../lib/libssl ../gnu/lib/libgmp + +WDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ ../gnu/egcs/libf2c \ + ../gnu/egcs/libobjc ../gnu/egcs/gcc +#WDIRS+= ../gnu/lib/libg++/libg++ ../gnu/lib/libg++/libio \ +# ../gnu/lib/libg++/librx ../gnu/lib/libg++/libstdc++ \ +# ../gnu/usr.bin/gcc # Places using Makefile.bsd-wrapper that needs a prerequisite target met # before includes |