X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Frules.def;h=a6f65b5b3180dfb9c4a0b969e55cf3174d4cd610;hb=fc8ec007bcbe990fc374f1a3019547e13554c496;hp=2b506ab850568393cbfbcc0796187f8428c65cc6;hpb=2952ccf47b80174880141a7ecfa122089f349b8d;p=feisty_meow.git

diff --git a/scripts/clam/rules.def b/scripts/clam/rules.def
index 2b506ab8..a6f65b5b 100644
--- a/scripts/clam/rules.def
+++ b/scripts/clam/rules.def
@@ -29,12 +29,12 @@ endif
 # This rule halts make for some supposedly devastating reason.  More
 # information should be printed out by the cause of the halt.
 %.halt:
-	@echo CLAM execution halted, the cause being $@...
+	@echo CLAM execution halted, the cause being: $@
 	$(HIDESH)$(CLAM_DIR)/exit_make.sh
 
 # 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
@@ -50,11 +50,13 @@ if [ -d $* ]; then \
 else \
   echo Skipping missing directory [$*]; \
 fi'
-#used to include message for first case: echo "Entering directory [$*]"; 
+
+# 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:
@@ -63,7 +65,7 @@ if [ ! -d "$(CLAM_TMP)" ]; then \
   mkdir "$(CLAM_TMP)"; \
 fi'
 ifeq "$(QUIET)" ""
-	$(HIDER)echo Project $(PROJECT) [$(shell basename $(shell dirname $(shell pwd) ) )/$(shell basename $(shell pwd) )] v. $(major).$(minor).$(revision).$(build).
+	$(HIDER)echo Project $(PROJECT) [$(shell basename $(shell dirname $(shell pwd) ) )/$(shell basename $(shell pwd) )] v. $(major).$(minor).$(revision).$(build)
 endif
 	$(HIDER)rm -f $(FLAG_FILES)
 
@@ -85,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."; \
-    fi; \
-  fi; \
-fi'
-#hmmm: run targets needs to work on a hierarchy.
-#hmmm: old idea?    exit $$total_exitval; \
+	$(HIDESH)"$(CLAM_DIR)/target_runner.sh"
+#### "$(RUN_TARGETS)"
 
 # "make_subdirs" travels down each subdirectory and builds using make.
 make_subdirs:
@@ -121,7 +105,6 @@ for i in *; do \
   fi \
 done; \
 exit 0'
-##echo Entering $$i now...; 
 
 # "clean" is a default target that removes object files, libs, executable
 # files and such that were created by the project.  it invokes the makefile
@@ -131,7 +114,7 @@ clean:
 	$(HIDER)$(MAKE) --silent CLEAN=t ready_to_clean
 
 ready_to_clean: $(OTHER_CLEANS) clean_subdirs
-	@echo Whacking [$(CLEANUPS)].
+	@echo Whacking [$(CLEANUPS)]
 	$(HIDESH) -c '\
 echo the other cleans were: $(OTHER_CLEANS); \
 echo the clean list is: $(CLEANUPS); \