From 4416905a08e10cc1bd70336c5fbcb3aee9186b2a Mon Sep 17 00:00:00 2001
From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 3 Oct 2016 14:24:54 -0400
Subject: [PATCH] fixing generated deps interference with clean

working towards resolving cleaning issues with generated deps file, where a submake will go into a loop during clean trying to make this file.  ugh.
---
 nucleus/applications/bundler/makefile      |  3 +++
 nucleus/applications/bundler/makefile.stub |  1 -
 scripts/clam/cpp/rules.def                 | 16 +++++++++++-----
 scripts/clam/rules.def                     |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/nucleus/applications/bundler/makefile b/nucleus/applications/bundler/makefile
index 7904ea71..9985446c 100644
--- a/nucleus/applications/bundler/makefile
+++ b/nucleus/applications/bundler/makefile
@@ -18,9 +18,12 @@ ifeq "$(COMPILER)" "VISUAL_CPP"
 else
   LIBS_USED += z
 endif
+OTHER_CLEANS += clean_stub
 
 include cpp/rules.def
 
 make_stub:
 	$(MAKE) -f makefile.stub
 
+clean_stub:
+	$(MAKE) -f makefile.stub NO_DEPS=t clean
diff --git a/nucleus/applications/bundler/makefile.stub b/nucleus/applications/bundler/makefile.stub
index a949d012..74af1a0c 100644
--- a/nucleus/applications/bundler/makefile.stub
+++ b/nucleus/applications/bundler/makefile.stub
@@ -10,7 +10,6 @@ ifeq "$(OMIT_VERSIONS)" ""
 endif
 DEFINITIONS += __BUILD_STATIC_APPLICATION__=t
 TARGETS = unpacker_stub.exe
-#ifeq "$(OP_SYSTEM)" "WIN32"
 ifeq "$(COMPILER)" "VISUAL_CPP"
   LIBS_USED += libcmt.lib shlwapi.lib zlib.lib
   LOAD_FLAG_PREFIX += -nodefaultlib:msvcrt.lib 
diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index 1cfc6077..722cb7a0 100644
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -350,9 +350,11 @@ ifeq "$(OMIT_VERSIONS)" ""
   endif
 endif
 
-ifneq "$(GENDEPS)" ""
-  EXTRA_FIRST_TARGETS += gendeps
-endif
+# if we are cleaning up, then do not generate dependency file.
+ifeq "$(CLEAN)" ""
+  ifneq "$(GENDEPS)" ""
+    EXTRA_FIRST_TARGETS += gendeps
+  endif
 
 # only do the deps generation for makefiles that are properly marked.
 ifneq "$(findstring __BUILD_STATIC_APPLICATION__, $(DEFINITIONS))" ""
@@ -360,6 +362,8 @@ ifneq "$(findstring __BUILD_STATIC_APPLICATION__, $(DEFINITIONS))" ""
   GENERATED_DEPS_LIST = $(TARGETS:%.exe=%.gendeps)
 endif
 
+endif
+
 # Make sure that the directory for objects exists.
 ACTUAL_FIRST_TARGETS = check_requirements $(EXTRA_FIRST_TARGETS) $(VERSION_TARGET) $(FIRST_TARGETS) pre_compilation
 
@@ -673,8 +677,10 @@ endif
 
 # includes the auto-dependency information.  the dependency file is checked
 # for being up-to-date.  if not, it gets rebuilt and the make is restarted.
-ifeq "$(NO_DEPS)" ""
-  include $(DEPS_FILE)
+ifeq "$(CLEAN)" ""
+  ifeq "$(NO_DEPS)" ""
+    include $(DEPS_FILE)
+  endif
 endif
 
 # preserves intermediate files from being deleted.
diff --git a/scripts/clam/rules.def b/scripts/clam/rules.def
index b73a06c2..e9f91b15 100644
--- a/scripts/clam/rules.def
+++ b/scripts/clam/rules.def
@@ -117,7 +117,7 @@ ready_to_clean: $(OTHER_CLEANS) clean_subdirs
 	@echo Whacking [$(CLEANUPS)]
 	$(HIDESH) -c '\
 echo the other cleans were: $(OTHER_CLEANS); \
-echo the clean list is: $(CLEANUPS); \
+echo the cleanup removal list is: $(CLEANUPS); \
 if [ ! -z "$(CLEANUPS)" ]; then \
   for i in $(CLEANUPS) nonexistentishfileforlist; do \
     rm -rf "$$i"; \
-- 
2.34.1