diff options
Diffstat (limited to 'giscanner/utils.py')
-rw-r--r-- | giscanner/utils.py | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/giscanner/utils.py b/giscanner/utils.py index d9938fc7..3983eb79 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py @@ -121,24 +121,10 @@ def extract_libtool_shlib(la_file): if libdir is None: return dlbasename return libdir + '/' + dlbasename - # From the comments in extract_libtool(), older libtools had - # a path rather than the raw dlname + # Older libtools had a path rather than the raw dlname return os.path.basename(dlname) -def extract_libtool(la_file): - dlname = _extract_dlname_field(la_file) - if dlname is None: - raise ValueError("%s has no dlname. Not a shared library?" % la_file) - libname = os.path.join(os.path.dirname(la_file), - '.libs', dlname) - # FIXME: This hackish, but I'm not sure how to do this - # in a way which is compatible with both libtool 2.2 - # and pre-2.2. Johan 2008-10-21 - libname = libname.replace('.libs/.libs', '.libs').replace('.libs\\.libs', '.libs') - return libname - - # Returns arguments for invoking libtool, if applicable, otherwise None def get_libtool_command(options): libtool_infection = not options.nolibtool |