diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-02-17 22:06:32 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-02-17 22:06:32 +0000 |
| commit | 37deda235ca41314f1320da0e3dce9e2256d7046 (patch) | |
| tree | 19f17757b9625d1938bdfe9103d86726d7e22f63 | |
| parent | 73440e9e3ec2ccf6cabf9e8dae8c707188dfe968 (diff) | |
Always enter this ld.so and subdirectories to create obj (and then the
MI man pages, even if vax currently lacks the programs)
| -rw-r--r-- | libexec/Makefile | 8 | ||||
| -rw-r--r-- | libexec/ld.so/Makefile | 8 | ||||
| -rw-r--r-- | libexec/ld.so/ldconfig/Makefile | 11 | ||||
| -rw-r--r-- | libexec/ld.so/ldd/Makefile | 10 |
4 files changed, 25 insertions, 12 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 4cf64b9302e..cebacf1e246 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,9 +1,9 @@ # from: @(#)Makefile 5.7 (Berkeley) 4/1/91 -# $OpenBSD: Makefile,v 1.51 2012/08/16 04:10:25 dlg Exp $ +# $OpenBSD: Makefile,v 1.52 2013/02/17 22:06:30 deraadt Exp $ .include <bsd.own.mk> -SUBDIR= comsat fingerd ftpd getty identd lockspool \ +SUBDIR= comsat fingerd ftpd getty identd ld.so lockspool \ mail.local makewhatis rpc.rquotad rpc.rstatd rpc.rusersd \ rpc.rwalld rpc.sprayd security spamd spamlogd spamd-setup rshd \ talkd tcpd uucpd @@ -15,10 +15,6 @@ SUBDIR+=login_passwd login_skey login_reject login_chpass \ SUBDIR+=rpc.yppasswdd .endif -.if (${ELF_TOOLCHAIN:L} == "yes") -SUBDIR+=ld.so -.endif - .if (${KERBEROS5:L} == "yes") SUBDIR+=login_krb5 login_krb5-or-pwd .endif diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile index d531f6809fe..3fdb7016953 100644 --- a/libexec/ld.so/Makefile +++ b/libexec/ld.so/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.40 2013/01/05 11:19:25 miod Exp $ +# $OpenBSD: Makefile,v 1.41 2013/02/17 22:06:31 deraadt Exp $ SUBDIR=ldconfig ldd - MAN= ld.so.1 .include <bsd.own.mk> + +.if (${ELF_TOOLCHAIN:L} == "yes") + .if defined(NOPIC) NOPROG= .else @@ -37,4 +39,6 @@ $(PROG): $(LD) -x -e _dl_start $(ELF_LDFLAGS) -o $(PROG) $(OBJS) $(LDADD) .endif +.endif + .include <bsd.prog.mk> diff --git a/libexec/ld.so/ldconfig/Makefile b/libexec/ld.so/ldconfig/Makefile index c65c6d118f4..7709d8ac85a 100644 --- a/libexec/ld.so/ldconfig/Makefile +++ b/libexec/ld.so/ldconfig/Makefile @@ -1,6 +1,12 @@ -# $OpenBSD: Makefile,v 1.7 2006/05/12 23:20:52 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2013/02/17 22:06:31 deraadt Exp $ # $NetBSD: Makefile,v 1.10 1995/03/06 04:24:41 cgd Exp $ +MAN= ldconfig.8 + +.include <bsd.own.mk> + +.if (${ELF_TOOLCHAIN:L} == "yes") + PROG= ldconfig SRCS= ldconfig.c shlib.c etc.c prebind_delete.c debug.c prebind.c library.c sod.c LDDIR?= $(.CURDIR)/.. @@ -8,8 +14,9 @@ LDDIR?= $(.CURDIR)/.. CFLAGS+=-I$(.CURDIR) -I$(.CURDIR)/.. LDSTATIC=${STATIC} BINDIR= /sbin -MAN= ldconfig.8 #.PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH) +.endif + .include <bsd.prog.mk> diff --git a/libexec/ld.so/ldd/Makefile b/libexec/ld.so/ldd/Makefile index bd5740fe969..8baefbddbb5 100644 --- a/libexec/ld.so/ldd/Makefile +++ b/libexec/ld.so/ldd/Makefile @@ -1,10 +1,16 @@ -# $OpenBSD: Makefile,v 1.3 2003/11/20 23:23:09 avsm Exp $ +# $OpenBSD: Makefile,v 1.4 2013/02/17 22:06:31 deraadt Exp $ +MAN= ldd.1 + +.include <bsd.own.mk> + +.if (${ELF_TOOLCHAIN:L} == "yes") PROG= ldd SRCS= ldd.c -MAN= ldd.1 #CFLAGS+=-Werror BINDIR= /usr/bin +.endif + .include <bsd.prog.mk> |