aboutsummaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-12-11 20:08:13 -0500
committerJack Lloyd <[email protected]>2017-12-11 20:10:54 -0500
commit8517b97cbeec0ca5ff2aa12ff16d04473679aee2 (patch)
tree88552412e3c0014e163b6b8eb8b83faf3f613bb8 /configure.py
parentb6f51a9be08df03d54411c65f9271b9a62ab5554 (diff)
Remove an unused feature allowing one module to pull in a file from another
The last use of this was removed in #549
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py21
1 files changed, 4 insertions, 17 deletions
diff --git a/configure.py b/configure.py
index 1cde6d267..0a9596168 100755
--- a/configure.py
+++ b/configure.py
@@ -793,24 +793,11 @@ class ModuleInfo(InfoObject):
self.requires = lex.requires
self.warning = ' '.join(lex.warning) if lex.warning else None
- def add_dir_name(filename):
- if filename.count(':') == 0:
- return os.path.join(self.lives_in, filename)
-
- # TODO is this used anymore??? Probably can be removed.
-
- # modules can request to add files of the form
- # MODULE_NAME:FILE_NAME to add a file from another module
- # For these, assume other module is always in a
- # neighboring directory; this is true for all current uses
- return os.path.join(os.path.split(self.lives_in)[0],
- *filename.split(':'))
-
# Modify members
- self.source = [normalize_source_path(add_dir_name(s)) for s in self.source]
- self.header_internal = [add_dir_name(s) for s in self.header_internal]
- self.header_public = [add_dir_name(s) for s in self.header_public]
- self.header_external = [add_dir_name(s) for s in self.header_external]
+ self.source = [normalize_source_path(os.path.join(self.lives_in, s)) for s in self.source]
+ self.header_internal = [os.path.join(self.lives_in, s) for s in self.header_internal]
+ self.header_public = [os.path.join(self.lives_in, s) for s in self.header_public]
+ self.header_external = [os.path.join(self.lives_in, s) for s in self.header_external]
# Filesystem read access check
for src in self.source + self.header_internal + self.header_public + self.header_external: