Backed out previous commit. It was tested, but not for the case where

a separate object tree doesn't exist.  Crufty makefiles will have to
put y.tab.h in SRCS so that we know not to create foo.h from foo.y.
This commit is contained in:
Bruce Evans 1998-05-05 07:36:55 +00:00
parent 00a032f666
commit e43e36af7d
2 changed files with 13 additions and 7 deletions

View File

@ -1,12 +1,12 @@
# @(#)Makefile 8.4 (Berkeley) 5/5/95 # @(#)Makefile 8.4 (Berkeley) 5/5/95
# $Id: Makefile,v 1.24 1998/04/26 16:12:23 bde Exp $ # $Id: Makefile,v 1.25 1998/05/04 20:09:00 bde Exp $
PROG= sh PROG= sh
SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ SHSRCS= alias.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 \ histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \
mystring.c options.c output.c parser.c printf.c redir.c show.c \ mystring.c options.c output.c parser.c printf.c redir.c show.c \
trap.c var.c trap.c var.c
GENSRCS= builtins.c init.c nodes.c syntax.c GENSRCS= arith.c arith_lex.c builtins.c init.c nodes.c syntax.c
GENHDRS= builtins.h nodes.h syntax.h token.h GENHDRS= builtins.h nodes.h syntax.h token.h
SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
@ -21,9 +21,11 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR}
.PATH: ${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf .PATH: ${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf
CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \ CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \
mksyntax mksyntax.o mksyntax mksyntax.o \
y.tab.h
CLEANFILES+= ${GENSRCS} ${GENHDRS} CLEANFILES+= ${GENSRCS} ${GENHDRS}
.ORDER: builtins.c builtins.h .ORDER: builtins.c builtins.h
builtins.c builtins.h: mkbuiltins builtins.def builtins.c builtins.h: mkbuiltins builtins.def
cd ${.CURDIR}; sh mkbuiltins ${.OBJDIR} cd ${.CURDIR}; sh mkbuiltins ${.OBJDIR}
@ -55,4 +57,6 @@ syntax.c syntax.h: mksyntax
token.h: mktokens token.h: mktokens
sh ${.CURDIR}/mktokens sh ${.CURDIR}/mktokens
y.tab.h: arith.c
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,13 +1,15 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93 # @(#)Makefile 8.1 (Berkeley) 6/6/93
# $Id$
PROG= config PROG= config
CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-I. -I${.CURDIR}
SRCS= config.y main.c lang.l mkioconf.c mkmakefile.c mkglue.c mkheaders.c \ SRCS= config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
mkoptions.c mkswapconf.c mkoptions.c mkswapconf.c y.tab.h
MAN8= config.8 MAN8= config.8
DPADD= ${LIBL} DPADD= ${LIBL}
LDADD= -ll LDADD= -ll
CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch]
y.tab.h: config.c
.include <bsd.prog.mk> .include <bsd.prog.mk>