Move rules for Linux-specific pldd program to Linux-specific Makefile.

diff --git a/ChangeLog b/ChangeLog
index 25149d2..64d9ed7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-05-05  Roland McGrath  <roland@hack.frob.com>
 
+       * elf/Makefile (others, install-bin): Remove pldd.
+       (pldd-modules): Variable removed.
+       ($(objpfx)pldd): Target removed.
+       * sysdeps/unix/sysv/linux/Makefile [$(subdir) = elf]
+       (others, install-bin): Append pldd here.
+       ($(objpfx)pldd): New target.
+
        * sysdeps/gnu/errlist.awk (BEGIN): Emit an initial #define of ERR_MAX
        to 0, so the first #if test emitted later doesn't see it undefined.
        (END): Emit "!defined ERRLIST_NO_COMPAT" to match what BEGIN does.

diff --git a/elf/Makefile b/elf/Makefile
index 7ff3da2..3d675d7 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -70,8 +70,8 @@ install-others        = $(inst_rtlddir)/$(rtld-installed-name)
 install-bin-script = ldd
 endif
 
-others         = sprof sln pldd
-install-bin    = sprof pldd
+others         = sprof sln
+install-bin    = sprof
 others-static   = sln
 install-rootsbin = sln
 sln-modules    := static-stubs
@@ -88,8 +88,6 @@ extra-objs    += $(ldconfig-modules:=.o)
 endif
 endif
 
-pldd-modules := xmalloc
-
 # To find xmalloc.c and xstrdup.c
 vpath %.c ../locale/programs
 
@@ -430,8 +428,6 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o)
 
 $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
 
-$(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o)
-
 SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
 CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
                    -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 0def37e..692487f 100644 (file)
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -175,6 +175,10 @@ sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \
                        dl-fxstatat64
 
 CPPFLAGS-lddlibc4 += -DNOT_IN_libc
+
+others += pldd
+install-bin += pldd
+$(objpfx)pldd: $(objpfx)xmalloc.o
 endif
 
 ifeq ($(subdir),rt)