Move nss directory into sysdeps Subdirs.

diff --git a/ChangeLog b/ChangeLog
index 818edb4..6cd6d83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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
        instead of calling alloca.
 

diff --git a/Makeconfig b/Makeconfig
index 8da4ad3..04d7588 100644 (file)
--- 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)) \

diff --git a/hesiod/Depend b/hesiod/Depend
new file mode 100644 (file)
index 0000000..0554b47
--- /dev/null
+++ b/hesiod/Depend
@@ -0,0 +1,2 @@
+nss
+resolv

diff --git a/sysdeps/unix/inet/Subdirs b/sysdeps/unix/inet/Subdirs
index 4a191e2..0a02dd4 100644 (file)
--- a/sysdeps/unix/inet/Subdirs
+++ b/sysdeps/unix/inet/Subdirs
@@ -4,4 +4,5 @@ hesiod
 sunrpc
 nis
 nscd
+nss
 streams