Cygwin build harmonization, remove cygwin/Makefile.SHs

[p5sagit/p5-mst-13.2.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index fa109a8..e925558 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -68,7 +68,8 @@ true)
                             -install_name \$(shrpdir)/\$@"
                ;;
        cygwin*)
-               linklibperl="-lperl"
+               shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a -Wl,--image-base,0x52000000"
+               linklibperl="-L. -lperl"
                ;;
        sunos*)
                linklibperl="-lperl"
@@ -516,19 +517,9 @@ miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
 perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE)
        sh writemain $(DYNALOADER) $(static_ext) > perlmain.c
 
-!NO!SUBS!
-case "$osname" in
-cygwin)
-       ;; # Let cygwin/Makefile.SHs do its work.
-*)
-       $spitshell >>Makefile <<'!NO!SUBS!'
 perlmain$(OBJ_EXT): perlmain.c
        $(CCCMD) $(PLDLFLAGS) $*.c
 
-!NO!SUBS!
-       ;;
-esac
-$spitshell >>Makefile <<'!NO!SUBS!'
 # The file ext.libs is a list of libraries that must be linked in
 # for static extensions, e.g. -lm -lgdbm, etc.  The individual
 # static extension Makefile's add to it.
@@ -601,9 +592,22 @@ perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map
 
 !NO!SUBS!
        ;;
+cygwin)
+       $spitshell >>Makefile <<'!NO!SUBS!'
+cygwin.c: cygwin/cygwin.c
+       $(LNS) cygwin/cygwin.c
+
+LIBPERL_NONSHR         = libperl$(LIB_EXT)
+
+$(LIBPERL_NONSHR): $(obj)
+       $(RMS) $(LIBPERL_NONSHR)
+       $(AR) rcu $(LIBPERL_NONSHR) $(obj)
+
+!NO!SUBS!
+       ;;
 esac
 
-if test -r $Makefile_s ; then
+if test -s $Makefile_s ; then
        . $Makefile_s
        $spitshell >>Makefile <<!GROK!THIS!
 
@@ -1172,7 +1176,6 @@ _cleaner2:
        -rmdir lib/threads lib/XS
        -rmdir lib/CPANPLUS/Dist/Build/t/dummy-*
        -rmdir lib/CPANPLUS/t/dummy-cpanplus lib/CPANPLUS/t/dummy-localmirror
-       -rm -f cygcrypt-0.dll cygwin1.dll
        -rm -f lib/ExtUtils/CBuilder/t/libcompilet.dll.a
        -rm -f lib/ExtUtils/ParseXS/t/libXSTest.dll.a