X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2FMakefile;h=f0dde81ec3a7f2167c93a23cc969ae74cf7630a6;hb=7f0eb64d5864dd24b27dde744ed11db1acc008d0;hp=8e88bc9fb99d46af6ba8ac25a532f7ea3630ef82;hpb=8c5f6936e7c6250712b0f630deac0c445eaf4dff;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/Makefile b/win32/Makefile index 8e88bc9..f0dde81 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -798,8 +798,7 @@ SETARGV_OBJ = setargv$(o) # - Win32 extension contains overlapped symbols with win32.c (BUG!) # - MakeMaker isn't capable enough for SDBM_File (smaller bug) # - Encode (encoding search algorithm relies on shared library?) -# - Hash/Util (fails various tests when linked statically) -STATIC_EXT = * !Win32 !SDBM_File !Encode !Hash/Util +STATIC_EXT = * !Win32 !SDBM_File !Encode !ELSE # specify static extensions here, for example: #STATIC_EXT = Cwd Compress/Raw/Zlib @@ -846,12 +845,12 @@ all : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) MakePPPort \ ..\regnodes.h : ..\regcomp.sym ..\regcomp.pl ..\regexp.h cd .. - regcomp.pl + miniperl regcomp.pl cd win32 ..\regcharclass.h : ..\Porting\regcharclass.pl cd .. - Porting\regcharclass.pl + miniperl Porting\regcharclass.pl cd win32 regnodes : ..\regnodes.h @@ -1134,7 +1133,7 @@ utils: $(PERLEXE) $(X2P) copy ..\README.vms ..\pod\perlvms.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod - copy ..\pod\perl595delta.pod ..\pod\perldelta.pod + copy ..\pod\perl5100delta.pod ..\pod\perldelta.pod $(MAKE) -f ..\win32\pod.mak converters cd ..\lib $(PERLEXE) lib_pm.PL