ld.so and nfs regress were using PROGS variable before it was added

to bsd.prog.mk.  Remove local additions and use global rules.

diff --git a/regress/libexec/ld.so/initfirst/test1/prog1/Makefile b/regress/libexec/ld.so/initfirst/test1/prog1/Makefile
index bbfadc1..d33b92c 100644 (file)
--- a/regress/libexec/ld.so/initfirst/test1/prog1/Makefile
+++ b/regress/libexec/ld.so/initfirst/test1/prog1/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2017/03/18 16:58:22 kettenis Exp $
+# $OpenBSD: Makefile,v 1.4 2017/07/10 18:56:23 bluhm Exp $
 
 PROGS=         prog1 prog2 prog3 prog4
-SRCS=          main.c
-OBJS=          main.o
+SRCS_prog1=    main.c
+SRCS_prog2=    main.c
+SRCS_prog3=    main.c
+SRCS_prog4=    main.c
 LDFLAGS+=      -Wl,-E
 LDFLAGS+=      -Wl,--disable-new-dtags
 LDFLAGS+=      -Wl,-rpath,$(IF1_OBJDIR) -L$(IF1_OBJDIR)
@@ -13,7 +15,6 @@ LDADD_prog1+= -lnormal -lif1 -lif2
 LDADD_prog2+=  -lif1 -lnormal -lif2
 LDADD_prog3+=  -lif1 -lif2 -lnormal
 LDADD_prog4+=  -lif1 -lif2 -lif3
-CLEANFILES+=   ${PROGS}
 
 REGRESS_TARGETS=do-prog1 do-prog2 do-prog3 do-prog4
 
@@ -27,6 +28,3 @@ do-prog4: prog4
        ./prog4 | cmp -s ${.CURDIR}/expected4 -
 
 .include <bsd.regress.mk>
-
-${PROGS}: ${LIBCRT0} ${OBJS} ${LIBC} ${CRTBEGIN} ${CRTEND} ${DPADD}
-       ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD_${.TARGET}}

diff --git a/regress/sys/nfs/Makefile b/regress/sys/nfs/Makefile
index 116306f..8f0e730 100644 (file)
--- a/regress/sys/nfs/Makefile
+++ b/regress/sys/nfs/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2017/02/10 12:30:50 bluhm Exp $
+# $OpenBSD: Makefile,v 1.6 2017/07/10 18:56:23 bluhm Exp $
 
 PROGS=         mmap-sysctl-copyin mmap-sysctl-copyout
-OBJS=          ${PROGS:S/$/.o/}
-CLEANFILES=    ${PROGS} diskimage stamp-*
+CLEANFILES=    diskimage stamp-*
 
 .PHONY: disk nfs mount unconfig clean