Module Name: src Committed By: christos Date: Wed Mar 27 21:54:43 UTC 2024
Modified Files: src/tools: Makefile.nbincludes src/tools/elftoolchain/libdwarf: Makefile Log Message: Remove dependency to elfdefinitions.h, this is a mess, since it needs ${TOOL_M4} which might not be available yet. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tools/Makefile.nbincludes cvs rdiff -u -r1.4 -r1.5 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.7 src/tools/Makefile.nbincludes:1.8 --- src/tools/Makefile.nbincludes:1.7 Tue Mar 26 12:48:34 2024 +++ src/tools/Makefile.nbincludes Wed Mar 27 17:54:43 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.nbincludes,v 1.7 2024/03/26 16:48:34 christos Exp $ +# $NetBSD: Makefile.nbincludes,v 1.8 2024/03/27 21:54:43 christos Exp $ .include <bsd.hostinit.mk> @@ -6,7 +6,6 @@ _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) @@ -46,4 +45,3 @@ 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.4 src/tools/elftoolchain/libdwarf/Makefile:1.5 --- src/tools/elftoolchain/libdwarf/Makefile:1.4 Tue Mar 26 12:48:34 2024 +++ src/tools/elftoolchain/libdwarf/Makefile Wed Mar 27 17:54:43 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2024/03/26 16:48:34 christos Exp $ +# $NetBSD: Makefile,v 1.5 2024/03/27 21:54:43 christos Exp $ HOSTLIB=dwarf @@ -73,7 +73,6 @@ COMPATLIB_NO_LIB= yes # only the include LIBDWARF_OBJDIR!= cd ${.CURDIR} && ${PRINTOBJDIR} -CPPFLAGS+= -DBUILTIN_ELF_HEADERS CPPFLAGS+= -I${.CURDIR}/../../compat CPPFLAGS+= -I${.CURDIR}/../../common CPPFLAGS+= -I${LIBDWARF_OBJDIR}/../common @@ -97,5 +96,4 @@ CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 -D_F HOST_CPPFLAGS:= ${CPPFLAGS} ${HOST_CPPFLAGS} CPPFLAGS:= # empty -.include "../../Makefile.nbincludes" .include <bsd.hostlib.mk>