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

[bdwalton at users.sourceforge.net]

Revision: 14394
          http://gar.svn.sourceforge.net/gar/?rev=14394&view=rev
Author:   bdwalton
Date:     2011-04-25 02:02:45 +0000 (Mon, 25 Apr 2011)

Log Message:
-----------
Move the inclusion of gar.lib.mk within gar.mk to ensure MODULATIONS setup

Before this change, URLS was set using ALLFILES_PATCHFILES, which in
turn relied on MODULATIONS.  As URLS is set with := and MODULATIONS
had not been declared, ALLFILES_PATCHFILES didn't include
modulation-specific patches.  By moving the inclusion, we ensure that
MODULATIONS is available before first use.

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2011-04-24 20:46:28 UTC (rev 14393)
+++ csw/mgar/gar/v2/gar.mk	2011-04-25 02:02:45 UTC (rev 14394)
@@ -73,7 +73,6 @@
 
 # include the configuration file to override any of these variables
 include $(GARDIR)/gar.conf.mk
-include $(GARDIR)/gar.lib.mk
 
 # ========================= MODULATIONS ======================== 
 
@@ -92,6 +91,8 @@
 
 MODULATIONS ?= $(filter-out $(SKIP_MODULATIONS),$(strip $(call modulations,$(strip $(MODULATORS)))))
 
+include $(GARDIR)/gar.lib.mk
+
 # _modulate(ISA STATIC,,,)
 # -> _modulate2(STATIC,isa-i386,ISA,ISA=i386)
 #    -> _modulate2(,,isa-i386-static-yes,ISA STATIC,ISA=i386 STATIC=yes)


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