commit cb61fe3c30d8d2166f8879b11dc8d229e3167b9f
from: Benjamin Stürz <benni@stuerz.xyz>
date: Wed Nov 13 00:34:34 2024 UTC

make: implement combination of -p and -v

commit - e2b738536f63b2e6c945915fcda4e35ec3a0ae15
commit + cb61fe3c30d8d2166f8879b11dc8d229e3167b9f
blob - 4add2fee39fba65f68ce2481140f8918aa809d78
blob + 6f298860a93b6ecdd0f66e4f148d93162268be43
--- make/make.c
+++ make/make.c
@@ -1264,9 +1264,11 @@ struct path *path;
 
 /* MAIN */
 
-print_sc (sc)
+print_sc (prefix, sc, verbose)
+struct path *prefix;
 struct scope *sc;
 {
+	struct path *new_prefix;
 	struct inference *inf;
 	struct scope *sub;
 	struct macro *m;
@@ -1275,6 +1277,9 @@ struct scope *sc;
 	struct rule *r;
 	char **s;
 
+	if (verbose)
+		printf ("=== %s/%s\n", path_to_str (prefix), MAKEFILE);
+
 	if (sc->type != SC_DIR || sc->dir == NULL)
 		errx (1, "print_sc(): must be of type SC_DIR");
 
@@ -1322,6 +1327,20 @@ struct scope *sc;
 				printf (", %s", sub->gnu->file);
 			printf ("\n");
 			break;
+		}
+	}
+
+	if (verbose) {
+		for (sub = sc->dir->subdirs; sub != NULL; sub = sub->next) {
+			if (sub->type != SC_DIR)
+				continue;
+
+			printf ("\n");
+			tmppath.name = sub->name;
+			new_prefix = path_cat (prefix, &tmppath);
+			parse_dir (sub, new_prefix);
+			print_sc (new_prefix, sub, verbose);
+			free (new_prefix);
 		}
 	}
 
@@ -1380,13 +1399,14 @@ char **argv;
 
 	path = parse_path (".");
 	sc = parse_recursive (path);
-	free (path);
 
 	if (pr) {
-		print_sc (sc);
+		print_sc (path, sc, verbose);
 		return 0;
 	}
 
+	free (path);
+
 	for (i = 0; i < argc; ++i) {
 		if (argv[i] == NULL)
 			continue;