diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-07-10 18:56:24 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-07-10 18:56:24 +0000 |
| commit | adf7540e3e58fc5d85c53d04316d3b7887b3588d (patch) | |
| tree | 4aa9e41f6a0f29312d63e83d0960ed96a8a3d1d6 /regress/libexec/ld.so | |
| parent | 1c3a6358346325f202936009195b6411c6cb7aef (diff) | |
ld.so and nfs regress were using PROGS variable before it was added
to bsd.prog.mk. Remove local additions and use global rules.
Diffstat (limited to 'regress/libexec/ld.so')
| -rw-r--r-- | regress/libexec/ld.so/initfirst/test1/prog1/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/regress/libexec/ld.so/initfirst/test1/prog1/Makefile b/regress/libexec/ld.so/initfirst/test1/prog1/Makefile index bbfadc1d5ee..d33b92c1ff3 100644 --- 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}} |