Module Name: src
Committed By: jkoshy
Date: Fri Apr 9 20:49:05 UTC 2021
Modified Files:
src/external/bsd: Makefile
src/lib: Makefile
Log Message:
Avoid duplicate directory traversals when building Elftoolchain sources.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/external/bsd/Makefile
cvs rdiff -u -r1.290 -r1.291 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.71 src/external/bsd/Makefile:1.72
--- src/external/bsd/Makefile:1.71 Mon Jun 15 01:57:31 2020
+++ src/external/bsd/Makefile Fri Apr 9 20:49:05 2021
@@ -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
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.290 src/lib/Makefile:1.291
--- src/lib/Makefile:1.290 Thu Apr 8 08:10:30 2021
+++ src/lib/Makefile Fri Apr 9 20:49:05 2021
@@ -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/am-utils/lib
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+= ../external/public-domain/xz/li
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
