From 6999193ba9069e620831bed0f85efa43ff6e283a Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 24 Aug 2010 15:25:36 +0100
Subject: [PATCH] Correct errors in the use of multiple targets for bitcount.h
 and uudmap.h

The fixes of Makefile.SH in 0f13ebd5d71f8177 also need to be applied on Win32
and VMS.
---
 vms/descrip_mms.template | 4 +++-
 win32/Makefile           | 5 ++++-
 win32/makefile.mk        | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index 1503b2f88b6..ab3d2d86757 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -508,7 +508,9 @@ perlmini.c : perl.c
 perlmini$(O) : perlmini.c
 	$(CC) $(CORECFLAGS) $(MMS$SOURCE)
 
-uudmap.h bitcount.h : generate_uudmap$(E)
+uudmap.h : bitcount.h
+
+bitcount.h : generate_uudmap$(E)
 	MCR SYS$DISK:[]generate_uudmap$(E) uudmap.h bitcount.h
 
 generate_uudmap$(E) : generate_uudmap$(O) $(CRTL)
diff --git a/win32/Makefile b/win32/Makefile
index d4452fedd5e..e7370dc04ef 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -979,7 +979,10 @@ $(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions
 
 $(MINIDIR)\globals$(o) : $(UUDMAP_H) $(BITCOUNT_H)
 
-$(UUDMAP_H) $(BITCOUNT_H) : $(GENUUDMAP)
+$(UUDMAP_H) : $(BITCOUNT_H)
+	$(GENUUDMAP) $(UUDMAP_H) $(BITCOUNT_H)
+
+$(BITCOUNT_H) : $(GENUUDMAP)
 	$(GENUUDMAP) $(UUDMAP_H) $(BITCOUNT_H)
 
 $(GENUUDMAP) : $(GENUUDMAP_OBJ)
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 6b4a78e7482..7add8cb3b36 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1318,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)