Move nss directory into sysdeps Subdirs.

This commit is contained in:
Roland McGrath 2013-02-05 14:32:48 -08:00
parent 573c29b288
commit 7bd642f580
4 changed files with 19 additions and 4 deletions

View File

@ -1,5 +1,11 @@
2013-02-05 Roland McGrath <roland@hack.frob.com> 2013-02-05 Roland McGrath <roland@hack.frob.com>
* Makeconfig (all-Depend-files): Add existing
$(sorted-subdirs:=/Depend) files.
(all-subdirs): Remove nss.
* sysdeps/unix/inet/Subdirs: Add it here instead.
* hesiod/Depend: New file.
* elf/dl-hwcaps.c (_dl_important_hwcaps): Use a variable-length array * elf/dl-hwcaps.c (_dl_important_hwcaps): Use a variable-length array
instead of calling alloca. instead of calling alloca.

View File

@ -1041,13 +1041,19 @@ all-subdirs = csu assert ctype locale intl catgets math setjmp signal \
stdlib stdio-common libio malloc string wcsmbs time dirent \ stdlib stdio-common libio malloc string wcsmbs time dirent \
grp pwd posix io termios resource misc socket sysvipc gmon \ grp pwd posix io termios resource misc socket sysvipc gmon \
gnulib iconv iconvdata wctype manual shadow gshadow po argp \ gnulib iconv iconvdata wctype manual shadow gshadow po argp \
crypt nss localedata timezone rt conform debug \ crypt localedata timezone rt conform debug \
$(add-on-subdirs) dlfcn elf $(add-on-subdirs) dlfcn elf
ifndef avoid-generated ifndef avoid-generated
all-Depend-files := $(wildcard $(foreach dir,$(all-subdirs),\ # sysd-sorted itself will contain rules making the sysd-sorted target
# depend on Depend files. But if you just added a Depend file to an
# existing directory not in all-subdirs, then sysd-sorted needs to
# be regenerated, so it depends on existing $(sorted-subdirs:=/Depend) files.
all-Depend-files := $(wildcard $(sort \
$(foreach dir,$(all-subdirs),\
$(firstword $($(dir)-srcdir) \ $(firstword $($(dir)-srcdir) \
$(..)$(dir))/Depend)) $(..)$(dir))/Depend) \
$(sorted-subdirs:=/Depend)))
$(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk \ $(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk \
$(common-objpfx)config.make $(..)Makeconfig \ $(common-objpfx)config.make $(..)Makeconfig \
$(wildcard $(sysdirs:=/Subdirs)) \ $(wildcard $(sysdirs:=/Subdirs)) \

2
hesiod/Depend Normal file
View File

@ -0,0 +1,2 @@
nss
resolv

View File

@ -4,4 +4,5 @@ hesiod
sunrpc sunrpc
nis nis
nscd nscd
nss
streams streams