diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-15 18:45:54 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-19 11:52:15 +0100 |
| commit | 5386287cfcf0a4165fac742aa21455db3d49b3ab (patch) | |
| tree | 37899904fd8b33b16b299c3a788308c6263eefd2 /Configurations | |
| parent | c8c2b77900f9808fc644d206d8715a78dd9801bd (diff) | |
Small rename fest in unified, obj2dynlib -> obj2dso
Since we're using the acronym DSO everywhere else and that's a common
name for that kind of object, we might as well do so here as well.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/README | 13 | ||||
| -rw-r--r-- | Configurations/common.tmpl | 10 | ||||
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 |
4 files changed, 13 insertions, 14 deletions
diff --git a/Configurations/README b/Configurations/README index 4945c1ce3b..58c4d96c6c 100644 --- a/Configurations/README +++ b/Configurations/README @@ -542,16 +542,15 @@ They are all expected to return a string with the lines they produce. corresponding static library as input to make the shared library, or the list of object files. - obj2dynlib - function that produces build file lines to build a - dynamically loadable library file ("libfoo.so" on - Unix) from object files. + obj2dso - function that produces build file lines to build a + dynamic shared object file from object files. called like this: - obj2dynlib(lib => "PATH/TO/libfile", - objs => [ "PATH/TO/objectfile", ... ], - deps => [ "PATH/TO/otherlibfile", - ... ]); + obj2dso(lib => "PATH/TO/libfile", + objs => [ "PATH/TO/objectfile", ... ], + deps => [ "PATH/TO/otherlibfile", + ... ]); This is almost the same as libobj2shlib, but the intent is to build a shareable library that can be diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index d7d01dc339..f0860dd781 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -70,14 +70,14 @@ } # doengine is responsible for building engines. It will call - # obj2dynlib, and also makes sure all object files for the library + # obj2dso, and also makes sure all object files for the library # are built. sub doengine { my $lib = shift; - $OUT .= obj2dynlib(lib => $lib, - objs => [ map { (my $x = $_) =~ s|\.o$||; $x } - @{$unified_info{sources}->{$lib}} ], - deps => [ resolvedepends($lib) ]); + $OUT .= obj2dso(lib => $lib, + objs => [ map { (my $x = $_) =~ s|\.o$||; $x } + @{$unified_info{sources}->{$lib}} ], + deps => [ resolvedepends($lib) ]); map { doobj($_, $lib, intent => "lib") } @{$unified_info{sources}->{$lib}}; } diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index ee240d11ba..f277bcec63 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -512,7 +512,7 @@ $shlib.EXE : $lib.OLB $deps $ordinalsfile - PURGE $shlib.EXE,$shlib.OPT,$shlib.MAP EOF } - sub obj2dynlib { + sub obj2dso { my %args = @_; my $lib = $args{lib}; my $libd = dirname($lib); diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 86d2bd95f1..24c6fdf1a2 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -866,7 +866,7 @@ EOF cp -p $shlib\$(SHLIB_EXT) test/ EOF } - sub obj2dynlib { + sub obj2dso { my %args = @_; my $lib = $args{lib}; my $libd = dirname($lib); |