Module Name: src
Committed By: christos
Date: Mon Apr 1 02:18:31 UTC 2024
Modified Files:
src/tools: Makefile.nbincludes
src/tools/elftoolchain/common/sys: Makefile
Removed Files:
src/tools/elftoolchain/common/sys: elfdefinitions.h
Log Message:
revert previous, riastradh fixed it correctly and this is not needed.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tools/Makefile.nbincludes
cvs rdiff -u -r1.4 -r1.5 src/tools/elftoolchain/common/sys/Makefile
cvs rdiff -u -r1.1 -r0 src/tools/elftoolchain/common/sys/elfdefinitions.h
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.9 src/tools/Makefile.nbincludes:1.10
--- src/tools/Makefile.nbincludes:1.9 Sat Mar 30 23:20:38 2024
+++ src/tools/Makefile.nbincludes Sun Mar 31 22:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.nbincludes,v 1.9 2024/03/31 03:20:38 christos Exp $
+# $NetBSD: Makefile.nbincludes,v 1.10 2024/04/01 02:18:30 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,5 +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/sys && \
- ${TOOL_PAX} -rw elfdefinitions.h ${TOOLDIR}/includes/sys
Index: src/tools/elftoolchain/common/sys/Makefile
diff -u src/tools/elftoolchain/common/sys/Makefile:1.4 src/tools/elftoolchain/common/sys/Makefile:1.5
--- src/tools/elftoolchain/common/sys/Makefile:1.4 Sat Mar 30 23:20:38 2024
+++ src/tools/elftoolchain/common/sys/Makefile Sun Mar 31 22:18:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/03/31 03:20:38 christos Exp $
+# $NetBSD: Makefile,v 1.5 2024/04/01 02:18:30 christos Exp $
.include <bsd.hostinit.mk>
@@ -10,10 +10,10 @@ INCS= elfdefinitions.h
HOST_INCSDIR= ${TOOLDIR}/include/sys
# Too early for ${TOOL_M4}
-#elfdefinitions.h: elfdefinitions.m4 elfconstants.m4
-# ${_MKTARGET_CREATE}
-# ${TOOL_M4} -I${SRCDIR} -D SRCDIR=${SRCDIR} ${M4FLAGS} \
-# elfdefinitions.m4 > ${.TARGET}
+elfdefinitions.h: elfdefinitions.m4 elfconstants.m4
+ ${_MKTARGET_CREATE}
+ ${TOOL_M4} -I${SRCDIR} -D SRCDIR=${SRCDIR} ${M4FLAGS} \
+ elfdefinitions.m4 > ${.TARGET}
.PHONY: all clean clobber depend
@@ -35,7 +35,7 @@ includes: .PHONY ${HOST_INCSDIR} .WAIT $
all dependall depend: ${INCS}
clean clobber:
-# rm -f ${INCS}
+ rm -f ${INCS}
cleandepend:
rm -f ${.OBJDIR}/.depend
