[csw-devel] SF.net SVN: gar:[2618] csw/mgar/gar/v2/gar.mk

[dmichelsen at users.sourceforge.net]

Revision: 2618
          http://gar.svn.sourceforge.net/gar/?rev=2618&view=rev
Author:   dmichelsen
Date:     2008-12-16 15:27:14 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
mGAR v2: Small fix for reset-configure-* and minor cleanups of testcode

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2008-12-16 15:07:35 UTC (rev 2617)
+++ csw/mgar/gar/v2/gar.mk	2008-12-16 15:27:14 UTC (rev 2618)
@@ -46,8 +46,10 @@
 # successfully completed
 #DONADA = @echo "	[$@] complete.  Finished rules: $+"
 #DONADA = @touch $(COOKIEDIR)/$@; echo "	[$@] complete for $(GARNAME)."
-DONADA = @touch $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$@); echo "	[$@] complete for $(GARNAME)."
+COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1)
+DONADA = @touch $(call COOKIEFILE,$@); echo "	[$@] complete for $(GARNAME)."
 
+
 # TODO: write a stub rule to print out the name of a rule when it
 # *does* do something, and handle indentation intelligently.
 
@@ -136,10 +138,6 @@
 endef
 
 define _modulate_do
-xtest-$(2):
-	@gmake -s MODULATION=$(2) $(4) _pmod
-	@# The next line has intentionally been left blank
-
 $(call _modulate_target,extract,$(2),$(4))
 $(call _modulate_target,patch,$(2),$(4))
 $(call _modulate_target,configure,$(2),$(4))
@@ -188,12 +186,6 @@
 
 $(eval $(call _modulate,$(MODULATORS)))
 
-moddebug:
-	@echo $(strip $(strip $(call _modulate,$(MODULATORS))))
-
-allmod: $(foreach M,$(MODULATIONS),xtest-$(M))
-
-
 modenv:
 	@echo " Modulators: $(MODULATORS)"
 	@echo "Modulations: $(MODULATIONS)"
@@ -381,14 +373,12 @@
 .PHONY: reset-configure reset-configure-modulated
 reconfigure: reset-configure configure
 
-reset-configure-isa:
+reset-configure: $(addprefix reset-configure-,$(MODULATIONS))
+	rm -f $(COOKIEDIR)/configure
 
-reset-configure:
-	@$(foreach ISA,$(NEEDED_ISAS),$(MAKE) -s ISA=$(ISA) reset-configure-isa;)
+reset-configure-modulated:
+	rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS))
 
-reconfigure-isa-%:
-	@$(MAKE) -s ISA=$* reset-configure-isa configure-isa
-
 # returns true if configure has completed successfully, false
 # otherwise
 configure-p:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.