Module Name: src
Committed By: christos
Date: Sun Mar 9 17:12:03 UTC 2014
Modified Files:
src/tools/ctfconvert: Makefile
src/tools/ctfmerge: Makefile
Log Message:
switch to the new libelf and libdwarf
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tools/ctfconvert/Makefile
cvs rdiff -u -r1.4 -r1.5 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.4 src/tools/ctfconvert/Makefile:1.5
--- src/tools/ctfconvert/Makefile:1.4 Sun Jan 27 14:21:12 2013
+++ src/tools/ctfconvert/Makefile Sun Mar 9 13:12:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/01/27 19:21:12 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/09 17:12:03 christos Exp $
NOMAN= # defined
@@ -27,8 +27,9 @@ HOST_SRCDIR= external/cddl/osnet/usr.
traverse.c \
util.c
-LIBELF_DIR= ${.CURDIR}/../../external/bsd/libelf/dist
-LIBDWARF_DIR= ${.CURDIR}/../../external/bsd/libdwarf/dist
+ELFTOOLCHAIN_DIR= ${.CURDIR}/../../external/bsd/elftoolchain/dist
+LIBELF_DIR= ${ELFTOOLCHAIN_DIR}/libelf
+LIBDWARF_DIR= ${ELFTOOLCHAIN_DIR}/libdwarf
HOST_CPPFLAGS+= -I${OSNETDIR}/sys \
-I${OSNETDIR}/include \
Index: src/tools/ctfmerge/Makefile
diff -u src/tools/ctfmerge/Makefile:1.4 src/tools/ctfmerge/Makefile:1.5
--- src/tools/ctfmerge/Makefile:1.4 Sun Jan 27 14:21:12 2013
+++ src/tools/ctfmerge/Makefile Sun Mar 9 13:12:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/01/27 19:21:12 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/09 17:12:03 christos Exp $
NOMAN= # defined
@@ -7,8 +7,9 @@ NOMAN= # defined
HOSTPROGNAME= ${_TOOL_PREFIX}ctfmerge
HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfmerge
-LIBELF_DIR= ${.CURDIR}/../../external/bsd/libelf/dist
-LIBDWARF_DIR= ${.CURDIR}/../../external/bsd/libdwarf/dist
+LIBELFTOOLCHAIN_DIR= ${.CURDIR}/../../external/bsd/elftoolchain/dist
+LIBELF_DIR= ${LIBELFTOOLCHAIN_DIR}/libelf
+LIBDWARF_DIR= ${LIBELFTOOLCHAIN_DIR}libdwarf
HOST_CPPFLAGS+= -I${OSNETDIR}/sys \
-I${OSNETDIR}/include \
