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

[dmichelsen at users.sourceforge.net]

Revision: 3058
          http://gar.svn.sourceforge.net/gar/?rev=3058&view=rev
Author:   dmichelsen
Date:     2009-02-10 21:16:04 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
mGAR v2: Introduce DEBUG_MERGING

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2009-02-10 21:12:17 UTC (rev 3057)
+++ csw/mgar/gar/v2/gar.mk	2009-02-10 21:16:04 UTC (rev 3058)
@@ -480,6 +480,12 @@
 # Automatic merging is only possible if you have the default modulation "ISA"
 # Otherwise you *must* specify merge scripts for all modulations.
 
+ifeq ($(DEBUG_MERGING),)
+_DBG_MERGE=@
+else
+_DBG_MERGE=
+endif
+
 ifeq ($(NEEDED_ISAS),$(ISA_DEFAULT))
 MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-all $(EXTRA_MERGE_SCRIPTS_$(ISA_DEFAULT)) $(EXTRA_MERGE_SCRIPTS)
 else
@@ -571,14 +577,14 @@
 
 # Copy the whole tree verbatim
 merge-copy-all: $(PKGROOT) $(INSTALLISADIR)
-	@(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
 		$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \
 		. $(PKGROOT))
 	@$(MAKECOOKIE)
 
 # Copy only the merge directories
 merge-copy-only: $(PKGROOT)
-	@(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
 		$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \
 		. $(PKGROOT) \
 	)
@@ -586,7 +592,7 @@
 
 # Copy the whole tree and relocate the directories in $(MERGE_DIRS)
 merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR)
-	@(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
 		$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \
 		. $(PKGROOT) \
 	)
@@ -594,7 +600,7 @@
 
 # Copy only the relocated directories
 merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR)
-	@(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
+	$(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \
 		$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \
 		 . $(PKGROOT) \
 	)


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