diff --git a/Configurations/README b/Configurations/README index 4945c1ce3b3f5e3e3afc2a32ca0c39b9f5dc02de..58c4d96c6c2c062c2bb574d92ed3ef1efb959c12 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 d7d01dc3396c0b721021945136b55e9f26a06629..f0860dd7814128c9b7136680ad5c8397cefd7b47 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 ee240d11bac1cec8babce365b7eedb97368c76f1..f277bcec630cc9b436325a0de4bc8cef65b42b47 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 86d2bd95f1dd55b905c5cc2bca55ef5fe77c6450..24c6fdf1a2f76b808f8905768affb33d3a4775b5 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);