Get the Mingw32 makefiles right.

diff --git a/INSTALL.W32 b/INSTALL.W32
index 6276c3efbecbda7db42a77526644486fb60a7f4e..80ea905049c4b9ed36b9016bf88dd6dff34f8d05 100644 (file)
--- a/INSTALL.W32
+++ b/INSTALL.W32
@@ -86,11 +86,11 @@
    > perl util\mkfiles.pl >MINFO
    > perl util\mk1mf.pl Mingw32 >ms\mingw32.mak
 
- * If you don't have the GNU file utilities (cp, rm, etc.) installed,
-   an additional step is required:
+ * This step can be skipped if you have the GNU file utitilities (cp, rm, ...)
+   installed:
 
-   > perl util\mk1mf.pl VC-WIN32 no-asm >ms\nt.mak
-   > make -f ms/nt.mak
+   > perl util\mk1mf.pl Mingw32-files >ms\mingw32f.mak
+   > make -f ms/mingw32f.mak
 
    This will end with an error message. If you don't like that, install
    the file utilities. :)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 7749505c508d28f2bbfb3119f6c385335f93af0a..1681823623bbfd99ee4c9f96563aabb45ff387d2 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -19,6 +19,7 @@ $infile="MINFO";
        "VC-W31-32",  "Microsoft Visual C++ 1.52 - Windows 3.1 - 386+",
        "VC-MSDOS","Microsoft Visual C++ 1.52 - MSDOS",
        "Mingw32", "GNU C++ - Windows NT or 9x",
+       "Mingw32-files", "Create files with DOS copy ...",
        "BC-NT",   "Borland C++ 4.5 - Windows NT",
        "BC-W31",  "Borland C++ 4.5 - Windows 3.1 - PROBABLY NOT WORKING",
        "BC-MSDOS","Borland C++ 4.5 - MSDOS",
@@ -117,6 +118,7 @@ $out_def="out";
 $inc_def="outinc";
 $tmp_def="tmp";
 
+$mkdir="mkdir";
 
 ($ssl,$crypto)=("ssl","crypto");
 $RSAglue="RSAglue";
@@ -158,6 +160,10 @@ elsif ($platform eq "Mingw32")
        {
        require 'Mingw32.pl';
        }
+elsif ($platform eq "Mingw32-files")
+       {
+       require 'Mingw32f.pl';
+       }
 elsif ($platform eq "BC-NT")
        {
        $bc=1;
@@ -317,7 +323,7 @@ INCO_D=$inc_dir${o}openssl
 CP=$cp
 RM=$rm
 RANLIB=$ranlib
-MKDIR=mkdir
+MKDIR=$mkdir
 MKLIB=$bin_dir$mklib
 MLFLAGS=$mlflags
 ASM=$bin_dir$asm

diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
index 7993fe67f4814d37518479bd2b4eea5720c46de6..f99b015aba5cfb4a2bf4cc20e588ba884e0d354f 100644 (file)
--- a/util/pl/Mingw32.pl
+++ b/util/pl/Mingw32.pl
@@ -1,79 +1,81 @@
-#!/usr/local/bin/perl\r
-#\r
-# unix.pl - the standard unix makefile stuff.\r
-#\r
-\r
-# Need the Cygwin32 file utilities\r
-$o='/';\r
-$cp='cp';\r
-$rm='rm';\r
-\r
-# gcc wouldn't accept backslashes in paths\r
-#$o='\\';\r
-#$cp='copy';\r
-#$rm='del';\r
-\r
-# C compiler stuff\r
-\r
-$cc='gcc';\r
-if ($debug)\r
-       { $cflags="-g2 -ggdb"; }\r
-else\r
-       { $cflags="-O3 -fomit-frame-pointer"; }\r
-$dcflags='n' # Make can't handle -DCFLAGS definition\r
-\r
-$obj='.o';\r
-$ofile='-o ';\r
-\r
-# EXE linking stuff\r
-$link='${CC}';\r
-$lflags='${CFLAGS}';\r
-$efile='-o ';\r
-$exep='';\r
-$ex_libs="-lwsock32 -lgdi32";\r
-\r
-# static library stuff\r
-$mklib='ar r';\r
-$mlflags='';\r
-$ranlib='ranlib';\r
-$plib='lib';\r
-$libp=".a";\r
-$shlibp=".a";\r
-$lfile='';\r
-\r
-$asm='as';\r
-$afile='-o ';\r
-$bn_asm_obj="";\r
-$bn_asm_src="";\r
-$des_enc_obj="";\r
-$des_enc_src="";\r
-$bf_enc_obj="";\r
-$bf_enc_src="";\r
-\r
-sub do_lib_rule\r
-       {\r
-       local($obj,$target,$name,$shlib)=@_;\r
-       local($ret,$_,$Name);\r
-\r
-       $target =~ s/\//$o/g if $o ne '/';\r
-       $target="$target";\r
-       ($Name=$name) =~ tr/a-z/A-Z/;\r
-\r
-       $ret.="$target: \$(${Name}OBJ)\n";\r
-       $ret.="\t\$(RM) $target\n";\r
-       $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";\r
-       $ret.="\t\$(RANLIB) $target\n\n";\r
-       }\r
-\r
-sub do_link_rule\r
-       {\r
-       local($target,$files,$dep_libs,$libs)=@_;\r
-       local($ret,$_);\r
-       \r
-       $file =~ s/\//$o/g if $o ne '/';\r
-       $n=&bname($target);\r
-       $ret.="$target: $files $dep_libs\n";\r
-       $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";\r
-       return($ret);\r
-       }\r
-1;\r
+#!/usr/local/bin/perl
+#
+# unix.pl - the standard unix makefile stuff.
+#
+
+# Need the Cygwin32 file utilities
+$o='/';
+$cp='cp';
+$rm='rm';
+$mkdir='gmkdir';
+
+# gcc wouldn't accept backslashes in paths
+#$o='\\';
+#$cp='copy';
+#$rm='del';
+
+# C compiler stuff
+
+$cc='gcc';
+if ($debug)
+       { $cflags="-g2 -ggdb"; }
+else
+       { $cflags="-O3 -fomit-frame-pointer"; }
+$dcflags='n'; # Make can't handle -DCFLAGS definition
+
+$obj='.o';
+$ofile='-o ';
+
+# EXE linking stuff
+$link='${CC}';
+$lflags='${CFLAGS}';
+$efile='-o ';
+$exep='';
+$ex_libs="-lwsock32 -lgdi32";
+
+# static library stuff
+$mklib='ar r';
+$mlflags='';
+$ranlib='ranlib';
+$plib='lib';
+$libp=".a";
+$shlibp=".a";
+$lfile='';
+
+$asm='as';
+$afile='-o ';
+$bn_asm_obj="";
+$bn_asm_src="";
+$des_enc_obj="";
+$des_enc_src="";
+$bf_enc_obj="";
+$bf_enc_src="";
+
+sub do_lib_rule
+       {
+       local($obj,$target,$name,$shlib)=@_;
+       local($ret,$_,$Name);
+
+       $target =~ s/\//$o/g if $o ne '/';
+       $target="$target";
+       ($Name=$name) =~ tr/a-z/A-Z/;
+
+       $ret.="$target: \$(${Name}OBJ)\n";
+       $ret.="\t\$(RM) $target\n";
+       $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
+       $ret.="\t\$(RANLIB) $target\n\n";
+       }
+
+sub do_link_rule
+       {
+       local($target,$files,$dep_libs,$libs)=@_;
+       local($ret,$_);
+       
+       $file =~ s/\//$o/g if $o ne '/';
+       $n=&bname($target);
+       $ret.="$target: $files $dep_libs\n";
+       $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
+       return($ret);
+       }
+1;
+

diff --git a/util/pl/Mingw32f.pl b/util/pl/Mingw32f.pl
new file mode 100644 (file)
index 0000000..d523d70
--- /dev/null
+++ b/util/pl/Mingw32f.pl
@@ -0,0 +1,74 @@
+#!/usr/local/bin/perl
+#
+# unix.pl - the standard unix makefile stuff.
+#
+
+$o='\\';
+$cp='copy';
+$rm='del';
+
+# C compiler stuff
+
+$cc='gcc';
+if ($debug)
+       { $cflags="-g2 -ggdb"; }
+else
+       { $cflags="-O3 -fomit-frame-pointer"; }
+$dcflags='n'; # Make can't handle -DCFLAGS definition
+
+$obj='.o';
+$ofile='-o ';
+
+# EXE linking stuff
+$link='${CC}';
+$lflags='${CFLAGS}';
+$efile='-o ';
+$exep='';
+$ex_libs="-lwsock32 -lgdi32";
+
+# static library stuff
+$mklib='ar r';
+$mlflags='';
+$ranlib='ranlib';
+$plib='lib';
+$libp=".a";
+$shlibp=".a";
+$lfile='';
+
+$asm='as';
+$afile='-o ';
+$bn_asm_obj="";
+$bn_asm_src="";
+$des_enc_obj="";
+$des_enc_src="";
+$bf_enc_obj="";
+$bf_enc_src="";
+
+sub do_lib_rule
+       {
+       local($obj,$target,$name,$shlib)=@_;
+       local($ret,$_,$Name);
+
+       $target =~ s/\//$o/g if $o ne '/';
+       $target="$target";
+       ($Name=$name) =~ tr/a-z/A-Z/;
+
+       $ret.="$target: \$(${Name}OBJ)\n";
+       $ret.="\t\$(RM) $target\n";
+       $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
+       $ret.="\t\$(RANLIB) $target\n\n";
+       }
+
+sub do_link_rule
+       {
+       local($target,$files,$dep_libs,$libs)=@_;
+       local($ret,$_);
+       
+       $file =~ s/\//$o/g if $o ne '/';
+       $n=&bname($target);
+       $ret.="$target: $files $dep_libs\n";
+       $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n\n";
+       return($ret);
+       }
+1;
+