Module Name: src Committed By: rillig Date: Thu Jan 19 21:33:06 UTC 2023
Modified Files: src/usr.bin/make: main.c make.h Log Message: make: inline macro for variable name This fixes the inconsistency of using the macro name in one place and its value in another place (since 2010). No binary change. To generate a diff of this commit: cvs rdiff -u -r1.586 -r1.587 src/usr.bin/make/main.c cvs rdiff -u -r1.308 -r1.309 src/usr.bin/make/make.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/make/main.c diff -u src/usr.bin/make/main.c:1.586 src/usr.bin/make/main.c:1.587 --- src/usr.bin/make/main.c:1.586 Sun Jan 1 16:46:26 2023 +++ src/usr.bin/make/main.c Thu Jan 19 21:33:06 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.586 2023/01/01 16:46:26 rillig Exp $ */ +/* $NetBSD: main.c,v 1.587 2023/01/19 21:33:06 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -111,7 +111,7 @@ #include "trace.h" /* "@(#)main.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: main.c,v 1.586 2023/01/01 16:46:26 rillig Exp $"); +MAKE_RCSID("$NetBSD: main.c,v 1.587 2023/01/19 21:33:06 rillig Exp $"); #if defined(MAKE_NATIVE) && !defined(lint) __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 " "The Regents of the University of California. " @@ -1357,7 +1357,7 @@ main_Init(int argc, char **argv) # define MAKEFILE_PREFERENCE_LIST "makefile Makefile" #endif Global_Set(MAKE_MAKEFILE_PREFERENCE, MAKEFILE_PREFERENCE_LIST); - Global_Set(MAKE_DEPENDFILE, ".depend"); + Global_Set(".MAKE.DEPENDFILE", ".depend"); CmdOpts_Init(); allPrecious = false; /* Remove targets when interrupted */ Index: src/usr.bin/make/make.h diff -u src/usr.bin/make/make.h:1.308 src/usr.bin/make/make.h:1.309 --- src/usr.bin/make/make.h:1.308 Mon Oct 10 21:17:25 2022 +++ src/usr.bin/make/make.h Thu Jan 19 21:33:06 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: make.h,v 1.308 2022/10/10 21:17:25 rillig Exp $ */ +/* $NetBSD: make.h,v 1.309 2023/01/19 21:33:06 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -616,7 +616,6 @@ extern pid_t myPid; #define MAKE_MAKEFILES ".MAKE.MAKEFILES" /* all loaded makefiles */ #define MAKE_LEVEL ".MAKE.LEVEL" /* recursion level */ #define MAKE_MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE" -#define MAKE_DEPENDFILE ".MAKE.DEPENDFILE" /* .depend */ #define MAKE_MODE ".MAKE.MODE" #ifndef MAKE_LEVEL_ENV # define MAKE_LEVEL_ENV "MAKELEVEL"