Re: VMS and Win32 Makefiles in change 31059

Message-ID: <46306D01.6070607@uk.radan.com>
Date: Thu, 26 Apr 2007 10:12:33 +0100

p4raw-id: //depot/perl@31089

diff --git a/win32/Makefile b/win32/Makefile
index f189cc8..ca08398 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -542,6 +542,7 @@ GLOBEXE             = ..\perlglob.exe
 CONFIGPM       = ..\lib\Config.pm ..\lib\Config_heavy.pl
 MINIMOD                = ..\lib\ExtUtils\Miniperl.pm
 X2P            = ..\x2p\a2p.exe
+GENUUDMAP      = ..\generate_uudmap.exe
 !IF "$(BUILD_STATIC)" == "define"
 PERLSTATIC     = static
 !ELSE
@@ -752,6 +753,8 @@ CORE_NOCFG_H        =               \
 
 CORE_H         = $(CORE_NOCFG_H) .\config.h
 
+UUDMAP_H       = ..\uudmap.h
+
 MICROCORE_OBJ  = $(MICROCORE_SRC:.c=.obj)
 CORE_OBJ       = $(MICROCORE_OBJ) $(EXTRACORE_SRC:.c=.obj)
 WIN32_OBJ      = $(WIN32_SRC:.c=.obj)
@@ -762,6 +765,7 @@ MINIWIN32_OBJ       = $(WIN32_OBJ:.\=.\mini\)
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 DLL_OBJ                = $(DLL_SRC:.c=.obj)
 X2P_OBJ                = $(X2P_SRC:.c=.obj)
+GENUUDMAP_OBJ  = $(GENUUDMAP:.exe=.obj)
 
 PERLDLL_OBJ    = $(CORE_OBJ)
 PERLEXE_OBJ    = perlmain$(o)
@@ -957,14 +961,16 @@ $(X2P) : $(MINIPERL) $(X2P_OBJ)
 <<
        $(EMBED_EXE_MANI)
 
-globals$(o) : uudmap.h
+$(MINIDIR)\globals$(o) : $(UUDMAP_H)
 
-uudmap.h: generate_uudmap.exe
-       generate_uudmap >uudmap.h
+$(UUDMAP_H) : $(GENUUDMAP)
+       $(GENUUDMAP) >$(UUDMAP_H)
 
-generate_uudmap.exe : generate_uudmap$(o)
+$(GENUUDMAP) : $(GENUUDMAP_OBJ)
        $(LINK32) -subsystem:console -out:$@ @<<
-               $(LINK_FLAGS) $(LIBFILES) generate_uudmap$(o)
+               $(LINK_FLAGS) $(LIBFILES) $(GENUUDMAP_OBJ)
+<<
+       $(EMBED_EXE_MANI)
 
 perlmain.c : runperl.c
        copy runperl.c perlmain.c
@@ -1283,7 +1289,7 @@ _clean :
        -@$(DEL) $(PERLSTATICLIB)
        -@$(DEL) $(PERLDLL)
        -@$(DEL) $(CORE_OBJ)
-       -@$(DEL) generate_uudmap.exe generate_uudmap$(o) uudmap.h
+       -@$(DEL) $(GENUUDMAP) $(GENUUDMAP_OBJ) $(UUDMAP_H)
        -if exist $(MINIDIR) rmdir /s /q $(MINIDIR)
        -if exist $(UNIDATADIR1) rmdir /s /q $(UNIDATADIR1)
        -if exist $(UNIDATADIR2) rmdir /s /q $(UNIDATADIR2)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 069e883..e5cbc12 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -695,6 +695,7 @@ GLOBEXE             = ..\perlglob.exe
 CONFIGPM       = ..\lib\Config.pm ..\lib\Config_heavy.pl
 MINIMOD                = ..\lib\ExtUtils\Miniperl.pm
 X2P            = ..\x2p\a2p.exe
+GENUUDMAP      = ..\generate_uudmap.exe
 .IF "$(BUILD_STATIC)" == "define"
 PERLSTATIC     = static
 .ELSE
@@ -921,6 +922,8 @@ CORE_NOCFG_H        =               \
 
 CORE_H         = $(CORE_NOCFG_H) .\config.h
 
+UUDMAP_H       = ..\uudmap.h
+
 MICROCORE_OBJ  = $(MICROCORE_SRC:db:+$(o))
 CORE_OBJ       = $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
 WIN32_OBJ      = $(WIN32_SRC:db:+$(o))
@@ -929,6 +932,7 @@ MINIWIN32_OBJ       = $(MINIDIR)\{$(WIN32_OBJ:f)}
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 DLL_OBJ                = $(DLL_SRC:db:+$(o))
 X2P_OBJ                = $(X2P_SRC:db:+$(o))
+GENUUDMAP_OBJ  = $(GENUUDMAP:db:+$(o))
 
 PERLDLL_OBJ    = $(CORE_OBJ)
 PERLEXE_OBJ    = perlmain$(o)
@@ -1266,21 +1270,22 @@ $(X2P) : $(MINIPERL) $(X2P_OBJ)
        $(EMBED_EXE_MANI)
 .ENDIF
 
-globals$(o) : uudmap.h
+$(MINIDIR)\globals$(o) : $(UUDMAP_H)
 
-uudmap.h: generate_uudmap.exe
-       generate_uudmap >uudmap.h
+$(UUDMAP_H) : $(GENUUDMAP)
+       $(GENUUDMAP) >$(UUDMAP_H)
 
-generate_uudmap.exe : generate_uudmap$(o)
+$(GENUUDMAP) : $(GENUUDMAP_OBJ)
 .IF "$(CCTYPE)" == "BORLAND"
        $(LINK32) -Tpe -ap $(BLINK_FLAGS) \
-           @$(mktmp c0x32$(o) generate_uudmap$(o),$(@:s,\,$B,),,$(LIBFILES),)
+           @$(mktmp c0x32$(o) $(GENUUDMAP_OBJ:s,\,$B,),$(@:s,\,$B,),,$(LIBFILES),)
 .ELIF "$(CCTYPE)" == "GCC"
        $(LINK32) -v -o $@ $(BLINK_FLAGS) \
-           $(mktmp $(LKPRE) generate_uudmap$(o) $(LIBFILES) $(LKPOST))
+           $(mktmp $(LKPRE) $(GENUUDMAP_OBJ:s,\,$B,) $(LIBFILES) $(LKPOST))
 .ELSE
        $(LINK32) -subsystem:console -out:$@ $(BLINK_FLAGS) \
-           @$(mktmp $(LIBFILES) generate_uudmap$(o))
+           @$(mktmp $(LIBFILES) $(GENUUDMAP_OBJ:s,\,$B,))
+       $(EMBED_EXE_MANI)
 .ENDIF
 
 perlmain.c : runperl.c
@@ -1622,7 +1627,7 @@ _clean :
        -@erase $(PERLSTATICLIB)
        -@erase $(PERLDLL)
        -@erase $(CORE_OBJ)
-       -@erase generate_uudmap.exe generate_uudmap$(o) uudmap.h
+       -@erase $(GENUUDMAP) $(GENUUDMAP_OBJ) $(UUDMAP_H)
        -if exist $(MINIDIR) rmdir /s /q $(MINIDIR)
        -if exist $(UNIDATADIR1) rmdir /s /q $(UNIDATADIR1)
        -if exist $(UNIDATADIR2) rmdir /s /q $(UNIDATADIR2)