Module Name: src
Committed By: rillig
Date: Sat May 25 22:08:35 UTC 2024
Modified Files:
src/usr.bin/make: parse.c
src/usr.bin/make/unit-tests: suff-incomplete.exp suff-main-several.exp
Log Message:
make: use fewer technical terms in debug message for dependency
To generate a diff of this commit:
cvs rdiff -u -r1.726 -r1.727 src/usr.bin/make/parse.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/suff-incomplete.exp
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/suff-main-several.exp
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/parse.c
diff -u src/usr.bin/make/parse.c:1.726 src/usr.bin/make/parse.c:1.727
--- src/usr.bin/make/parse.c:1.726 Sat May 25 21:07:48 2024
+++ src/usr.bin/make/parse.c Sat May 25 22:08:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.726 2024/05/25 21:07:48 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.727 2024/05/25 22:08:35 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.726 2024/05/25 21:07:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.727 2024/05/25 22:08:35 rillig Exp $");
/* Detects a multiple-inclusion guard in a makefile. */
typedef enum {
@@ -636,7 +636,7 @@ LinkSource(GNode *pgn, GNode *cgn, bool
Lst_Append(&cgn->parents, pgn);
if (DEBUG(PARSE)) {
- debug_printf("# LinkSource: added child %s - %s\n",
+ debug_printf("Target \"%s\" depends on \"%s\"\n",
pgn->name, cgn->name);
Targ_PrintNode(pgn, 0);
Targ_PrintNode(cgn, 0);
Index: src/usr.bin/make/unit-tests/suff-incomplete.exp
diff -u src/usr.bin/make/unit-tests/suff-incomplete.exp:1.6 src/usr.bin/make/unit-tests/suff-incomplete.exp:1.7
--- src/usr.bin/make/unit-tests/suff-incomplete.exp:1.6 Tue Dec 28 15:49:00 2021
+++ src/usr.bin/make/unit-tests/suff-incomplete.exp Sat May 25 22:08:35 2024
@@ -17,7 +17,7 @@ ParseDependency(.a.c: ${.PREFIX}.depende
defining transformation from `.a' to `.c'
inserting ".a" (1) at end of list
inserting ".c" (3) at end of list
-# LinkSource: added child .a.c - ${.PREFIX}.dependency
+Target ".a.c" depends on "${.PREFIX}.dependency"
# .a.c, unmade, type OP_DEPENDS|OP_TRANSFORM, flags none
# ${.PREFIX}.dependency, unmade, type none, flags none
Parsing line 23: .DEFAULT:
Index: src/usr.bin/make/unit-tests/suff-main-several.exp
diff -u src/usr.bin/make/unit-tests/suff-main-several.exp:1.11 src/usr.bin/make/unit-tests/suff-main-several.exp:1.12
--- src/usr.bin/make/unit-tests/suff-main-several.exp:1.11 Tue May 7 18:26:22 2024
+++ src/usr.bin/make/unit-tests/suff-main-several.exp Sat May 25 22:08:35 2024
@@ -58,7 +58,7 @@ ParseDependency(suff-main-several.1:)
Parsing line 39: : Making ${.TARGET} out of nothing.
Parsing line 40: next-main: suff-main-several.{2,3,4}
ParseDependency(next-main: suff-main-several.{2,3,4})
-# LinkSource: added child next-main - suff-main-several.{2,3,4}
+Target "next-main" depends on "suff-main-several.{2,3,4}"
# next-main, unmade, type OP_DEPENDS|OP_HAS_COMMANDS, flags none
# suff-main-several.{2,3,4}, unmade, type none, flags none
Parsing line 42: .MAKEFLAGS: -d0 -dg1