From 3ff4252677ff55a0dd4ded5b5cbccda25812ba12 Mon Sep 17 00:00:00 2001 From: Paul Pluzhnikov Date: Fri, 23 Mar 2012 09:47:03 -0700 Subject: 2012-03-23 Daniel Jacobowitz Paul Pluzhnikov [BZ #6528] * grp/Makefile (otherlibs): Don't set it. * inet/Makefile (otherlibs): Likewise. * login/Makefile (otherlibs): Likewise. * nscd/Makefile (otherlibs): Likewise. * posix/Makefile (otherlibs): Likewise. * pwd/Makefile (otherlibs): Likewise. * rt/Makefile (otherlibs): Likewise. * sunrpc/Makefile (otherlibs): Likewise. * nss/Makefile (otherlibs): Likewise. Add libnss_files to routines and static-only-routines. ($(objpfx)getent): Remove rule. * resolv/Makefile: Add libnss_dns and libresolv to routines and static-only-routines. --- resolv/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'resolv') diff --git a/resolv/Makefile b/resolv/Makefile index d87119385b..4777317b17 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -55,8 +55,10 @@ subdir-dirs = nss_dns vpath %.c nss_dns libnss_dns-routines := dns-host dns-network dns-canon -ifneq ($(build-static-nss),yes) libnss_dns-inhibit-o = $(filter-out .os,$(object-suffixes)) +ifeq ($(build-static-nss),yes) +routines += $(libnss_dns-routines) $(libresolv-routines) +static-only-routines += $(libnss_dns-routines) $(libresolv-routines) endif ifeq (yesyes,$(build-shared)$(have-thread-library)) -- cgit v1.2.3