cleanup installation of utilities on win32

p4raw-id: //depot/perl@1159

3 files changed, 93 insertions, 58 deletions

diff --git a/win32/Makefile b/win32/Makefile
index de36c42180..d315882ddf 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -225,6 +225,29 @@ X2P		= ..\x2p\a2p.exe
 PL2BAT		= bin\pl2bat.pl
 GLOBBAT		= bin\perlglob.bat
 
+UTILS		=			\
+		..\utils\h2ph		\
+		..\utils\splain		\
+		..\utils\perlbug	\
+		..\utils\pl2pm 		\
+		..\utils\c2ph		\
+		..\utils\h2xs		\
+		..\utils\perldoc	\
+		..\utils\pstruct	\
+		..\utils\perlcc		\
+		..\pod\checkpods	\
+		..\pod\pod2html		\
+		..\pod\pod2latex	\
+		..\pod\pod2man		\
+		..\pod\pod2text		\
+		..\x2p\find2perl	\
+		..\x2p\s2p		\
+		bin\www.pl		\
+		bin\runperl.pl		\
+		bin\pl2bat.pl		\
+		bin\perlglob.pl		\
+		bin\search.pl
+
 MAKE		= nmake -nologo
 
 CFGSH_TMPL	= config.vc
@@ -680,25 +703,18 @@ $(SOCKET_DLL): $(PERLEXE) $(SOCKET).xs
 	cd ..\..\win32
 
 doc: $(PERLEXE)
-	cd ..\pod
-	$(MAKE) -f ..\win32\pod.mak checkpods pod2html pod2latex \
-		pod2man pod2text
-	$(XCOPY) *.bat ..\win32\bin\*.*
-	cd ..\win32
 	copy ..\README.win32 ..\pod\perlwin32.pod
 	$(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
 	    --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML::=|)" \
 	    --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
 
-utils: $(PERLEXE)
+utils: $(PERLEXE) $(X2P)
 	cd ..\utils
 	$(MAKE) PERL=$(MINIPERL)
-	$(PERLEXE) -I..\lib ..\win32\$(PL2BAT) h2ph splain perlbug pl2pm c2ph
-	$(PERLEXE) ..\win32\$(PL2BAT) h2xs perldoc pstruct
-	$(XCOPY) *.bat ..\win32\bin\*.*
+	cd ..\pod
+	$(MAKE) -f ..\win32\pod.mak converters
 	cd ..\win32
-	$(PERLEXE) $(PL2BAT) bin\network.pl bin\www.pl bin\runperl.pl \
-			bin\pl2bat.pl bin\perlglob.pl
+	$(PERLEXE) $(PL2BAT) $(UTILS)
 
 distclean: clean
 	-del /f $(MINIPERL) $(PERLEXE) $(PERL95EXE) $(PERLDLL) $(GLOBEXE) \
@@ -735,16 +751,14 @@ distclean: clean
 	-rmdir /s /q $(AUTODIR) || rmdir /s $(AUTODIR)
 	-rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR)
 
-install : all installbare installutils installhtml
+install : all installbare installhtml
 
-installbare :
+installbare : utils
 	$(PERLEXE) ..\installperl
 	$(XCOPY) $(PERL95EXE) $(INST_BIN)\*.*
-
-installutils : utils
 	$(XCOPY) $(GLOBEXE) $(INST_BIN)\*.*
 	$(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
-	$(XCOPY) ..\pod\*.bat $(INST_SCRIPT)\*.*
+	$(XCOPY) bin\network.pl $(INST_LIB)\*.*
 
 installhtml : doc
 	$(RCOPY) html\*.* $(INST_HTML)\*.*
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 8544b5f1a5..090e864249 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -324,6 +324,29 @@ X2P		= ..\x2p\a2p.exe
 PL2BAT		= bin\pl2bat.pl
 GLOBBAT		= bin\perlglob.bat
 
+UTILS		=			\
+		..\utils\h2ph		\
+		..\utils\splain		\
+		..\utils\perlbug	\
+		..\utils\pl2pm 		\
+		..\utils\c2ph		\
+		..\utils\h2xs		\
+		..\utils\perldoc	\
+		..\utils\pstruct	\
+		..\utils\perlcc		\
+		..\pod\checkpods	\
+		..\pod\pod2html		\
+		..\pod\pod2latex	\
+		..\pod\pod2man		\
+		..\pod\pod2text		\
+		..\x2p\find2perl	\
+		..\x2p\s2p		\
+		bin\www.pl		\
+		bin\runperl.pl		\
+		bin\pl2bat.pl		\
+		bin\perlglob.pl		\
+		bin\search.pl
+
 .IF "$(CCTYPE)" == "BORLAND"
 
 CFGSH_TMPL	= config.bc
@@ -842,21 +865,15 @@ $(SOCKET_DLL): $(PERLEXE) $(SOCKET).xs
 	cd $(EXTDIR)\$(*B) && $(MAKE)
 
 doc: $(PERLEXE)
-	cd ..\pod && $(MAKE) -f ..\win32\pod.mak checkpods \
-		pod2html pod2latex pod2man pod2text
-	cd ..\pod && $(XCOPY) *.bat ..\win32\bin\*.*
 	copy ..\README.win32 ..\pod\perlwin32.pod
 	$(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
 	    --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\
 	    --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
 
-utils: $(PERLEXE)
+utils: $(PERLEXE) $(X2P)
 	cd ..\utils && $(MAKE) PERL=$(MINIPERL)
-	cd ..\utils && $(PERLEXE) ..\win32\$(PL2BAT) h2ph splain perlbug \
-		pl2pm c2ph h2xs perldoc pstruct
-	$(XCOPY) ..\utils\*.bat bin\*.*
-	$(PERLEXE) -I..\lib $(PL2BAT) bin\network.pl bin\www.pl bin\runperl.pl \
-			bin\pl2bat.pl bin\perlglob.pl
+	cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
+	$(PERLEXE) $(PL2BAT) $(UTILS)
 
 distclean: clean
 	-del /f $(MINIPERL) $(PERLEXE) $(PERL95EXE) $(PERLDLL) $(GLOBEXE) \
@@ -887,18 +904,16 @@ distclean: clean
 	-rmdir /s /q $(AUTODIR) || rmdir /s $(AUTODIR)
 	-rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR)
 
-install : all installbare installutils installhtml
+install : all installbare installhtml
 
-installbare :
+installbare : utils
 	$(PERLEXE) ..\installperl
 .IF "$(PERL95EXE)" != ""
 	$(XCOPY) $(PERL95EXE) $(INST_BIN)\*.*
 .ENDIF
-
-installutils : utils
 	$(XCOPY) $(GLOBEXE) $(INST_BIN)\*.*
 	$(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
-	$(XCOPY) ..\pod\*.bat $(INST_SCRIPT)\*.*
+	$(XCOPY) bin\network.pl $(INST_LIB)\*.*
 
 installhtml : doc
 	$(RCOPY) html\*.* $(INST_HTML)\*.*
diff --git a/win32/pod.mak b/win32/pod.mak
index 9881ed882d..7ad153c000 100644
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -8,8 +8,10 @@ POD2HTML = pod2html \
 
 all: $(CONVERTERS) html
 
+converters: $(CONVERTERS)
+
 PERL = ..\miniperl.exe
-PL2BAT = ..\win32\bin\pl2bat.pl
+REALPERL = ..\perl.exe
 
 POD = \
 	perl.pod	\
@@ -23,6 +25,7 @@ POD = \
 	perlvar.pod	\
 	perlsub.pod	\
 	perlmod.pod	\
+	perlmodlib.pod	\
 	perlform.pod	\
 	perllocale.pod	\
 	perlref.pod	\
@@ -70,6 +73,7 @@ MAN = \
 	perlvar.man	\
 	perlsub.man	\
 	perlmod.man	\
+	perlmodlib.man	\
 	perlform.man	\
 	perllocale.man	\
 	perlref.man	\
@@ -117,6 +121,7 @@ HTML = \
 	perlvar.html	\
 	perlsub.html	\
 	perlmod.html	\
+	perlmodlib.html	\
 	perlform.html	\
 	perllocale.html	\
 	perlref.html	\
@@ -164,6 +169,7 @@ TEX = \
 	perlvar.tex	\
 	perlsub.tex	\
 	perlmod.tex	\
+	perlmodlib.tex	\
 	perlform.tex	\
 	perllocale.tex	\
 	perlref.tex	\
@@ -206,67 +212,67 @@ html:	pod2html $(HTML)
 tex:	pod2latex $(TEX)
 
 toc:
-	$(PERL) -I..\lib buildtoc >perltoc.pod
+	$(PERL) -I../lib buildtoc >perltoc.pod
 
 .SUFFIXES: .pm .pod
 
 .SUFFIXES: .man
 
 .pm.man:
-	$(PERL) -I..\lib pod2man $*.pm >$*.man
+	$(PERL) -I../lib pod2man $*.pm >$*.man
 
 .pod.man:
-	$(PERL) -I..\lib pod2man $*.pod >$*.man
+	$(PERL) -I../lib pod2man $*.pod >$*.man
 
 .SUFFIXES: .html
 
 .pm.html:
-	$(PERL) -I..\lib $(POD2HTML) --infile=$*.pm --outfile=$*.html
+	$(PERL) -I../lib $(POD2HTML) --infile=$*.pm --outfile=$*.html
 
 .pod.html:
-	$(PERL) -I..\lib $(POD2HTML) --infile=$*.pod --outfile=$*.html
+	$(PERL) -I../lib $(POD2HTML) --infile=$*.pod --outfile=$*.html
 
 .SUFFIXES: .tex
 
 .pm.tex:
-	$(PERL) -I..\lib pod2latex $*.pm
+	$(PERL) -I../lib pod2latex $*.pm
 
 .pod.tex:
-	$(PERL) -I..\lib pod2latex $*.pod
+	$(PERL) -I../lib pod2latex $*.pod
 
 clean:
-	del /f $(MAN) $(HTML) $(TEX)
-	del /f pod2html-*cache
-	del /f *.aux *.log
+	rm -f $(MAN)
+	rm -f $(HTML)
+	rm -f $(TEX)
+	rm -f pod2html-*cache
+	rm -f *.aux *.log *.exe
 
 realclean:	clean
-	del /f $(CONVERTERS)
+	rm -f $(CONVERTERS)
 
 distclean:	realclean
 
 check:	checkpods
 	@echo "checking..."; \
-	$(PERL) -I..\lib checkpods $(POD)
+	$(PERL) -I../lib checkpods $(POD)
 
 # Dependencies.
-pod2latex:	pod2latex.PL ..\lib\Config.pm
-	$(PERL) -I..\lib pod2latex.PL
-	$(PERL) $(PL2BAT) pod2latex
+pod2latex:	pod2latex.PL ../lib/Config.pm
+	$(PERL) -I../lib pod2latex.PL
 
-pod2html:	pod2html.PL ..\lib\Config.pm
-	$(PERL) -I..\lib pod2html.PL
-	$(PERL) $(PL2BAT) pod2html
+pod2html:	pod2html.PL ../lib/Config.pm
+	$(PERL) -I ../lib pod2html.PL
 
-pod2man:	pod2man.PL ..\lib\Config.pm
-	$(PERL) -I..\lib pod2man.PL
-	$(PERL) $(PL2BAT) pod2man
+pod2man:	pod2man.PL ../lib/Config.pm
+	$(PERL) -I ../lib pod2man.PL
 
-pod2text:	pod2text.PL ..\lib\Config.pm
-	$(PERL) -I..\lib pod2text.PL
-	$(PERL) $(PL2BAT) pod2text
+pod2text:	pod2text.PL ../lib/Config.pm
+	$(PERL) -I ../lib pod2text.PL
 
-checkpods:	checkpods.PL ..\lib\Config.pm
-	$(PERL) -I..\lib checkpods.PL
-	$(PERL) $(PL2BAT) checkpods
+checkpods:	checkpods.PL ../lib/Config.pm
+	$(PERL) -I ../lib checkpods.PL
 
+compile: all
+	$(REALPERL) -I../lib ../utils/perlcc -regex 's/$$/.exe/' pod2latex pod2man pod2text checkpods -prog -verbose dcf -log ../compilelog;
 
+