From 24e860324f7b3927d9d49c631a50cbf97d0a9230 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 18 Jan 2005 01:21:35 +0000 Subject: 2005-01-17 Roland McGrath * nscd/Makefile (LDLIBS-nscd): New variable. ($(objpfx)nscd): Use that instead of selinux-LIBS. --- nscd/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nscd/Makefile b/nscd/Makefile index 70a35198c2..9c32c68681 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1998,2000,2002,2003,2004,2005 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -56,6 +56,8 @@ nscd-modules += selinux selinux-LIBS := -lselinux endif +LDLIBS-nscd = $(selinux-LIBS) + distribute := nscd.h nscd-client.h dbg_log.h \ $(addsuffix .c, $(filter-out xmalloc, $(nscd-modules))) \ nscd_nischeck.c nscd.conf nscd.init nscd_proto.h \ @@ -110,7 +112,7 @@ $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ $(LDFLAGS) $(LDFLAGS-$(@F)) \ -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \ - -o $@ $^ $(selinux-LIBS) $(common-objpfx)libc_nonshared.a + -o $@ $^ $(LDLIBS-nscd) $(common-objpfx)libc_nonshared.a endif # This makes sure -DNOT_IN_libc is passed for all these modules. -- cgit v1.2.3