[src/trunk]: src/lib Avoid duplicate directory traversals when building Elfto...

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

details:   https://anonhg.NetBSD.org/src/rev/c611c4ed1110
branches:  trunk
changeset: 961085:c611c4ed1110
user:      jkoshy <jkoshy%NetBSD.org@localhost>
date:      Fri Apr 09 20:49:05 2021 +0000

description:
Avoid duplicate directory traversals when building Elftoolchain sources.

diffstat:

 external/bsd/Makefile |  6 +++---
 lib/Makefile          |  5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 5b65b2b4d815 -r c611c4ed1110 external/bsd/Makefile
--- a/external/bsd/Makefile     Fri Apr 09 20:12:00 2021 +0000
+++ b/external/bsd/Makefile     Fri Apr 09 20:49:05 2021 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.71 2020/06/15 01:57:31 christos Exp $
+#      $NetBSD: Makefile,v 1.72 2021/04/09 20:49:05 jkoshy Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR=        acpica am-utils bc byacc cron dhcpcd ekermit elftosb \
-       fetch file flex jemalloc less \
+SUBDIR=        acpica am-utils bc byacc cron dhcpcd elftoolchain/common \
+       ekermit elftosb fetch file flex jemalloc less \
        libarchive libevent libfido2 liblzf libpcap mdocml \
        ntp openresolv tcpdump tmux top tre wpa
 
diff -r 5b65b2b4d815 -r c611c4ed1110 lib/Makefile
--- a/lib/Makefile      Fri Apr 09 20:12:00 2021 +0000
+++ b/lib/Makefile      Fri Apr 09 20:49:05 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.290 2021/04/08 08:10:30 jkoshy Exp $
+#      $NetBSD: Makefile,v 1.291 2021/04/09 20:49:05 jkoshy Exp $
 #      from: @(#)Makefile      5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -62,7 +62,7 @@
 
 SUBDIR+=       ../external/bsd/flex/lib
 SUBDIR+=       ../external/bsd/tre/lib
-SUBDIR+=       ../external/bsd/elftoolchain    # libelf and libdwarf
+SUBDIR+=       ../external/bsd/elftoolchain/lib
 SUBDIR+=       ../external/bsd/liblzf/lib
 SUBDIR+=       ../external/bsd/libpcap/lib
 
@@ -118,7 +118,6 @@
 SUBDIR+=       ../crypto/external/bsd/netpgp/libmj
 SUBDIR+=       ../crypto/external/bsd/netpgp/lib/verify # depends on libz
 SUBDIR+=       ../external/bsd/blocklist/lib           # depends on libpthread
-SUBDIR+=       ../external/bsd/elftoolchain/lib/libdwarf # depends on libelf
 SUBDIR+=       ../external/mit/lua/lib # depends on libm
 SUBDIR+=       ../external/public-domain/sqlite/lib # depends on libm
 SUBDIR+=       libcurses       # depends on libterminfo