===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/Makefile,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- src/usr.bin/make/Makefile	2014/03/22 10:36:22	1.57
+++ src/usr.bin/make/Makefile	2014/05/12 19:11:19	1.58
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.57 2014/03/22 10:36:22 espie Exp $
+#	$OpenBSD: Makefile,v 1.58 2014/05/12 19:11:19 espie Exp $
 
 PROG=	make
 CFLAGS+= -I${.OBJDIR} -I${.CURDIR}
@@ -11,6 +11,8 @@
 CDEFS+=-DHAS_EXTENDED_GETCWD
 #CDEFS+=-DHAS_STATS
 
+DPADD += ${LIBUTIL}
+LDADD += -lutil
 CFLAGS+=${CDEFS}
 HOSTCFLAGS+=${CDEFS}
 
@@ -19,14 +21,11 @@
 	error.c for.c init.c job.c lowparse.c main.c make.c memory.c parse.c \
 	parsevar.c str.c stats.c suff.c targ.c targequiv.c timestamp.c \
 	var.c varmodifiers.c varname.c
-SRCS+=	lstAddNew.c lstAppend.c lstConcat.c lstConcatDestroy.c \
-	lstDeQueue.c lstDestroy.c lstDupl.c lstFindFrom.c lstForEachFrom.c \
-	lstInsert.c lstMember.c lstRemove.c lstReplace.c lstRequeue.c lstSucc.c
-.PATH:	${.CURDIR}/lst.lib
 
+.include "${.CURDIR}/lst.lib/Makefile.inc"
+
 CLEANFILES+=generate generate.o regress.o check
 
-CLEANFILES+=${LIBOBJS} libohash.a
 CLEANFILES+= varhashconsts.h condhashconsts.h nodehashconsts.h
 
 beforedepend: varhashconsts.h condhashconsts.h nodehashconsts.h
@@ -43,11 +42,13 @@
 nodehashconsts.h: generate
 	${.OBJDIR}/generate 3 0 >$@.tmp && mv $@.tmp $@
 
-generate: generate.c stats.c memory.c
-	${HOSTCC} ${LDSTATIC} -o ${.TARGET} ${HOSTCFLAGS} ${.ALLSRC} ${LDADD}
+generate: generate.c stats.c memory.c ${DPADD}
+	${HOSTCC} ${HOSTCFLAGS} ${LDSTATIC} -o ${.TARGET} ${.ALLSRC} ${LDFLAGS} ${LDADD}
 
-check: regress.o str.o memory.o buf.o
-	${CC} -o ${.TARGET} ${CFLAGS} ${.ALLSRC} ${LDADD}
+CHECKOBJS = regress.o str.o memory.o buf.o
+
+check: ${CHECKOBJS} ${DPADD}
+	${CC} -o ${.TARGET} ${CFLAGS} ${CHECKOBJS} ${LDADD}
 
 regress: check
 	${.OBJDIR}/check