various fixes for clean build and test on win32; configpm broken,

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

diff --git a/win32/Makefile b/win32/Makefile
index 49271f2..41d88ed 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -509,7 +509,7 @@ SETARGV_OBJ = setargv$(o)
 !ENDIF
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
-               Data/Dumper Devel/Peek
+               Data/Dumper Devel/Peek ByteLoader
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -527,6 +527,7 @@ RE          = $(EXTDIR)\re\re
 DUMPER         = $(EXTDIR)\Data\Dumper\Dumper
 ERRNO          = $(EXTDIR)\Errno\Errno
 PEEK           = $(EXTDIR)\Devel\Peek\Peek
+BYTELOADER     = $(EXTDIR)\ByteLoader\ByteLoader
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL      = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -540,6 +541,7 @@ B_DLL               = $(AUTODIR)\B\B.dll
 DUMPER_DLL     = $(AUTODIR)\Data\Dumper\Dumper.dll
 PEEK_DLL       = $(AUTODIR)\Devel\Peek\Peek.dll
 RE_DLL         = $(AUTODIR)\re\re.dll
+BYTELOADER_DLL = $(AUTODIR)\ByteLoader\ByteLoader.dll
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
 
@@ -555,7 +557,8 @@ EXTENSION_C =               \
                $(RE).c         \
                $(DUMPER).c     \
                $(PEEK).c       \
-               $(B).c
+               $(B).c          \
+               $(BYTELOADER).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -567,7 +570,8 @@ EXTENSION_DLL       =               \
                $(ATTRS_DLL)    \
                $(DUMPER_DLL)   \
                $(PEEK_DLL)     \
-               $(B_DLL)
+               $(B_DLL)        \
+               $(BYTELOADER_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -857,6 +861,12 @@ $(SOCKET_DLL): $(PERLEXE) $(SOCKET).xs
        $(MAKE)
        cd ..\..\win32
 
+$(BYTELOADER_DLL): $(PERLEXE) $(BYTELOADER).xs
+       cd $(EXTDIR)\$(*B)
+       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\win32
+
 $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
        cd $(EXTDIR)\$(*B)
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -889,7 +899,7 @@ distclean: clean
        -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.pm
        -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm
        -del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm
-       -del /f $(LIBDIR)\Data\Dumper.pm
+       -del /f $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm
        -del /f $(LIBDIR)\Devel\Peek.pm
        -rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO
        -rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread