fixing generated deps interference with clean

[feisty_meow.git] / scripts / clam / rules.def

diff --git a/scripts/clam/rules.def b/scripts/clam/rules.def
index 1a526236253122c9d80f33b3f223f8123fc9be1d..e9f91b155d5aa7ee70d4107ed9a323a480b8a0d4 100644 (file)
--- a/scripts/clam/rules.def
+++ b/scripts/clam/rules.def
@@ -34,7 +34,7 @@ endif
 
 # Provides a time-stamp in the make log.
 show_date.%:
-       $(HIDER)echo "The time right now is $(shell date)"
+       $(HIDER)echo "{$(shell date)}"
 
 # The .make rule changes to the directory with the same first part of the
 # pattern and makes whatever projects are there.  This is used by the build
@@ -51,12 +51,12 @@ else \
   echo Skipping missing directory [$*]; \
 fi'
 
-# always run the targets.  if they don't exist, that's an error.
+# always run the exes listed in RUN_TARGETS.
 .PHONY: run_targets
 
 # "all" is the first target to execute in any makefile.  we capture it and
 # use it to produce the requested actions.
-all: start $(ACTUAL_FIRST_TARGETS) $(ACTUAL_TARGETS) $(ACTUAL_LAST_TARGETS) $(RUN_TARGETS:%=run_targets) finish 
+all: start $(ACTUAL_FIRST_TARGETS) $(ACTUAL_TARGETS) $(ACTUAL_LAST_TARGETS) run_targets finish 
 
 # "start" announces the beginning of compilation.
 start:
@@ -79,7 +79,7 @@ endif
 ifeq "$(NOT_FIRST_MAKE)" ""
        $(HIDESH) -c '\
 if [ ! -f "$(FAILURE_FILE)" ]; then \
-  $(SHELL) $(CLAM_DIR)/sound_play.sh $(CLAM_FINISH_SOUND); \
+  $(SHELL) $(FEISTY_MEOW_SCRIPTS)/multimedia/sound_play.sh $(CLAM_FINISH_SOUND); \
 fi'
 endif
 # toss the flag files so we do not see them again.
@@ -87,26 +87,8 @@ endif
 
 # runs the programs specified in the RUN_TARGETS variable.
 run_targets:
-       $(HIDESH) -c '\
-if [ ! -z "$(RUN_TARGETS)" ]; then \
-  if [ -f "$(DIRTY_FILE)" -o -f "$(SUBMAKE_FLAG)" ]; then \
-    total_exitval=0; \
-    for program_name in $(RUN_TARGETS); do \
-      base=`basename $$program_name`; \
-      "$$program_name"; \
-      exitval=$$?; \
-      if [ $$exitval -ne 0 ]; then \
-        echo -e "ERROR: $$program_name at `date`"; \
-        total_exitval=$$(($$total_exitval + 1)); \
-      fi; \
-    done; \
-    if [ $$total_exitval -ne 0 ]; then \
-      echo "FAILURE: errors occurred in RUN_TARGETS."; \
-      echo yep >"$(FAILURE_FILE)"; \
-      exit 1; \
-    fi; \
-  fi; \
-fi'
+       $(HIDESH)"$(CLAM_DIR)/target_runner.sh"
+#### "$(RUN_TARGETS)"
 
 # "make_subdirs" travels down each subdirectory and builds using make.
 make_subdirs:
@@ -135,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"; \