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

[dmichelsen at users.sourceforge.net]

Revision: 9486
          http://gar.svn.sourceforge.net/gar/?rev=9486&view=rev
Author:   dmichelsen
Date:     2010-03-31 12:22:43 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
mGAR v2: Make sure EXTRA_MERGE_INCLUDE_FILES is processed before exclusion

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-03-31 12:11:47 UTC (rev 9485)
+++ csw/mgar/gar/v2/gar.mk	2010-03-31 12:22:43 UTC (rev 9486)
@@ -627,7 +627,6 @@
 else
 _MERGE_INCLUDE_FILES = $(MERGE_INCLUDE_FILES_$(MODULATION))
 endif
-_MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION))
 
 # This can be defined in category.mk
 MERGE_EXCLUDE_CATEGORY ?= $(_MERGE_EXCLUDE_CATEGORY)
@@ -654,8 +653,10 @@
 _MERGE_EXCLUDE_FILES += $(EXTRA_MERGE_EXCLUDE_FILES) $(EXTRA_MERGE_EXCLUDE_FILES_$(MODULATION)) $(MERGE_EXCLUDE_DEFAULT)
 
 # This variable contains parameter for pax to honor global file inclusion/exclusion
+# Make sure include overrides are processed first
+_INC_EXT_RULE = $(foreach F,$(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)),-s ",^\(\.$F\)$$,\1,")
 # Exclude by replacing files with the empty string
-_INC_EXT_RULE = $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,')
+_INC_EXT_RULE += $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,')
 # Replace files by itself terminating on first match
 _INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)$$,\1,")
 


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