Module Name: src
Committed By: jkoshy
Date: Mon Apr 18 19:40:07 UTC 2022
Modified Files:
src/tools/ctfconvert: Makefile
src/tools/ctfmerge: Makefile
Log Message:
Update 'tools/ctf{merge,convert}' to use the new build locations for
'libelf' and 'libdwarf'.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tools/ctfconvert/Makefile
cvs rdiff -u -r1.10 -r1.11 src/tools/ctfmerge/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/ctfconvert/Makefile
diff -u src/tools/ctfconvert/Makefile:1.9 src/tools/ctfconvert/Makefile:1.10
--- src/tools/ctfconvert/Makefile:1.9 Tue May 1 19:59:46 2018
+++ src/tools/ctfconvert/Makefile Mon Apr 18 19:40:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:46 christos Exp $
+# $NetBSD: Makefile,v 1.10 2022/04/18 19:40:06 jkoshy Exp $
.include <bsd.hostinit.mk>
@@ -45,8 +45,8 @@ OSNETDIR= ${.CURDIR}/../../external/cddl
OPENSOLARIS_DISTDIR= ${OSNETDIR}/dist
CTFOBJ!= cd ${.CURDIR}/../libctf && ${PRINTOBJDIR}
-DWARFOBJ!= cd ${.CURDIR}/../libdwarf && ${PRINTOBJDIR}
-ELFOBJ!= cd ${.CURDIR}/../libelf && ${PRINTOBJDIR}
+DWARFOBJ!= cd ${.CURDIR}/../elftoolchain/libdwarf && ${PRINTOBJDIR}
+ELFOBJ!= cd ${.CURDIR}/../elftoolchain/libelf && ${PRINTOBJDIR}
LDADD+= -L${CTFOBJ} -lctf
DPADD+= ${CTFOBJ}/libctf.a
LDADD+= -L${DWARFOBJ} -ldwarf
Index: src/tools/ctfmerge/Makefile
diff -u src/tools/ctfmerge/Makefile:1.10 src/tools/ctfmerge/Makefile:1.11
--- src/tools/ctfmerge/Makefile:1.10 Tue May 1 19:59:46 2018
+++ src/tools/ctfmerge/Makefile Mon Apr 18 19:40:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:46 christos Exp $
+# $NetBSD: Makefile,v 1.11 2022/04/18 19:40:06 jkoshy Exp $
.include <bsd.hostinit.mk>
@@ -25,8 +25,8 @@ OSNETDIR= ${.CURDIR}/../../external/cddl
OPENSOLARIS_DISTDIR= ${OSNETDIR}/dist
CTFOBJ!= cd ${.CURDIR}/../libctf && ${PRINTOBJDIR}
-DWARFOBJ!= cd ${.CURDIR}/../libdwarf && ${PRINTOBJDIR}
-ELFOBJ!= cd ${.CURDIR}/../libelf && ${PRINTOBJDIR}
+DWARFOBJ!= cd ${.CURDIR}/../elftoolchain/libdwarf && ${PRINTOBJDIR}
+ELFOBJ!= cd ${.CURDIR}/../elftoolchain/libelf && ${PRINTOBJDIR}
LDADD+= -L${CTFOBJ} -lctf
LDADD+= -L${DWARFOBJ} -ldwarf
LDADD+= -L${ELFOBJ} -lelf
