Remove all special make depend flags, as well as OPENSSL_DOING_MAKEDEPEND

[openssl.git] / crypto / objects / objxref.pl

diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl
index a1900cab5c6605ca5fd9a9560073c5321d792c3b..7ebd74cdcc0b3f35fa7d0f8434950bde7dc7c9e4 100644 (file)
--- a/crypto/objects/objxref.pl
+++ b/crypto/objects/objxref.pl
@@ -13,7 +13,7 @@ open(IN, $mac_file) || die "Can't open $mac_file, $!\n";
 
 while (<IN>)
        {
-       chomp;
+       s|\R$||;                # Better chomp
        my ($name, $num) = /^(\S+)\s+(\S+)$/;
        $oid_tbl{$name} = $num;
        }
@@ -25,7 +25,7 @@ my $ln = 1;
 
 while (<IN>)
        {
-       chomp;
+       s|\R$||;                # Better chomp
        s/#.*$//;
        next if (/^\S*$/);
        my ($xr, $p1, $p2) = /^(\S+)\s+(\S+)\s+(\S+)/;
@@ -68,6 +68,8 @@ typedef struct {
     int pkey_id;
 } nid_triple;
 
+DEFINE_STACK_OF(nid_triple)
+
 static const nid_triple sigoid_srt[] = {
 EOF
 
@@ -110,6 +112,6 @@ sub check_oid
        my ($chk) = @_;
        if (!exists $oid_tbl{$chk})
                {
-               die "Can't find \"$chk\", $!\n";
+               die "Can't find \"$chk\"\n";
                }
        }