diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 1999-11-20 18:08:35 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 1999-11-20 18:08:35 +0000 |
| commit | adb84d00c5ab8c36e7471ea28ed07b27cee47c02 (patch) | |
| tree | 02e3401bbed89c4e963b70deacd0672d8c461c1e | |
| parent | 1bfcf7518da45ac3a68d846c823c56b36c9cfe4d (diff) | |
Generate g2c.h at prereq stage.
Install it under /usr/include
| -rw-r--r-- | distrib/sets/lists/comp/mi | 1 | ||||
| -rw-r--r-- | gnu/egcs/libf2c/Makefile.bsd-wrapper | 15 | ||||
| -rw-r--r-- | include/Makefile | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 5caec401468..f3ad212f5e7 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -602,6 +602,7 @@ ./usr/include/g++/valarray ./usr/include/g++/vector ./usr/include/g++/vector.h +./usr/include/g2c.h ./usr/include/glob.h ./usr/include/gmp.h ./usr/include/grp.h diff --git a/gnu/egcs/libf2c/Makefile.bsd-wrapper b/gnu/egcs/libf2c/Makefile.bsd-wrapper index 175730698b2..60c9aa51c78 100644 --- a/gnu/egcs/libf2c/Makefile.bsd-wrapper +++ b/gnu/egcs/libf2c/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.2 1999/08/24 00:20:14 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.3 1999/11/20 18:08:34 espie Exp $ EGCS_DIR= $(.CURDIR)/.. .if defined(OBJMACHINE) @@ -110,11 +110,6 @@ SRCS+= ${U77_SRCS:S/^/libU77\//} SRCS+= ${F77_SRCS:S/^/libF77\//} SRCS+= ${VERSION_SRCS} -depend: - cd ${.CURDIR}/../gcc && \ - make -f Makefile.bsd-wrapper config.status tree-check.h - mkdir -p libE77 - ${.OBJDIR}/VersionI.c: libI77/Version.c ln -sf $> $@ @@ -129,6 +124,9 @@ all: config.status # CPPFLAGS=-I${.CURDIR}/../gcc/obj \ config.status: Makefile.in configure + mkdir -p libE77 + cd ${.CURDIR}/../gcc && \ + make -f Makefile.bsd-wrapper config.status tree-check.h # fake g771 existence cd $(EGCS_OBJDIR)/gcc && touch f771 PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ @@ -138,8 +136,13 @@ config.status: Makefile.in configure --prefix=/usr --with-local-prefix=/usr ${CF} \ && touch config.status +# Configuring is needed for g2c.h to be built +prereq depend: config.status + includes: install -C -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \ ${.CURDIR}/f2c.h ${DESTDIR}/usr/include + install -C -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \ + g2c.h ${DESTDIR}/usr/include .include <bsd.lib.mk> diff --git a/include/Makefile b/include/Makefile index 52efafdc72a..0205d15a936 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.75 1999/10/05 22:29:36 beck Exp $ +# $OpenBSD: Makefile,v 1.76 1999/11/20 18:08:33 espie Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -51,7 +51,7 @@ WDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ ../gnu/egcs/libf2c \ # Places using Makefile.bsd-wrapper that needs a prerequisite target met # before includes -PWDIRS= ../lib/libssl ../usr.sbin/httpd +PWDIRS= ../lib/libssl ../usr.sbin/httpd ../gnu/egcs/libf2c NOOBJ= noobj |