From c69e189ea0c3f15b46240e0dfd122ceadf6b84c1 Mon Sep 17 00:00:00 2001
From: Vitaly Provodin <vitaly.provodin@jetbrains.com>
Date: Tue, 4 Feb 2025 15:05:22 +0400
Subject: [PATCH] JBR-8219 revert "8292944: Noisy output when running make help
 the first time"

This reverts commit fcd5ebc7e8964c7936c0eede031cb6193621f5fb.
---
 make/Init.gmk             |  6 ------
 make/Main.gmk             |  1 -
 make/RunTestsPrebuilt.gmk |  3 +--
 make/common/FindTests.gmk | 10 ++++------
 make/common/Modules.gmk   |  6 ++----
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/make/Init.gmk b/make/Init.gmk
index 5a10f42482f8..2e71319c9a88 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -47,12 +47,6 @@ include $(TOPDIR)/make/common/MakeBase.gmk
 include $(TOPDIR)/make/InitSupport.gmk
 include $(TOPDIR)/make/common/LogUtils.gmk
 
-# Force early generation of module-deps.gmk and find-tests.gmk
-GENERATE_MODULE_DEPS_FILE := true
-include $(TOPDIR)/make/common/Modules.gmk
-GENERATE_FIND_TESTS_FILE := true
-include $(TOPDIR)/make/common/FindTests.gmk
-
 # Parse COMPARE_BUILD (for makefile development)
 $(eval $(call ParseCompareBuild))
 
diff --git a/make/Main.gmk b/make/Main.gmk
index bcb1b025618f..ad8106c12711 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -1483,7 +1483,6 @@ print-tests:
 
 create-main-targets-include:
 	  $(call LogInfo, Generating main target list)
-	  $(call MakeDir, $(MAKESUPPORT_OUTPUTDIR))
 	  @$(ECHO) ALL_MAIN_TARGETS := $(sort $(ALL_TARGETS)) > \
 	      $(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk
 
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index 3bfcebd4be49..f8d788fe0f0c 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -301,8 +301,7 @@ test-prebuilt:
         # are always found and parsed, call FindTests.gmk stand alone once
         # before calling RunTests.gmk.
 	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/common/FindTests.gmk \
-	    SPEC=$(SPEC) FINDTESTS_STAND_ALONE=true \
-	    GENERATE_FIND_TESTS_FILE=true
+	    SPEC=$(SPEC) FINDTESTS_STAND_ALONE=true
 	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"
 
diff --git a/make/common/FindTests.gmk b/make/common/FindTests.gmk
index 5dfe49e59012..db9cfe774def 100644
--- a/make/common/FindTests.gmk
+++ b/make/common/FindTests.gmk
@@ -62,11 +62,10 @@ $(foreach root, $(JTREG_TESTROOTS), \
 # Cache the expensive to calculate test names in a generated makefile.
 FIND_TESTS_CACHE_FILE := $(MAKESUPPORT_OUTPUTDIR)/find-tests.gmk
 
-ifeq ($(GENERATE_FIND_TESTS_FILE), true)
-  # If this file is deemed outdated, it will automatically get regenerated
-  # by this rule before being included below.
-  $(FIND_TESTS_CACHE_FILE): $(JTREG_ROOT_FILES) $(JTREG_GROUP_FILES) \
-      $(TOPDIR)/test/make/TestMake.gmk
+# If this file is deemed outdated, it will automatically get regenerated
+# by this rule before being included below.
+$(FIND_TESTS_CACHE_FILE): $(JTREG_ROOT_FILES) $(JTREG_GROUP_FILES) \
+    $(TOPDIR)/test/make/TestMake.gmk
 	$(call MakeTargetDir)
 	( $(foreach root, $(JTREG_TESTROOTS), \
 	    $(PRINTF) "\n$(root)_JTREG_TEST_GROUPS := " ; \
@@ -79,7 +78,6 @@ ifeq ($(GENERATE_FIND_TESTS_FILE), true)
 	$(MAKE) -s --no-print-directory $(MAKE_ARGS) \
 	    SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
 	    TARGETS_FILE=$@
-endif
 
 -include $(FIND_TESTS_CACHE_FILE)
 
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 4fc0288f2513..c8c78ed8041f 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -172,9 +172,8 @@ MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk
 
 MODULE_INFOS := $(call FindAllModuleInfos, *)
 
-ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
-  $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
-      $(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps)
+$(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
+    $(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps)
 	$(call MakeTargetDir)
 	$(RM) $@
 	$(foreach m, $(MODULE_INFOS), \
@@ -207,7 +206,6 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
 	                          printf(" %s", $$0) } \
 	          END           { printf("\n") }' $m \
 	    ) >> $@ $(NEWLINE))
-endif
 
 -include $(MODULE_DEPS_MAKEFILE)