Commit 5386287c authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
parent c8c2b779
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -542,13 +542,12 @@ 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",
                        obj2dso(lib => "PATH/TO/libfile",
                                objs => [ "PATH/TO/objectfile", ... ],
                                deps => [ "PATH/TO/otherlibfile",
                                ... ]);
+5 −5
Original line number Diff line number Diff line
@@ -70,11 +70,11 @@
 }

 # 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,
     $OUT .= obj2dso(lib => $lib,
                     objs => [ map { (my $x = $_) =~ s|\.o$||; $x }
                               @{$unified_info{sources}->{$lib}} ],
                     deps => [ resolvedepends($lib) ]);
+1 −1
Original line number Diff line number Diff line
@@ -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);
+1 −1
Original line number Diff line number Diff line
@@ -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);