Commit 9dfc8680 authored by Richard Levitte's avatar Richard Levitte
Browse files

Build files: Separate 'lib' intent from 'shlib' intent 



This is in preparation for having separate CFLAGS variables for static
and for shared library builds.

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7159)
parent bec2db18

Configurations/common.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
             # If this is somehow a compiled object, take care of it that way

             # Otherwise, it might simply be generated

             if (defined $unified_info{sources}->{$_}) {

                 doobj($_, $lib, intent => "lib", installed => is_installed($lib));

                 doobj($_, $lib, intent => "shlib", installed => is_installed($lib));

             } else {

                 dogenerate($_, undef, undef, intent => "lib");

             }

Configurations/descrip.mms.tmpl

+13 −6
Original line number Diff line number Diff line
@@ -777,11 +777,13 @@ EOF 
          }



          my $cppflags = {

              shlib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',

              lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',

              dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)',

              bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)'

          } -> {$args{intent}};

          my @incs_cmds = includes({ lib => '$(LIB_INCLUDES)',

          my @incs_cmds = includes({ shlib => '$(LIB_INCLUDES)',

                                     lib => '$(LIB_INCLUDES)',

                                     dso => '$(DSO_INCLUDES)',

                                     bin => '$(BIN_INCLUDES)' } -> {$args{intent}},

                                   '$(CNF_INCLUDES)',
@@ -844,7 +846,8 @@ EOF 
      my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !";



      if ($srcs[0] =~ /\.asm$/) {

          my $asflags = { lib => ' $(LIB_ASFLAGS)',

          my $asflags = { shlib => ' $(LIB_ASFLAGS)',

		          lib => ' $(LIB_ASFLAGS)',

		          dso => ' $(DSO_ASFLAGS)',

		          bin => ' $(BIN_ASFLAGS)' } -> {$args{intent}};

          return <<"EOF";
@@ -858,19 +861,23 @@ EOF 


      my $cflags;

      if ($args{installed}) {

          $cflags = { lib => '$(LIB_CFLAGS)',

          $cflags = { shlib => '$(LIB_CFLAGS)',

                      lib => '$(LIB_CFLAGS)',

                      dso => '$(DSO_CFLAGS)',

                      bin => '$(BIN_CFLAGS)' } -> {$args{intent}};

      } else {

          $cflags = { lib => '$(NO_INST_LIB_CFLAGS)',

          $cflags = { shlib => '$(NO_INST_LIB_CFLAGS)',

                      lib => '$(NO_INST_LIB_CFLAGS)',

                      dso => '$(NO_INST_DSO_CFLAGS)',

                      bin => '$(NO_INST_BIN_CFLAGS)' } -> {$args{intent}};

      }

      $cflags .= { lib => '$(LIB_CPPFLAGS)',

      $cflags .= { shlib => '$(LIB_CPPFLAGS)',

		   lib => '$(LIB_CPPFLAGS)',

		   dso => '$(DSO_CPPFLAGS)',

		   bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}};



      my @incs_cmds = includes({ lib => '$(LIB_INCLUDES)',

      my @incs_cmds = includes({ shlib => '$(LIB_INCLUDES)',

                                 lib => '$(LIB_INCLUDES)',

                                 dso => '$(DSO_INCLUDES)',

                                 bin => '$(BIN_INCLUDES)' } -> {$args{intent}},

                               '$(INCLUDES)',

Configurations/unix-Makefile.tmpl

+3 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ EOF 
          }



          my $cppflags = {

              shlib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',

              lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',

              dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)',

              bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)'
@@ -1023,6 +1024,7 @@ EOF 
          $cmd = '$(CXX)';

          $cmdcompile = ' -c';

          $cmdflags = {

              shlib => '$(LIB_CXXFLAGS) $(LIB_CPPFLAGS)',

              lib => '$(LIB_CXXFLAGS) $(LIB_CPPFLAGS)',

              dso => '$(DSO_CXXFLAGS) $(DSO_CPPFLAGS)',

              bin => '$(BIN_CXXFLAGS) $(BIN_CPPFLAGS)'
@@ -1031,6 +1033,7 @@ EOF 
          $cmd = '$(CC)';

          $cmdcompile = ' -c';

          $cmdflags = {

              shlib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',

              lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)',

              dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)',

              bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)'

Configurations/windows-makefile.tmpl

+7 −3
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ EOF 


          my $cppflags = $incs;

          $cppflags .= {

              shlib => ' $(LIB_CFLAGS) $(LIB_CPPFLAGS)',

              lib => ' $(LIB_CFLAGS) $(LIB_CPPFLAGS)',

              dso => ' $(DSO_CFLAGS) $(DSO_CPPFLAGS)',

              bin => ' $(BIN_CFLAGS) $(BIN_CPPFLAGS)'
@@ -568,14 +569,17 @@ EOF 
     my $srcs = '"'.join('" "',  @srcs).'"';

     my $deps = '"'.join('" "', @srcs, @{$args{deps}}).'"';

     my $incs = join("", map { ' /I "'.$_.'"' } @{$args{incs}});

     my $cflags = { lib => ' $(LIB_CFLAGS)',

     my $cflags = { shlib => ' $(LIB_CFLAGS)',

		    lib => ' $(LIB_CFLAGS)',

		    dso => ' $(DSO_CFLAGS)',

		    bin => ' $(BIN_CFLAGS)' } -> {$args{intent}};

     $cflags .= $incs;

     $cflags .= { lib => ' $(LIB_CPPFLAGS)',

     $cflags .= { shlib => ' $(LIB_CPPFLAGS)',

		  lib => ' $(LIB_CPPFLAGS)',

		  dso => ' $(DSO_CPPFLAGS)',

		  bin => ' $(BIN_CPPFLAGS)' } -> {$args{intent}};

     my $asflags = { lib => ' $(LIB_ASFLAGS)',

     my $asflags = { shlib => ' $(LIB_ASFLAGS)',

		     lib => ' $(LIB_ASFLAGS)',

		     dso => ' $(DSO_ASFLAGS)',

		     bin => ' $(BIN_ASFLAGS)' } -> {$args{intent}};

     my $makedepprog = $config{makedepprog};