Module Name: src
Committed By: christos
Date: Tue Mar 26 16:48:34 UTC 2024
Modified Files:
src/tools: Makefile.nbincludes
src/tools/elftoolchain/libdwarf: Makefile
Log Message:
- fix nbincludes so that it can be included from any level
- add elftoolchain/common to the list of headers to be build before depend
- make libdwarf build the includes since it needs <sys/elfdefinitions.h>
which does not exist on non-netbsd systems.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tools/Makefile.nbincludes
cvs rdiff -u -r1.3 -r1.4 src/tools/elftoolchain/libdwarf/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/Makefile.nbincludes
diff -u src/tools/Makefile.nbincludes:1.6 src/tools/Makefile.nbincludes:1.7
--- src/tools/Makefile.nbincludes:1.6 Sun Jun 4 06:00:20 2023
+++ src/tools/Makefile.nbincludes Tue Mar 26 12:48:34 2024
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile.nbincludes,v 1.6 2023/06/04 10:00:20 lukem Exp $
+# $NetBSD: Makefile.nbincludes,v 1.7 2024/03/26 16:48:34 christos Exp $
.include <bsd.hostinit.mk>
-_ARCHDIR= ${.CURDIR}/../../sys/arch
-_INCDIR= ${.CURDIR}/../../include
-_SYSDIR= ${.CURDIR}/../../sys/sys
-_UFSDIR= ${.CURDIR}/../../sys/ufs
+_ARCHDIR:= ${.PARSEDIR}/../sys/arch
+_INCDIR:= ${.PARSEDIR}/../include
+_SYSDIR:= ${.PARSEDIR}/../sys/sys
+_UFSDIR:= ${.PARSEDIR}/../sys/ufs
+_ELFTOOLCHAINDIR:= ${.PARSEDIR}/elftoolchain
_SUBDIR!= cd ${_ARCHDIR} && ${MAKE} -V SUBDIR
.if make(depend) || make(all) || make(dependall) || make(install)
# There's no need to run these commands for "make cleandir" or "make obj",
# and TOOL_SED will not yet have been built.
_UFS_INCS!= cd ${_UFSDIR} && find ffs ufs -name '*.h'
-_ARCH_INCS!= ${TOOL_SED} -e 's/^\#.*//' ${.CURDIR}/../headerlist
+_ARCH_INCS!= ${TOOL_SED} -e 's/^\#.*//' ${.PARSEDIR}/headerlist
.endif
_ARCH_INCS+= ews4800mips/include/pdinfo.h ews4800mips/include/vtoc.h
@@ -45,3 +46,4 @@ beforedepend:
${TOOL_PAX} -rw ${_UFS_INCS} ${TOOLDIR}/include/nbinclude/ufs
cd ${TOOLDIR}/include/nbinclude && rm -f machine && \
${HOST_INSTALL_SYMLINK} ${MACHINE} machine
+ cd ${_ELFTOOLCHAINDIR}/common && ${MAKE} includes
Index: src/tools/elftoolchain/libdwarf/Makefile
diff -u src/tools/elftoolchain/libdwarf/Makefile:1.3 src/tools/elftoolchain/libdwarf/Makefile:1.4
--- src/tools/elftoolchain/libdwarf/Makefile:1.3 Sun Mar 3 12:37:58 2024
+++ src/tools/elftoolchain/libdwarf/Makefile Tue Mar 26 12:48:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/03/03 17:37:58 christos Exp $
+# $NetBSD: Makefile,v 1.4 2024/03/26 16:48:34 christos Exp $
HOSTLIB=dwarf
@@ -97,4 +97,5 @@ CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_F
HOST_CPPFLAGS:= ${CPPFLAGS} ${HOST_CPPFLAGS}
CPPFLAGS:= # empty
+.include "../../Makefile.nbincludes"
.include <bsd.hostlib.mk>
