Revision: 2918
http://gar.svn.sourceforge.net/gar/?rev=2918&view=rev
Author: dmichelsen
Date: 2009-01-28 10:30:53 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
mGAR v2: Add ISAEXEC_EXCLUDE_FILES and remove unused code
Modified Paths:
--------------
csw/mgar/gar/v2/gar.conf.mk
csw/mgar/gar/v2/gar.mk
Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk 2009-01-28 01:02:18 UTC (rev 2917)
+++ csw/mgar/gar/v2/gar.conf.mk 2009-01-28 10:30:53 UTC (rev 2918)
@@ -611,7 +611,6 @@
@echo
@echo " ISAEXEC dirs: $(ISAEXEC_DIRS)"
@echo " ISAEXEC files: $(ISAEXEC_FILES)"
- @echo " ISA relocated: $(ISA_RELOCATE_FILES)"
@echo
@echo " Merge include: $(_MERGE_INCLUDE_FILES)"
@echo " Merge exclude: $(_MERGE_EXCLUDE_FILES)"
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2009-01-28 01:02:18 UTC (rev 2917)
+++ csw/mgar/gar/v2/gar.mk 2009-01-28 10:30:53 UTC (rev 2918)
@@ -489,11 +489,12 @@
endif
# These directories get relocated into their ISA subdirectories
-#ISA_RELOCATE_DIRS ?= $(ISA_RELOCATE_DIRS_$(ISA))
MERGE_DIRS ?= $(MERGE_DIRS_$(MODULATION))
# These files get relocated and will be replaced by the isaexec-wrapper
-_ISAEXEC_FILES = $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/* ))
+_ISAEXEC_FILES = $(filter-out $(foreach
F,$(ISAEXEC_EXCLUDE_FILES),$(PKGROOT)$(F)), \
+ $(wildcard $(foreach D,$(ISAEXEC_DIRS),$(PKGROOT)$(D)/*
)) \
+ )
ISAEXEC_FILES ?= $(if $(_ISAEXEC_FILES),$(patsubst $(PKGROOT)%,%,
\
$(shell for F in $(_ISAEXEC_FILES); do \
if test -f "$$F"; then echo $$F; fi; \
@@ -503,11 +504,6 @@
_EXTRA_GAR_PKGS += CSWisaexec
endif
-# These files get relocated.
-# MERGE_DIRS is expanded to individual files here. All further
-# processing is done using these files.
-ISA_RELOCATE_FILES ?= $(patsubst $(PKGROOT)%,%,$(wildcard $(foreach
D,$(MERGE_DIRS),$(PKGROOT)$(D)/*))) $(ISAEXEC_FILES) $(EXTRA_ISA_RELOCATE_FILES)
-
# These merge-rules are actually processed for the current modulation
MERGE_TARGETS ?= $(addprefix merge-,$(MERGE_SCRIPTS_$(MODULATION)))
$(EXTRA_MERGE_TARGETS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
