X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Frules.def;h=3cf8bf6ed824f64dd822308be9a4860e10be1da0;hb=8aec25f6496659248d997e474195ee4acdcdb976;hp=b4074796794de4f4eb18d1e97c1daa20fc22cc5d;hpb=4be7627787c8ef59b9c2dac636d2665afbb9bf96;p=feisty_meow.git

diff --git a/scripts/clam/rules.def b/scripts/clam/rules.def
index b4074796..3cf8bf6e 100644
--- a/scripts/clam/rules.def
+++ b/scripts/clam/rules.def
@@ -24,13 +24,13 @@ endif
 	$(HIDER)echo
 	$(HIDER)echo [$@] is missing files or has a makefile problem.
 	$(HIDER)echo
-	$(HIDESH)$(CLAM_DIR)/exit_make.sh
+	$(HIDESH)$(CLAM_SCRIPTS)/exit_make.sh
 
 # 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: $@
-	$(HIDESH)$(CLAM_DIR)/exit_make.sh
+	$(HIDESH)$(CLAM_SCRIPTS)/exit_make.sh
 
 # Provides a time-stamp in the make log.
 show_date.%:
@@ -88,11 +88,11 @@ endif
 
 # runs the programs specified in the RUN_TARGETS variable.
 run_targets:
-	$(HIDESH)"$(CLAM_DIR)/target_runner.sh"
+	$(HIDESH)"$(CLAM_SCRIPTS)/target_runner.sh"
 
 # "make_subdirs" travels down each subdirectory and builds using make.
 make_subdirs:
-	$(HIDESH)$(CLAM_DIR)/make_subdirs.sh
+	$(HIDESH)$(CLAM_SCRIPTS)/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
@@ -112,17 +112,15 @@ scratch_other_cleans:
 # is included.  we take a liberty here and also add different versions of
 # the file suffixes so we can clean all versions of the targets.
 add_to_cleanups_variable: $(SUPPLEMENTAL_CLEANUP_TARGETS)
-#	echo "going to add to cleanup variable now with the actual targets as $(ACTUAL_TARGETS)"
-	$(eval CLEANUPS = $(ACTUAL_TARGETS) $(ACTUAL_TARGETS:%.exe=%) $(ACTUAL_TARGETS:%.dll=%.so) $(ACTUAL_TARGETS:%.so=%.dll) $(CLEANUPS) )
+	$(eval CLEANUPS = $(ACTUAL_TARGETS) $(CLEANUPS) )
+#	$(eval CLEANUPS = $(ACTUAL_TARGETS) $(ACTUAL_TARGETS:%.exe=%) $(ACTUAL_TARGETS:%.dll=%.so) $(ACTUAL_TARGETS:%.so=%.dll) $(CLEANUPS) )
 #	echo "new CLEANUPS variable: $(CLEANUPS)"
-#hmmm: above is very code knowledgeable.
-# we should have a working mechanism for doing a specialized
-# type of cleanups addition, so we should rely on that instead of doing it above.
 
-# guard the main cleaning task with our variable
-# so we do not pull in subtargets when we do not want to.
+# main cleaning task.
 ready_to_clean:
-	@echo Whacking [$(CLEANUPS)]
+ifneq "$(CLEANUPS)" ""
+	@echo Whacking [$(notdir $(CLEANUPS))]
+endif
 	$(HIDESH) -c '\
 if [ ! -z "$(CLEANUPS)" ]; then \
   for spork19 in $(CLEANUPS) nonexistentishfileforlist; do \
@@ -134,7 +132,7 @@ fi'
 
 # "clean_subdirs" travels down each subdirectory and cleans using make.
 clean_subdirs:
-	$(HIDESH)$(CLAM_DIR)/clean_subdirs.sh
+	$(HIDESH)$(CLAM_SCRIPTS)/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.