summaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-02-05 14:32:48 -0800
committerRoland McGrath <roland@hack.frob.com>2013-02-05 14:32:48 -0800
commit7bd642f580ef5698bd5b1777a5ba7af2f58c5d8c (patch)
tree14890fc649b83573695690e7512e3f81eb849224 /Makeconfig
parent573c29b288d5cb88f3a09b9b7b5bcf0db762fd5d (diff)
downloadglibc-7bd642f580ef5698bd5b1777a5ba7af2f58c5d8c.tar.gz
Move nss directory into sysdeps Subdirs.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig14
1 files changed, 10 insertions, 4 deletions
diff --git a/Makeconfig b/Makeconfig
index 8da4ad3b4a..04d7588062 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1041,13 +1041,19 @@ all-subdirs = csu assert ctype locale intl catgets math setjmp signal \
stdlib stdio-common libio malloc string wcsmbs time dirent \
grp pwd posix io termios resource misc socket sysvipc gmon \
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
ifndef avoid-generated
-all-Depend-files := $(wildcard $(foreach dir,$(all-subdirs),\
- $(firstword $($(dir)-srcdir) \
- $(..)$(dir))/Depend))
+# 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) \
+ $(..)$(dir))/Depend) \
+ $(sorted-subdirs:=/Depend)))
$(common-objpfx)sysd-sorted: $(..)scripts/gen-sorted.awk \
$(common-objpfx)config.make $(..)Makeconfig \
$(wildcard $(sysdirs:=/Subdirs)) \