delete printf.o

SCCS-vsn: bin/sh/Makefile 8.4

diff --git a/usr/src/bin/sh/Makefile b/usr/src/bin/sh/Makefile
index 468709f..63ebbde 100644 (file)
--- a/usr/src/bin/sh/Makefile
+++ b/usr/src/bin/sh/Makefile
@@ -1,12 +1,12 @@
-#      @(#)Makefile    8.2 (Berkeley) %G%
+#      @(#)Makefile    8.4 (Berkeley) %G%

 
 PROG=  sh
 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 \
 
 PROG=  sh
 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 printf.c redir.c show.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
        syntax.c trap.c output.c var.c
 OBJS+= init.o arith.o arith_lex.o

-LDADD= -ll -ledit -ltermcap -lcompat
+LDADD+=        -ll -ledit -ltermcap

 LFLAGS= -8     # 8-bit lex scanner for arithmetic
 CFLAGS+=-DSHELL -I. -I${.CURDIR}
 .PATH: ${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf
 LFLAGS= -8     # 8-bit lex scanner for arithmetic
 CFLAGS+=-DSHELL -I. -I${.CURDIR}
 .PATH: ${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf


@@ -18,11 +18,11 @@ CLEANFILES+=\
 token.def: mktokens
        sh ${.CURDIR}/mktokens
 
 token.def: mktokens
        sh ${.CURDIR}/mktokens
 

-builtins.h builtins.c: ${.CURDIR}/mkbuiltins ${.CURDIR}/builtins
-       cd ${.CURDIR}; sh mkbuiltins
+builtins.h builtins.c: ${.CURDIR}/mkbuiltins ${.CURDIR}/builtins.def
+       cd ${.CURDIR}; sh mkbuiltins ${.OBJDIR}

 
 init.c: mkinit ${SRCS}
 
 init.c: mkinit ${SRCS}

-       ./mkinit '${CC} -c ${CFLAGS} init.c' ${.ALLSRC}
+       ./mkinit '${CC} -c ${CFLAGS} init.c' ${.ALLSRC:S/^mkinit$//}

 
 mkinit: ${.CURDIR}/mkinit.c
        ${CC} ${CFLAGS} ${.CURDIR}/mkinit.c -o $@
 
 mkinit: ${.CURDIR}/mkinit.c
        ${CC} ${CFLAGS} ${.CURDIR}/mkinit.c -o $@