diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-03 12:32:59 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-03 12:32:59 +0000 |
commit | 503a3a4cf5bad39ef16c2ec719b93414a6ee3c89 (patch) | |
tree | bee96976ed3b0ff7ad53ec51faab44b8ba66199a /bin/sh/Makefile | |
parent | 6050b2deb7a6c13699916780cc8d104750e657a2 (diff) |
From NetBSD:
Fix problems with the way init.o is built:
* Prevent gratuitous rebuilds when nothing has changed.
* Make sure it is rebuilt if a .h file is updated.
Diffstat (limited to 'bin/sh/Makefile')
-rw-r--r-- | bin/sh/Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 07df49d324e..d84a34cabf4 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1995/10/22 00:15:02 christos Exp $ +# $NetBSD: Makefile,v 1.23 1996/02/18 12:29:18 mycroft Exp $ # @(#)Makefile 8.4 (Berkeley) 5/5/95 PROG= sh @@ -6,15 +6,16 @@ SRCS= alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \ histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ mystring.c nodes.c options.c parser.c redir.c show.c syntax.c \ trap.c output.c var.c -OBJS+= init.o arith.o arith_lex.o +OBJS+= arith.o arith_lex.o init.o LDADD+= -ll -ledit -ltermcap DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMCAP} LFLAGS= -8 # 8-bit lex scanner for arithmetic CFLAGS+=-DSHELL -I. -I${.CURDIR} .PATH: ${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf CLEANFILES+=\ - builtins.c builtins.h init.c mkinit mknodes mksyntax \ - nodes.c nodes.h printf.o syntax.c syntax.h token.def y.tab.h + arith.c arith_lex.c builtins.c builtins.h init.c mkinit mknodes \ + mksyntax nodes.c nodes.h printf.o syntax.c syntax.h token.def \ + y.tab.c y.tab.h .depend parser.o: token.def @@ -25,7 +26,7 @@ builtins.h builtins.c: ${.CURDIR}/mkbuiltins ${.CURDIR}/builtins.def cd ${.CURDIR}; sh mkbuiltins ${.OBJDIR} init.c: mkinit ${SRCS} - ./mkinit '${CC} -c ${CFLAGS} init.c' ${.ALLSRC:S/^mkinit$//} + ./mkinit ${.ALLSRC:S/^mkinit$//} mkinit: ${.CURDIR}/mkinit.c ${CC} ${CFLAGS} ${.CURDIR}/mkinit.c -o $@ @@ -42,8 +43,4 @@ syntax.c syntax.h: mksyntax mksyntax: ${.CURDIR}/mksyntax.c ${.CURDIR}/parser.h ${CC} ${CFLAGS} ${.CURDIR}/mksyntax.c -o $@ -arith_lex.o: arith.o - -${OBJS}: init.c - .include <bsd.prog.mk> |