Fix miniperl build with threaded perl

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

diff --git a/win32/Makefile b/win32/Makefile
index e7fd407..a5bba57 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -167,6 +167,7 @@ CCLIBDIR    = $(CCHOME)\lib
 #
 # Additional compiler flags can be specified here.
 #
+BUILDOPT       = $(BUILDOPTEXTRA)
 
 #
 # Adding -DPERL_HASH_SEED_EXPLICIT will disable randomization of Perl's
@@ -521,6 +522,7 @@ UTILS               =                       \
                ..\utils\cpan           \
                ..\utils\xsubpp         \
                ..\utils\prove          \
+               ..\utils\ptar           \
                ..\utils\instmodsh      \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
@@ -695,6 +697,10 @@ PERLDLL_OBJ        = $(PERLDLL_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
 SETARGV_OBJ    = setargv$(o)
 !ENDIF
 
+# specify static extensions here
+#STATIC_EXT    = Cwd Compress/Zlib
+STATIC_EXT     = 
+
 DYNALOADER             = $(EXTDIR)\DynaLoader\DynaLoader
 SOCKET                 = $(EXTDIR)\Socket\Socket
 FCNTL                  = $(EXTDIR)\Fcntl\Fcntl
@@ -727,6 +733,7 @@ XSAPITEST           = $(EXTDIR)\XS\APItest\APItest
 XSTYPEMAP              = $(EXTDIR)\XS\Typemap\Typemap
 UNICODENORMALIZE       = $(EXTDIR)\Unicode\Normalize\Normalize
 MATHBIGINTFASTCALC     = $(EXTDIR)\Math\BigInt\FastCalc\FastCalc
+COMPRESSZLIB           = $(EXTDIR)\Compress\Zlib\Zlib
 WIN32_DIR              = ext\Win32
 
 SOCKET_DLL             = $(AUTODIR)\Socket\Socket.dll
@@ -759,6 +766,7 @@ XSAPITEST_DLL               = $(AUTODIR)\XS\APItest\APItest.dll
 XSTYPEMAP_DLL          = $(AUTODIR)\XS\Typemap\Typemap.dll
 UNICODENORMALIZE_DLL   = $(AUTODIR)\Unicode\Normalize\Normalize.dll
 MATHBIGINTFASTCALC_DLL = $(AUTODIR)\Math\BigInt\FastCalc\FastCalc.dll
+COMPRESSZLIB_DLL       = $(AUTODIR)\Compress\Zlib\Zlib.dll
 WIN32_DLL              = $(AUTODIR)\Win32\Win32.dll
 
 EXTENSION_C    =               \
@@ -792,6 +800,7 @@ EXTENSION_C =               \
                $(XSTYPEMAP).c  \
                $(UNICODENORMALIZE).c   \
                $(MATHBIGINTFASTCALC).c \
+               $(COMPRESSZLIB).c       \
                $(WIN32_DIR).c
 
 EXTENSION_DLL  =               \
@@ -825,6 +834,7 @@ EXTENSION_DLL       =               \
                $(XSTYPEMAP_DLL)        \
                $(UNICODENORMALIZE_DLL) \
                $(MATHBIGINTFASTCALC_DLL)       \
+               $(COMPRESSZLIB_DLL)     \
                $(WIN32_DLL)
 
 POD2HTML       = $(PODDIR)\pod2html
@@ -945,11 +955,12 @@ $(DLL_OBJ)        : $(CORE_H)
 $(X2P_OBJ)     : $(CORE_H)
 
 perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl
+       $(MINIPERL) -I..\lib buildext.pl --create-perllibst-h
        $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \
            CCTYPE=$(CCTYPE) > perldll.def
 
-$(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES)
-       $(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ @<<
+$(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
+       $(LINK32) -dll -def:perldll.def -base:0x28000000 -out:$@ @Extensions_static @<<
                $(LINK_FLAGS) $(DELAYLOAD) $(LIBFILES) $(PERLDLL_OBJ) $(PERLDLL_RES)
 <<
        $(XCOPY) $(PERLIMPLIB) $(COREDIR)
@@ -1017,8 +1028,13 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 
 #-------------------------------------------------------------------------------
 Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
-       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR)
-       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext
+       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic
+       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic
+
+Extensions_static : buildext.pl
+       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static
+       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static
+       $(MINIPERL) -I..\lib buildext.pl --list-static-libs > Extensions_static
 
 Extensions_clean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
@@ -1126,8 +1142,8 @@ distclean: realclean
        -del /f $(LIBDIR)\Unicode\Normalize.pm
        -del /f $(LIBDIR)\Math\BigInt\FastCalc.pm
        -del /f $(LIBDIR)\Win32.pm
-       -if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
-       -if exist $(LIBDIR)\IO rmdir /s $(LIBDIR)\IO
+       -if exist $(LIBDIR)\IO\Socket rmdir /s /q $(LIBDIR)\IO\Socket
+       -if exist $(LIBDIR)\IO\Socket rmdir /s $(LIBDIR)\IO\Socket
        -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B
        -if exist $(LIBDIR)\B rmdir /s $(LIBDIR)\B
        -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data
@@ -1163,11 +1179,12 @@ distclean: realclean
            podchecker podselect
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
            perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat \
-           xsubpp instmodsh prove corelist
+           xsubpp instmodsh prove ptar corelist
        -cd ..\x2p && del /f find2perl s2p psed *.bat
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)
        -del /f bin\*.bat
+       -del /f perllibst.h
        -del /f $(PERLEXE_ICO) perl.base
        -cd .. && del /s *.lib *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib
        -cd $(EXTDIR) && del /s *.def Makefile Makefile.old
@@ -1260,6 +1277,7 @@ _clean :
        -@$(DEL) ..\x2p\*.exe ..\x2p\*.bat
        -@$(DEL) *.ilk
        -@$(DEL) *.pdb
+       -@$(DEL) Extensions_static
 
 clean : Extensions_clean _clean