Remove the last traces of the fake RLE compression

[openssl.git] / util / mk1mf.pl

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 5424ed543cdc3170f96407b25b666d7cdb6c3e1f..7b5705534d7b56d387bcc6c84ed261537d416675 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -142,8 +142,6 @@ and [options] can be one of
        no-krb5                                 - No KRB5
        no-srp                                  - No SRP
        no-ec                                   - No EC
-       no-ecdsa                                - No ECDSA
-       no-ecdh                                 - No ECDH
        no-engine                               - No engine
        no-hw                                   - No hw
        nasm                                    - Use NASM for x86 asm
@@ -298,8 +296,6 @@ $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
 $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
 $cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
-$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
-$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
 $cflags.=" -DOPENSSL_NO_GOST" if $no_gost;
 $cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
 $cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
@@ -397,10 +393,20 @@ for (;;)
        if ($key eq "LIBKRB5")
                { $ex_libs .= " $val" if $val ne "";}
 
-       if ($key eq "TEST" && (!$fipscanisteronly || $dir =~ /^fips/ ))
-               { $test.=&var_add($dir,$val, 0); }
+       if ($key eq "EX_LIBS")
+               { $ex_libs .= " $val" if $val ne "";}
 
-       if (($key eq "PROGS") || ($key eq "E_OBJ"))
+       # There was a condition here before:
+       #       !$fipscanisteronly || $dir =~ /^fips/
+       # It currently fills no function and needs to be rewritten anyway, so
+       # removed for now.
+       if ($dir eq "test" && $key eq "EXE")
+               {
+               foreach my $t (split /\s+/, $val) {
+                       $test.=&var_add($dir,$t, 0) if $t; }
+               }
+
+       if ($key eq "EXE_OBJ")
                { $e_exe.=&var_add($dir,$val, 0); }
 
        if ($key eq "LIB")
@@ -415,9 +421,6 @@ for (;;)
                $otherlibs .= " $lib";
                }
 
-       if ($key eq "EXHEADER")
-               { $exheader.=&var_add($dir,$val, 1); }
-
        if ($key eq "HEADER")
                { $header.=&var_add($dir,$val, 1); }
 
@@ -455,7 +458,6 @@ if ($orig_platform eq 'copy')
        {
        # Remove opensslconf.h so it doesn't get updated if we configure a
        # different branch.
-       $exheader =~ s/[^ ]+\/opensslconf.h//;
        $header =~ s/[^ ]+\/opensslconf.h//;
        }
 
@@ -569,7 +571,7 @@ if ($fipscanisteronly)
 $cp2 = $cp unless defined $cp2;
 
 $extra_install= <<"EOF";
-       \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
+       \$(CP) \"include${o}openssl${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
        \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
        \$(MKDIR) \"\$(OPENSSLDIR)\"
        \$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"
@@ -582,8 +584,8 @@ if ($fipscanisteronly)
        \$(CP) \"\$(O_FIPSCANISTER).sha1\" \"\$(INSTALLTOP)${o}lib\"
        \$(CP2) \"fips${o}fips_premain.c\" \"\$(INSTALLTOP)${o}lib\"
        \$(CP) \"fips${o}fips_premain.c.sha1\" \"\$(INSTALLTOP)${o}lib\"
-       \$(CP) \"\$(INCO_D)${o}fips.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
-       \$(CP) \"\$(INCO_D)${o}fips_rand.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
+       \$(CP) \"include${o}openssl${o}fips.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
+       \$(CP) \"include${o}openssl${o}fips_rand.h\" \"\$(INSTALLTOP)${o}include${o}openssl\"
        \$(CP) "\$(BIN_D)${o}fips_standalone_sha1$exep" \"\$(INSTALLTOP)${o}bin\"
        \$(CP) \"util${o}fipslink.pl\" \"\$(INSTALLTOP)${o}bin\"
 EOF
@@ -663,9 +665,6 @@ FIPSLINK=\$(PERL) util${o}fipslink.pl
 OUT_D=$out_dir
 # The output directory for all the temporary muck
 TMP_D=$tmp_dir
-# The output directory for the header files
-INC_D=$inc_dir
-INCO_D=$inc_dir${o}openssl
 
 PERL=$perl
 PERLASM_SCHEME=$mf_perlasm_scheme
@@ -727,7 +726,7 @@ L_LIBS= \$(L_SSL) \$(L_CRYPTO) $ex_l_libs
 # Don't touch anything below this point
 ######################################################
 
-INC=-I\$(INC_D) -I\$(INCL_D) -I\$(SRC_D)${o}crypto${o}include
+INC=-I\$(SRC_D)${o}include -I\$(INCL_D) -I\$(SRC_D)${o}crypto${o}include
 APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
 LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
 SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
@@ -737,7 +736,7 @@ LIBS_DEP=$libs_dep
 EOF
 
 $rules=<<"EOF";
-all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers \$(FIPS_SHA1_EXE) $build_targets
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) headers \$(FIPS_SHA1_EXE) $build_targets
 
 banner:
 $banner
@@ -754,18 +753,11 @@ $banner
 \$(LIB_D):
        \$(MKDIR) \"\$(LIB_D)\"
 
-\$(INCO_D): \$(INC_D)
-       \$(MKDIR) \"\$(INCO_D)\"
-
-\$(INC_D):
-       \$(MKDIR) \"\$(INC_D)\"
-
 # This needs to be invoked once, when the makefile is first constructed, or
 # after cleaning.
-init: \$(TMP_D) \$(LIB_D) \$(INC_D) \$(INCO_D) \$(BIN_D) \$(TEST_D) headers
-       \$(PERL) \$(SRC_D)/util/copy-if-different.pl "\$(SRC_D)/crypto/opensslconf.h" "\$(INCO_D)/opensslconf.h"
+init: \$(TMP_D) \$(LIB_D) \$(BIN_D) \$(TEST_D) headers
 
-headers: \$(HEADER) \$(EXHEADER)
+headers: \$(HEADER)
 
 lib: \$(LIBS_DEP) \$(E_SHLIB)
 
@@ -791,7 +783,6 @@ reallyclean:
        \$(RM) -rf \$(BIN_D)
        \$(RM) -rf \$(TEST_D)
        \$(RM) -rf \$(LIB_D)
-       \$(RM) -rf \$(INC_D)
 
 EOF
 
@@ -845,20 +836,11 @@ close(OUT);
 foreach (keys %lib_obj) { $lib_obj{$_}=&clean_up_ws($lib_obj{$_}); }
 $test=&clean_up_ws($test);
 $e_exe=&clean_up_ws($e_exe);
-$exheader=&clean_up_ws($exheader);
 $header=&clean_up_ws($header);
 
-# First we strip the exheaders from the headers list
-foreach (split(/\s+/,$exheader)){ $h{$_}=1; }
-foreach (split(/\s+/,$header)) { $h.=$_." " unless $h{$_}; }
-chop($h); $header=$h;
-
 $defs.=&do_defs("HEADER",$header,"\$(INCL_D)","");
 $rules.=&do_copy_rule("\$(INCL_D)",$header,"");
 
-$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)","");
-$rules.=&do_copy_rule("\$(INCO_D)",$exheader,"");
-
 $defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj);
 $rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
 
@@ -1410,7 +1392,6 @@ sub read_options
                "no-rsa" => \$no_rsa,
                "no-dsa" => \$no_dsa,
                "no-dh" => \$no_dh,
-               "no-hmac" => \$no_hmac,
                "no-asm" => \$no_asm,
                "nasm" => \$nasm,
                "nw-nasm" => \$nw_nasm,
@@ -1428,8 +1409,6 @@ sub read_options
                "no-sock" => \$no_sock,
                "no-krb5" => \$no_krb5,
                "no-ec" => \$no_ec,
-               "no-ecdsa" => \$no_ecdsa,
-               "no-ecdh" => \$no_ecdh,
                "no-gost" => \$no_gost,
                "no-engine" => \$no_engine,
                "no-hw" => \$no_hw,
@@ -1457,6 +1436,7 @@ sub read_options
                "no-ssl-trace" => 0,
                "no-unit-test" => 0,
                "no-deprecated" => 0,
+               "no-ocb" => 0,
                "fips" => \$fips,
                "fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
                "fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],