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>
This commit is contained in:
Richard Levitte 2016-02-15 18:45:54 +01:00
parent c8c2b77900
commit 5386287cfc
4 changed files with 13 additions and 14 deletions

View file

@ -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

View file

@ -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}};
}

View file

@ -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);

View file

@ -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);