diff options
author | David Robillard <d@drobilla.net> | 2019-03-17 17:31:03 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2019-03-17 18:14:27 +0100 |
commit | f15dd76e1bf5dfbb2b46d302efeaf120d0ba69b0 (patch) | |
tree | 3ee0b1e31255c1a35ebe08e8885f755d2563ac9b /waflib/Tools/fc.py | |
parent | 6ce4b684f8c2e3077ec145191b9ab902e30bafae (diff) | |
parent | ceefc55f3175d6201fb09aa8114916b249a5828d (diff) | |
download | lilv-f15dd76e1bf5dfbb2b46d302efeaf120d0ba69b0.tar.gz lilv-f15dd76e1bf5dfbb2b46d302efeaf120d0ba69b0.tar.bz2 lilv-f15dd76e1bf5dfbb2b46d302efeaf120d0ba69b0.zip |
Update autowaf and adapt to new API
Diffstat (limited to 'waflib/Tools/fc.py')
-rw-r--r-- | waflib/Tools/fc.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/waflib/Tools/fc.py b/waflib/Tools/fc.py index d9e8d8c..fd4d39c 100644 --- a/waflib/Tools/fc.py +++ b/waflib/Tools/fc.py @@ -28,10 +28,24 @@ def modfile(conf, name): Turns a module name into the right module file name. Defaults to all lower case. """ - return {'lower' :name.lower() + '.mod', - 'lower.MOD' :name.lower() + '.MOD', - 'UPPER.mod' :name.upper() + '.mod', - 'UPPER' :name.upper() + '.MOD'}[conf.env.FC_MOD_CAPITALIZATION or 'lower'] + if name.find(':') >= 0: + # Depending on a submodule! + separator = conf.env.FC_SUBMOD_SEPARATOR or '@' + # Ancestors of the submodule will be prefixed to the + # submodule name, separated by a colon. + modpath = name.split(':') + # Only the ancestor (actual) module and the submodule name + # will be used for the filename. + modname = modpath[0] + separator + modpath[-1] + suffix = conf.env.FC_SUBMOD_SUFFIX or '.smod' + else: + modname = name + suffix = '.mod' + + return {'lower' :modname.lower() + suffix.lower(), + 'lower.MOD' :modname.lower() + suffix.upper(), + 'UPPER.mod' :modname.upper() + suffix.lower(), + 'UPPER' :modname.upper() + suffix.upper()}[conf.env.FC_MOD_CAPITALIZATION or 'lower'] def get_fortran_tasks(tsk): """ |