SF.net SVN: cel:[3762] cel/branches/release/V1.4
Revision: 3762
http://cel.svn.sourceforge.net/cel/?rev=3762&view=rev
Author: vknecht
Date: 2008-10-10 17:28:53 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Merged revisions 3760 via svnmerge from
https://cel.svn.sourceforge.net/svnroot/cel/cel/trunk
........
r3760 | sunshine | 2008-10-10 09:00:41 +0200 (Fri, 10 Oct 2008) | 7 lines
Eric Sunshine fixed cel/scripts/cel-config/Jamfile so that 'jam clean'
deletes the generated (non-versioned) cel-config file. Cleaning of this
file broke with r2873. Also re-added target 'cel-configclean' which got
lost with r2873. Finally, now explicitly invokes MakeLocate for cel-config
with argument $(LOCATE.TARGETS) rather than letting it be generated in the
current working directory (though these usually are the same).
........
Modified Paths:
--------------
cel/branches/release/V1.4/scripts/cel-config/Jamfile
Property Changed:
----------------
cel/branches/release/V1.4/
Property changes on: cel/branches/release/V1.4
___________________________________________________________________
Modified: svnmerge-integrated
- /cel/trunk:1-3451,3480,3495-3496,3498,3564,3568,3572,3574,3590,3592,3595-3597,3609,3631,3636,3641,3644,3668,3673
+ /cel/trunk:1-3451,3480,3495-3496,3498,3564,3568,3572,3574,3590,3592,3595-3597,3609,3631,3636,3641,3644,3668,3673,3760
Modified: svn:mergeinfo
- /cel/trunk:3480,3564,3568,3572,3574,3590,3592,3595-3597,3609,3631,3644,3668,3673
+ /cel/trunk:3480,3564,3568,3572,3574,3590,3592,3595-3597,3609,3631,3644,3668,3673,3760
Modified: cel/branches/release/V1.4/scripts/cel-config/Jamfile
===================================================================
--- cel/branches/release/V1.4/scripts/cel-config/Jamfile 2008-10-10 14:23:30 UTC (rev 3761)
+++ cel/branches/release/V1.4/scripts/cel-config/Jamfile 2008-10-10 17:28:53 UTC (rev 3762)
<at> <at> -6,8 +6,6 <at> <at>
SEARCH on cel-config.template = $(SUBDIR) ;
MakeLocate $(<) : $(LOCATE.TARGETS) ;
Depends $(<) : cel-config.template Jamfile Jamconfig [ ConcatDirs $(SUBDIR) Jamfile ] ;
- Clean $(<)clean : $(<) ;
- Depends clean : $(<)clean ;
local l d e s liblist libdep libdepstr libstrings libaddstrings libbasestrs libbase libswitchcase ;
<at> <at> -183,7 +181,12 <at> <at>
Depends cel-config : $(CELCONFIGNAME) ;
CEL_CONFIG_GRISTED = [ DoSourceGrist cel-config ] ;
SEARCH on $(CEL_CONFIG_GRISTED) = $(SUBDIR) ;
+MakeLocate cel-config : $(LOCATE.TARGETS) ;
Depends cel-config : $(CEL_CONFIG_GRISTED) ;
Copy cel-config : $(CEL_CONFIG_GRISTED) ;
-Help cel-config : "Build the cs-config script" ;
+Always cel-configclean ;
+NotFile cel-configclean ;
+Clean cel-configclean : cel-config $(CELCONFIGNAME) ;
+Depends clean : cel-configclean ;
+Help cel-config : "Build the cel-config script" ;
Depends install_bin : [ DoInstall cel-config : $(bindir) : $(INSTALL_PROGRAM) ] ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/