removed debugging

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

diff --git a/scripts/clam/rules.def b/scripts/clam/rules.def
index a6f65b5b3180dfb9c4a0b969e55cf3174d4cd610..4d0be0e8712b3933df947eb2cdd78fb555251c77 100644 (file)
--- a/scripts/clam/rules.def
+++ b/scripts/clam/rules.def
@@ -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.
@@ -88,64 +88,44 @@ endif
 # runs the programs specified in the RUN_TARGETS variable.
 run_targets:
        $(HIDESH)"$(CLAM_DIR)/target_runner.sh"
-#### "$(RUN_TARGETS)"
 
 # "make_subdirs" travels down each subdirectory and builds using make.
 make_subdirs:
-       $(HIDESH) -c '\
-for i in *; do \
-  if [ -d $$i ]; then \
-    if [ -f $$i/$(MAKEFILE_NAME) -a ! $$i -ef `pwd` ]; then \
-      echo; \
-      (cd $$i; $(MAKE) --silent NOT_FIRST_MAKE=t -f $(MAKEFILE_NAME) ); \
-    else \
-      echo Skipping makefile-less directory $$i...; \
-      echo; \
-    fi \
-  fi \
-done; \
-exit 0'
+       $(HIDESH)$(CLAM_DIR)/make_subdirs.sh
 
 # "clean" is a default target that removes object files, libs, executable
 # files and such that were created by the project.  it invokes the makefile
 # again with the CLEAN variable defined so that this can be passed down into
 # all subsequent makes.
-clean: 
-       $(HIDER)$(MAKE) --silent CLEAN=t ready_to_clean
+clean: set_cleaner_variable $(OTHER_CLEANS) scratch_other_cleans clean_subdirs  ready_to_clean
+       @# no code here.
+
+set_cleaner_variable:
+       $(eval CLEAN := true)
 
-ready_to_clean: $(OTHER_CLEANS) clean_subdirs
+scratch_other_cleans:
+       $(eval OTHER_CLEANS := )
+
+ready_to_clean:
        @echo Whacking [$(CLEANUPS)]
        $(HIDESH) -c '\
-echo the other cleans were: $(OTHER_CLEANS); \
-echo the clean list is: $(CLEANUPS); \
 if [ ! -z "$(CLEANUPS)" ]; then \
-  for i in $(CLEANUPS) nonexistentishfileforlist; do \
-    rm -rf "$$i"; \
+  for spork19 in $(CLEANUPS) nonexistentishfileforlist; do \
+    rm -rf "$$spork19"; \
   done \
 fi'
 
 # "clean_subdirs" travels down each subdirectory and cleans using make.
 clean_subdirs:
-       $(HIDESH) -c '\
-for i in *; do \
-  if [ -d "$$i" ]; then \
-    if [ -f "$$i/$(MAKEFILE_NAME)" -a ! "$$i" -ef `pwd` ]; then \
-      (cd "$$i"; $(MAKE) --silent NOT_FIRST_MAKE=t -f $(MAKEFILE_NAME) clean); \
-    else \
-      echo "Skipping makefile-less directory $$i..."; \
-    fi \
-  fi \
-done; \
-exit 0'
-###echo Cleaning "$$i" now...; 
+       $(HIDESH)$(CLAM_DIR)/clean_subdirs.sh
 
 # "rm_links" removes the files in the current directory that are links
 # to other files.  this is only useful in a unix environment.
 rm_links:
        $(HIDESH) -c '\
-for i in *; do \
-  if [ -h "$$i" ]; then \
-    /bin/rm -f "$$i"; \
+for gujira26 in *; do \
+  if [ -h "$$gujira26" ]; then \
+    /bin/rm -f "$$gujira26"; \
   fi \
 done; \
 exit 0'