Module Name: src
Committed By: plunky
Date: Fri Apr 15 08:47:02 UTC 2011
Modified Files:
src/rescue: list.ldd
src/usr.bin/ldd: Makefile
Added Files:
src/usr.bin/ldd/build: Makefile
Log Message:
move the build of ldd binary to a subdir in order to allow
explict ordering. This makes "make all" work the same as
"make dependall"
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/rescue/list.ldd
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/ldd/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/ldd/build/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/list.ldd
diff -u src/rescue/list.ldd:1.6 src/rescue/list.ldd:1.7
--- src/rescue/list.ldd:1.6 Fri Mar 25 18:07:07 2011
+++ src/rescue/list.ldd Fri Apr 15 08:47:02 2011
@@ -1,6 +1,7 @@
-# $NetBSD: list.ldd,v 1.6 2011/03/25 18:07:07 joerg Exp $
+# $NetBSD: list.ldd,v 1.7 2011/04/15 08:47:02 plunky Exp $
PROG ldd
+SPECIAL ldd srcdir usr.bin/ldd/build
LIBS ${LDD_ELF32DIR}/libldd_elf32.a
LIBS ${LDD_ELF64DIR}/libldd_elf64.a
Index: src/usr.bin/ldd/Makefile
diff -u src/usr.bin/ldd/Makefile:1.15 src/usr.bin/ldd/Makefile:1.16
--- src/usr.bin/ldd/Makefile:1.15 Tue Dec 15 04:06:43 2009
+++ src/usr.bin/ldd/Makefile Fri Apr 15 08:47:02 2011
@@ -1,44 +1,5 @@
-# $NetBSD: Makefile,v 1.15 2009/12/15 04:06:43 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2011/04/15 08:47:02 plunky Exp $
-WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
+SUBDIR+= elf32 elf64 elf32_compat .WAIT build
-.include <bsd.own.mk> # for MKDYNAMICROOT definition
-
-PROG= ldd
-SRCS= ldd.c
-MAN= ldd.1
-
-
-SUBDIR+= elf32 elf64 elf32_compat
-
-.if (${MACHINE_ARCH} != "alpha")
-LIB_ELF32DIR!= cd ${.CURDIR}/elf32 && ${PRINTOBJDIR}
-EXTRA_LIBS+= ${LIB_ELF32DIR}/libldd_elf32.a
-.endif
-
-.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-LIB_ELF32COMPATDIR!= cd ${.CURDIR}/elf32_compat && ${PRINTOBJDIR}
-EXTRA_LIBS+= ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
-.endif
-
-.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
- (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
- (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-LIB_ELF64DIR!= cd ${.CURDIR}/elf64 && ${PRINTOBJDIR}
-EXTRA_LIBS+= ${LIB_ELF64DIR}/libldd_elf64.a
-CPPFLAGS.ldd.c= -DELFSIZE=64
-.else
-CPPFLAGS.ldd.c= -DELFSIZE=32
-.endif
-
-LDADD+= ${EXTRA_LIBS}
-DPADD+= ${EXTRA_LIBS}
-
-.include "Makefile.common"
-
-.if (${MKDYNAMICROOT} == "no")
-LDSTATIC?= -static
-.endif
-
-.include <bsd.prog.mk>
.include <bsd.subdir.mk>
Added files:
Index: src/usr.bin/ldd/build/Makefile
diff -u /dev/null src/usr.bin/ldd/build/Makefile:1.1
--- /dev/null Fri Apr 15 08:47:02 2011
+++ src/usr.bin/ldd/build/Makefile Fri Apr 15 08:47:02 2011
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1 2011/04/15 08:47:02 plunky Exp $
+
+.include <bsd.own.mk> # for MKDYNAMICROOT definition
+
+PROG= ldd
+SRCS= ldd.c
+MAN= ldd.1
+
+.PATH: ${.CURDIR}/..
+
+.if (${MACHINE_ARCH} != "alpha")
+LIB_ELF32DIR!= cd ${.CURDIR}/../elf32 && ${PRINTOBJDIR}
+EXTRA_LIBS+= ${LIB_ELF32DIR}/libldd_elf32.a
+.endif
+
+.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+LIB_ELF32COMPATDIR!= cd ${.CURDIR}/../elf32_compat && ${PRINTOBJDIR}
+EXTRA_LIBS+= ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
+.endif
+
+.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") || \
+ (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc64") || \
+ (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
+LIB_ELF64DIR!= cd ${.CURDIR}/../elf64 && ${PRINTOBJDIR}
+EXTRA_LIBS+= ${LIB_ELF64DIR}/libldd_elf64.a
+CPPFLAGS.ldd.c= -DELFSIZE=64
+.else
+CPPFLAGS.ldd.c= -DELFSIZE=32
+.endif
+
+LDADD+= ${EXTRA_LIBS}
+DPADD+= ${EXTRA_LIBS}
+
+.include "Makefile.common"
+
+.if (${MKDYNAMICROOT} == "no")
+LDSTATIC?= -static
+.endif
+
+.include <bsd.prog.mk>
