[perl #43425] local $[: fix scoping during parser error handling.

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

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 35a5c5c..f565f84 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -443,7 +443,7 @@ LINK_DBG    =
 EXTRACFLAGS    =
 CFLAGS         = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" \
+LINK_FLAGS     = $(LINK_DBG) -x -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" \
                -L"$(CCLIBDIR)\PSDK"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -e
@@ -1005,11 +1005,18 @@ all : CHECKDMAKE .\config.h $(GLOBEXE) $(MINIPERL) $(MK2)               \
        $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE)  \
        $(X2P) MakePPPort Extensions $(PERLSTATIC)
 
-..\regnodes.h : ..\regcomp.sym
+..\regnodes.h : ..\regcomp.sym ..\regcomp.pl ..\regexp.h
        cd .. && regcomp.pl && cd win32
 
+..\regcharclass.h : ..\Porting\regcharclass.pl
+       cd .. && Porting\regcharclass.pl && cd win32
+
 regnodes : ..\regnodes.h
 
+..\regcomp$(o) : ..\regnodes.h ..\regcharclass.h       
+
+..\regexec$(o) : ..\regnodes.h ..\regcharclass.h
+
 reonly : regnodes .\config.h $(GLOBEXE) $(MINIPERL) $(MK2)             \
        $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE)  \
        $(X2P) Extensions_reonly
@@ -1511,11 +1518,7 @@ distclean: realclean
        -del /f bin\*.bat
        -del /f perllibst.h
        -del /f $(PERLEXE_ICO) perl.base
-       ren ..\lib\Net\Changes.libnet Changes.tenbil
-       ren ..\lib\Net\README.libnet  README.tenbil     
        -cd .. && del /s *$(a) *.map *.pdb *.ilk *.tds *.bs *$(o) .exists pm_to_blib
-       ren ..\lib\Net\Changes.tenbil Changes.libnet
-       ren ..\lib\Net\README.tenbil  README.libnet     
        -cd $(EXTDIR) && del /s *.def Makefile Makefile.old
        -if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
        -if exist $(COREDIR) rmdir /s /q $(COREDIR)
@@ -1625,11 +1628,7 @@ _clean :
        -@erase $(WIN32_OBJ)
        -@erase $(DLL_OBJ)
        -@erase $(X2P_OBJ)
-       ren ..\lib\Net\Changes.libnet Changes.tenbil
-       ren ..\lib\Net\README.libnet  README.tenbil     
        -@erase ..\*$(o) ..\*$(a) ..\*.exp *$(o) *$(a) *.exp *.res
-       ren ..\lib\Net\Changes.tenbil Changes.libnet
-       ren ..\lib\Net\README.tenbil  README.libnet     
        -@erase ..\t\*.exe ..\t\*.dll ..\t\*.bat
        -@erase ..\x2p\*.exe ..\x2p\*.bat
        -@erase *.ilk