Correct errors in the use of multiple targets for bitcount.h and uudmap.h

[perl5.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 2783772..7add8cb 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -3,7 +3,7 @@
 # Supported compilers:
 #      Microsoft Visual C++ 6.0 or later
 #      Borland C++ 5.02 or later
-#      MinGW with gcc-2.95.2 or later
+#      MinGW with gcc-3.2 or later
 #      Windows SDK 64-bit compiler and tools **experimental**
 #
 # This is set up to build a perl.exe that runs off a shared library
@@ -39,7 +39,7 @@ INST_TOP      *= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-#INST_VER      *= \5.13.3
+#INST_VER      *= \5.13.4
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -113,7 +113,7 @@ USE_LARGE_FILES     *= define
 #CCTYPE                *= MSVC90
 # Borland 5.02 or later
 #CCTYPE                *= BORLAND
-# MinGW or mingw-w64 with gcc-2.95.2 or later
+# MinGW or mingw-w64 with gcc-3.2 or later
 CCTYPE         *= GCC
 
 #
@@ -258,16 +258,6 @@ BUILDOPT   *= $(BUILDOPTEXTRA)
 #BUILDOPT      += -DNO_HASH_SEED
 
 #
-# This should normally be disabled.  Adding -DPERL_POLLUTE enables support
-# for old symbols by default, at the expense of extreme pollution.  You most
-# probably just want to build modules that won't compile with
-#         perl Makefile.PL POLLUTE=1
-# instead of enabling this.  Please report such modules to the respective
-# authors.
-#
-#BUILDOPT      += -DPERL_POLLUTE
-
-#
 # This should normally be disabled.  Enabling it will disable the File::Glob
 # implementation of CORE::glob.
 #
@@ -1051,7 +1041,7 @@ ODBCCP32_DLL = $(SystemRoot)\system32\odbccp32.dll
 ODBCCP32_DLL = $(windir)\system\odbccp32.dll
 .ENDIF
 
-ICWD = -I..\cpan\Cwd -I..\cpan\Cwd\lib
+ICWD = -I..\dist\Cwd -I..\dist\Cwd\lib
 
 #
 # Top targets
@@ -1061,9 +1051,6 @@ all : CHECKDMAKE .\config.h ..\git_version.h $(GLOBEXE) $(MINIPERL) $(MK2)        \
        $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) MakePPPort          \
        $(PERLEXE) $(X2P) Extensions Extensions_nonxs $(PERLSTATIC)
 
-..\regcharclass.h : ..\Porting\regcharclass.pl
-       cd .. && miniperl Porting\regcharclass.pl && cd win32
-
 regnodes : ..\regnodes.h
 
 ..\regcomp$(o) : ..\regnodes.h ..\regcharclass.h       
@@ -1331,7 +1318,9 @@ $(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions
 
 $(MINIDIR)\globals$(o) : $(UUDMAP_H) $(BITCOUNT_H)
 
-$(UUDMAP_H) $(BITCOUNT_H) : $(GENUUDMAP)
+$(UUDMAP_H) : $(BITCOUNT_H)
+
+$(BITCOUNT_H) : $(GENUUDMAP)
        $(GENUUDMAP) $(UUDMAP_H) $(BITCOUNT_H)
 
 $(GENUUDMAP) : $(GENUUDMAP_OBJ)
@@ -1476,7 +1465,7 @@ utils: $(PERLEXE) $(X2P)
        copy ..\README.vmesa    ..\pod\perlvmesa.pod
        copy ..\README.vos      ..\pod\perlvos.pod
        copy ..\README.win32    ..\pod\perlwin32.pod
-       copy ..\pod\perl5134delta.pod ..\pod\perldelta.pod
+       copy ..\pod\perl5135delta.pod ..\pod\perldelta.pod
        cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
        $(PERLEXE) $(PL2BAT) $(UTILS)
        $(PERLEXE) $(ICWD) ..\autodoc.pl ..
@@ -1621,7 +1610,7 @@ inst_lib : $(CONFIGPM)
 
 $(UNIDATAFILES) ..\pod\perluniprops.pod .UPDATEALL : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
        cd ..\lib\unicore && \
-       ..\$(MINIPERL) -I.. -I..\..\cpan\Cwd\lib -I..\..\cpan\Cwd mktables -P ..\..\pod -maketest -makelist -p
+       ..\$(MINIPERL) -I.. -I..\..\dist\Cwd\lib -I..\..\dist\Cwd mktables -P ..\..\pod -maketest -makelist -p
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) $(UNIDATAFILES) utils
        $(XCOPY) $(MINIPERL) ..\t\$(NULL)