* nscd/Makefile ($(objpfx)nscd_stat.o: sysincludes): Move setting
	inside [$(have-selinux) = yes].
	($(objpfx)selinux.o: sysincludes): Likewise.
This commit is contained in:
Roland McGrath 2006-04-04 07:32:53 +00:00
parent 82f0f9ed70
commit 729f7b28c5
2 changed files with 10 additions and 4 deletions

View File

@ -1,5 +1,10 @@
2006-04-04 Roland McGrath <roland@redhat.com>
[BZ #2508]
* nscd/Makefile ($(objpfx)nscd_stat.o: sysincludes): Move setting
inside [$(have-selinux) = yes].
($(objpfx)selinux.o: sysincludes): Likewise.
* iconvdata/Makefile (generate-8bit-table): Use LC_ALL=C.
(generate-8bit-gap-table): Likewise.
($(objpfx)iso8859-7jp.stmp): Likewise.

View File

@ -1,4 +1,5 @@
# Copyright (C) 1998,2000,2002,2003,2004,2005 Free Software Foundation, Inc.
# Copyright (C) 1998,2000,2002,2003,2004,2005,2006
# 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
@ -58,9 +59,6 @@ endif
nscd-modules += selinux
selinux-LIBS := -lselinux $(libaudit)
endif
LDLIBS-nscd = $(selinux-LIBS)
# The configure.in check for libselinux and its headers did not use
# $SYSINCLUDES. The directory specified by --with-headers usually
@ -69,6 +67,9 @@ LDLIBS-nscd = $(selinux-LIBS)
# system headers will be ok for this file.
$(objpfx)nscd_stat.o: sysincludes = # nothing
$(objpfx)selinux.o: sysincludes = # nothing
endif
LDLIBS-nscd = $(selinux-LIBS)
distribute := nscd.h nscd-client.h dbg_log.h \
$(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \