[src/trunk]: src/usr.bin/ldd Don't include <a.out.h> unless it's needed, and ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7a6c8b0d763f
branches:  trunk
changeset: 746822:7a6c8b0d763f
user:      he <he%NetBSD.org@localhost>
date:      Thu Aug 20 19:17:19 2009 +0000

description:
Don't include <a.out.h> unless it's needed, and don't build
the aout subdir if on mips.  Fixes build for mips ports.

diffstat:

 usr.bin/ldd/Makefile    |  9 +++++++--
 usr.bin/ldd/ldd.c       |  5 ++---
 usr.bin/ldd/ldd_elfxx.c |  5 ++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diffs (75 lines):

diff -r c79d15853538 -r 7a6c8b0d763f usr.bin/ldd/Makefile
--- a/usr.bin/ldd/Makefile      Thu Aug 20 17:40:26 2009 +0000
+++ b/usr.bin/ldd/Makefile      Thu Aug 20 19:17:19 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2009/04/14 22:15:22 lukem Exp $
+#      $NetBSD: Makefile,v 1.11 2009/08/20 19:17:19 he Exp $
 
 WARNS?=        3       # XXX: -Wsign-compare issues ld.elf_so source
 
@@ -8,9 +8,14 @@
 SRCS=  ldd.c
 MAN=   ldd.1
 
-SUBDIR=        aout elf32 elf64
+
+.if (${MACHINE_ARCH} != "mips")
+SUBDIR=                aout
 LIB_AOUTDIR!=  cd ${.CURDIR}/aout && ${PRINTOBJDIR}
 EXTRA_LIBS+=   ${LIB_AOUTDIR}/libldd_aout.a
+.endif
+
+SUBDIR+=       elf32 elf64
 
 .if (${MACHINE_ARCH} != "alpha")
 LIB_ELF32DIR!= cd ${.CURDIR}/elf32 && ${PRINTOBJDIR}
diff -r c79d15853538 -r 7a6c8b0d763f usr.bin/ldd/ldd.c
--- a/usr.bin/ldd/ldd.c Thu Aug 20 17:40:26 2009 +0000
+++ b/usr.bin/ldd/ldd.c Thu Aug 20 19:17:19 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldd.c,v 1.6 2009/05/20 16:20:01 christos Exp $ */
+/*     $NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $       */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,14 +62,13 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.6 2009/05/20 16:20:01 christos Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.7 2009/08/20 19:17:19 he Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 
-#include <a.out.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
diff -r c79d15853538 -r 7a6c8b0d763f usr.bin/ldd/ldd_elfxx.c
--- a/usr.bin/ldd/ldd_elfxx.c   Thu Aug 20 17:40:26 2009 +0000
+++ b/usr.bin/ldd/ldd_elfxx.c   Thu Aug 20 19:17:19 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldd_elfxx.c,v 1.2 2009/02/03 03:01:02 mrg Exp $        */
+/*     $NetBSD: ldd_elfxx.c,v 1.3 2009/08/20 19:17:19 he Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,14 +62,13 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ldd_elfxx.c,v 1.2 2009/02/03 03:01:02 mrg Exp $");
+__RCSID("$NetBSD: ldd_elfxx.c,v 1.3 2009/08/20 19:17:19 he Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 
-#include <a.out.h>
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>