[csw-devel] SF.net SVN: gar:[6388] csw/mgar/gar/v2/gar.mk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Sep 22 15:24:47 CEST 2009
Revision: 6388
http://gar.svn.sourceforge.net/gar/?rev=6388&view=rev
Author: dmichelsen
Date: 2009-09-22 13:24:36 +0000 (Tue, 22 Sep 2009)
Log Message:
-----------
mGAR v2: Exclude pkgconfig .pc-files for ISAs other then the 32- and 64 bit defaults
Modified Paths:
--------------
csw/mgar/gar/v2/gar.mk
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2009-09-22 12:23:14 UTC (rev 6387)
+++ csw/mgar/gar/v2/gar.mk 2009-09-22 13:24:36 UTC (rev 6388)
@@ -569,7 +569,9 @@
MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la
MERGE_EXCLUDE_BACKUPFILES ?= .*\~
MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a
-MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_PYCOMPILE)
+# Exclude all other .pc-files apart from the default 32- and 64 bit versions
+MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG ?= $(if $(filter-out $(ISA_DEFAULT) $(ISA_DEFAULT64),$(ISA)),$(libdir)/.*\.pc)
+MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_CATEGORY) $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) $(MERGE_EXCLUDE_EXTRA_ISA_PKGCONFIG) $(MERGE_EXCLUDE_PYCOMPILE)
# Exclude these files
ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list