applied patch, with indentation tweaks

[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index bb4fb40..39b0b10 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -528,12 +528,12 @@ EXTENSION_DLL     =               \
                $(SDBM_FILE_DLL)\
                $(IO_DLL)       \
                $(POSIX_DLL)    \
-               $(ATTRS_DLL)
+               $(ATTRS_DLL)    \
+               $(B_DLL)
 
 .IF "$(OBJECT)" == ""
 EXTENSION_DLL  +=              \
-               $(THREAD_DLL)   \
-               $(B_DLL)
+               $(THREAD_DLL)
 .ENDIF
 
 POD2HTML       = $(PODDIR)\pod2html
@@ -763,7 +763,7 @@ $(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ)
 
 $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
        if not exist $(AUTODIR) mkdir $(AUTODIR)
-       cd $(EXTDIR)\$(*B) && ..\$(MINIPERL) -I..\..\lib $(*B).pm.PL
+       cd $(EXTDIR)\$(*B) && ..\$(MINIPERL) -I..\..\lib $(*B)_pm.PL
        $(XCOPY) $(EXTDIR)\$(*B)\$(*B).pm $(LIBDIR)\$(NULL)
        cd $(EXTDIR)\$(*B) && $(XSUBPP) dl_win32.xs > $(*B).c
        $(XCOPY) $(EXTDIR)\$(*B)\dlutils.c .
@@ -779,7 +779,7 @@ PerlCAPI$(o) : PerlCAPI.cpp
 .ELIF "$(CCTYPE)" == "GCC"
        $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
 .ELSE
-       $(CC) $(CFLAGS_O) -MT -UPERLDLL -DWIN95FIX -c \
+       $(CC) $(CFLAGS_O) $(RUNTIME) -UPERLDLL -c \
            $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
 .ENDIF
 
@@ -940,6 +940,7 @@ clean :
        -@erase $(MINIPERL)
        -@erase perlglob$(o)
        -@erase perlmain$(o)
+       -@erase PerlCAPI.cpp
        -@erase config.w32
        -@erase /f config.h
        -@erase $(GLOBEXE)