Updated for VMS.

1 files changed, 63 insertions, 59 deletions

diff --git a/vms/Makefile b/vms/Makefile
index 5c6deb13e8..075a6b9860 100644
--- a/vms/Makefile
+++ b/vms/Makefile
@@ -3,7 +3,7 @@
 #> conversion process.  For more information, see mms2make.pl
 #>
 # Makefile. for perl5 on VMS
-# Last revised  5-Jun-1995 by Charles Bailey  bailey@genetics.upenn.edu
+# Last revised  4-Dec-1995 by Charles Bailey  bailey@genetics.upenn.edu
 #
 #
 #	tidy      -- purge files generated by executing this file
@@ -35,8 +35,6 @@ ARCHAUTO = [.lib.$(ARCH).auto]
 # -fno-builtin avoids bug in gcc up to version 2.6.2 which can destroy
 # data when memcpy() is called on large (>64 kB) blocks of memory
 # (fixed in gcc 2.6.3)
-.first:
-	@ If f$$TrnLnm("Sys").eqs."" Then Define/NoLog SYS sys$$Library
 XTRAOBJS = 
 LIBS1 = $(XTRAOBJS)
 DBGSPECFLAGS = /Show=(Source,Include,Expansion)
@@ -45,9 +43,11 @@ DBGSPECFLAGS = /Show=(Source,Include,Expansion)
 # SYSNAM is enabled.  This is fixed in CSC Patch # AXPACRT04_061, but turning
 # off SYSNAM for the MM[SK] subprocess doesn't hurt anything, so we do it
 # just in case.
+.first:
+	@ If f$$TrnLnm("Sys").eqs."" Then Define/NoLog SYS sys$$Library
 XTRACCFLAGS = /Include=[]/Object=$(O)
 XTRADEF =
-LIBS2 = sys$$Share:VAXCRTL.Exe/Shareable
+LIBS2 = VAXCRTL/Shareable
 
 
 DBGCCFLAGS = /NoList
@@ -70,14 +70,14 @@ SOCKPM =
 CFLAGS = /Define=(DEBUGGING$(SOCKDEF)$(XTRADEF))$(XTRACCFLAGS)$(DBGCCFLAGS)
 LINKFLAGS = $(DBGLINKFLAGS)
 
-MAKE = MMK
+MAKE = $(MMS)
 MAKEFILE = [.VMS]Makefile.   # this file
 NOOP = continue
 
 # Macros to invoke a copy of miniperl during the build.  Targets which
 # are built using these macros should depend on $(MINIPERL_EXE)
 MINIPERL_EXE = sys$$Disk:[]miniperl$(E)
-MINIPERL = MCR $(MINIPERL_EXE) "-Ilib"
+MINIPERL = MCR $(MINIPERL_EXE) "-I[.lib]"
 XSUBPP = $(MINIPERL) [.lib.extutils]xsubpp
 # Macro to invoke a preexisting copy of Perl.  This is used to regenerate
 # some header files when rebuilding Perl, but premade versions are provided
@@ -146,9 +146,9 @@ CRTLOPTS =,$(CRTL)/Options
 
 all : base extras archcorefiles preplibrary
 	@ $(NOOP)
-base : miniperl$(E) perl$(E) [.lib.$(ARCH)]Config.pm 
+base : miniperl$(E) perl$(E)
 	@ $(NOOP)
-extras : [.lib]DynaLoader.pm [.lib.VMS]Filespec.pm [.lib.extutils]MM_VMS.pm
+extras :  [.lib]Config.pm [.lib.$(ARCH)]Config.pm [.lib]DynaLoader.pm [.lib.VMS]Filespec.pm [.lib.extutils]MM_VMS.pm
 	@ $(NOOP)
 archcorefiles :  $(ac1) $(ac2) $(ac3) $(ac4) $(ac5) $(ac6) $(ac7) $(ac8) $(ac9) $(acs) $(ARCHAUTO)time.stamp
 	@ $(NOOP)
@@ -168,11 +168,11 @@ $(DBG)libperl$(OLB) : $(obj)
 perlmain.c : miniperlmain.c $(MINIPERL_EXE) [.vms]writemain.pl
 	$(MINIPERL) [.VMS]Writemain.pl "$(EXT)"
 
-perl$(E) : perlmain$(O), perlshr$(E), perlshr_attr.opt $(MINIPERL_EXE)
+perl$(E) : perlmain$(O), perlshr$(E), $(MINIPERL_EXE)
 	@ $$@[.vms]genopt "PerlShr.Opt/Write" "|" "''f$$Environment("Default")'$(DBG)PerlShr$(E)/Share"
 	Link $(LINKFLAGS)/Exe=$(DBG)$@ perlmain$(O), perlshr.opt/Option, perlshr_attr.opt/Option
 perlshr$(E) : $(DBG)libperl$(OLB) $(extobj) $(DBG)perlshr_xtras.ts
-	Link $(LINKFLAGS)/Share=$(DBG)$@ $(extobj) []$(DBG)perlshr_bld.opt/Option, perlshr_attr.opt/Option
+	Link /NoTrace$(LINKFLAGS)/Share=$(DBG)$@ $(extobj) []$(DBG)perlshr_bld.opt/Option, perlshr_attr.opt/Option
 # The following files are built in one go by gen_shrfls.pl:
 #  perlshr_attr.opt, $(DBG)perlshr_bld.opt - VAX and AXP
 #  perlshr_gbl*.mar, perlshr_gbl*$(O) - VAX only
@@ -188,7 +188,7 @@ $(DBG)perlshr_xtras.ts : perl.h config.h vmsish.h proto.h [.vms]gen_shrfls.pl $(
 	Copy [.lib]config.pm $@
 
 [.lib]config.pm : [.vms]config.vms [.vms]genconfig.pl $(MINIPERL_EXE)
-	$(MINIPERL) [.VMS]GenConfig.Pl cc=$(CC)$(CFLAGS) ldflags=$(LINKFLAGS)
+	$(MINIPERL) [.VMS]GenConfig.Pl cc=$(CC)$(CFLAGS) ldflags=$(LINKFLAGS) obj_ext=$(O) exe_ext=$(E) lib_ext=$(OLB)
 	$(MINIPERL) ConfigPM.
 
 [.ext.dynaloader]dl_vms.c : [.ext.dynaloader]dl_vms.xs $(MINIPERL_EXE)
@@ -201,7 +201,7 @@ $(DBG)perlshr_xtras.ts : perl.h config.h vmsish.h proto.h [.vms]gen_shrfls.pl $(
 	Copy/Log/NoConfirm [.ext.dynaloader]dynaloader.pm [.lib]DynaLoader.pm
 
 [.lib.VMS]Filespec.pm : [.vms.ext]Filespec.pm
-	@ Create/Directory [.lib.VMS]
+	@ If f$$Search("[.lib]VMS.Dir").eqs."" Then Create/Directory [.lib.VMS]
 	Copy/Log/NoConfirm [.vms.ext]Filespec.pm $@
 
 [.lib.ExtUtils]MM_VMS.pm : [.vms.ext]MM_VMS.pm
@@ -210,18 +210,21 @@ $(DBG)perlshr_xtras.ts : perl.h config.h vmsish.h proto.h [.vms]gen_shrfls.pl $(
 preplibrary : $(MINIPERL_EXE) [.lib]DynaLoader.pm [.lib.VMS]Filespec.pm [.lib.ExtUtils]MM_VMS.pm $(SOCKPM)
 	@ Write sys$$Output "Autosplitting Perl library . . ."
 	@ Create/Directory [.lib.auto]
-	@ $(MINIPERL) "-Ilib" -e "use AutoSplit; autosplit_lib_modules(@ARGV)" [.lib]*.pm [.lib.*]*.pm
+	@ $(MINIPERL) -e "use AutoSplit; autosplit_lib_modules(@ARGV)" [.lib]*.pm [.lib.*]*.pm
 
 
-opcode.h : opcode.pl
-	@ Write sys$$Output "Don't worry if this fails."
-	- $(INSTPERL) opcode.pl
-keywords.h : keywords.pl
-	@ Write sys$$Output "Don't worry if this fails."
-	- $(INSTPERL) keywords.pl
-embed.h : global.sym interp.sym
-	@ Write sys$$Output "Don't worry if this fails."
-	- $(INSTPERL) [.vms]embed_h.pl
+# The following three header files are generated automatically
+#	keywords.h :	keywords.pl
+#	opcode.h :	opcode.pl
+#	embed.h :	embed.pl global.sym interp.sym
+# The correct versions should be already supplied with the perl kit,
+# in case you don't have perl available.
+# To force them to run, type
+#	MMS regen_headers
+regen_headers :
+	$(INSTPERL) keywords.pl
+	$(INSTPERL) opcode.pl
+	$(INSTPERL) embed.pl
 
 # VMS uses modified perly.[ch] with tags for globaldefs if using DEC compiler
 perly.c : [.vms]perly_c.vms
@@ -233,7 +236,7 @@ perly.h : [.vms]perly_h.vms
 # commented out if you don't have byacc.
 # Altered for VMS by Charles Bailey  bailey@genetics.upenn.edu
 # perly.c:
-# 	@ Write Sys$Output 'Expect' 80 shift/reduce and 62 reduce/reduce conflicts
+# 	@ Write Sys$Output "Expect 80 shift/reduce and 62 reduce/reduce conflicts"
 # 	\$(BYACC) -d perly.y
 # Has to be done by hand or by POSIX shell under VMS
 # 	sh \$(shellflags) ./perly.fixer y.tab.c perly.c
@@ -243,103 +246,103 @@ perly.h : [.vms]perly_h.vms
 perly$(O) : perly.c, perly.h, $(h)
 	$(CC) $(CFLAGS) perly.c
 
-test : perl$(E)
+test : all
 	- @[.VMS]Test.Com
 
 # CORE subset for MakeMaker, so we can build Perl without sources
 # Should move to VMS installperl when we get one
 $(ARCHCORE)EXTERN.h : EXTERN.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log EXTERN.h $@
 $(ARCHCORE)INTERN.h : INTERN.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log INTERN.h $@
 $(ARCHCORE)XSUB.h : XSUB.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log XSUB.h $@
 $(ARCHCORE)av.h : av.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log av.h $@
 $(ARCHCORE)config.h : config.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log config.h $@
 $(ARCHCORE)cop.h : cop.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log cop.h $@
 $(ARCHCORE)cv.h : cv.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log cv.h $@
 $(ARCHCORE)embed.h : embed.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log embed.h $@
 $(ARCHCORE)form.h : form.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log form.h $@
 $(ARCHCORE)gv.h : gv.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log gv.h $@
 $(ARCHCORE)handy.h : handy.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log handy.h $@
 $(ARCHCORE)hv.h : hv.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log hv.h $@
 $(ARCHCORE)keywords.h : keywords.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log keywords.h $@
 $(ARCHCORE)mg.h : mg.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log mg.h $@
 $(ARCHCORE)op.h : op.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log op.h $@
 $(ARCHCORE)opcode.h : opcode.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log opcode.h $@
 $(ARCHCORE)patchlevel.h : patchlevel.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log patchlevel.h $@
 $(ARCHCORE)perl.h : perl.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log perl.h $@
 $(ARCHCORE)perly.h : perly.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log perly.h $@
 $(ARCHCORE)pp.h : pp.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log pp.h $@
 $(ARCHCORE)proto.h : proto.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log proto.h $@
 $(ARCHCORE)regcomp.h : regcomp.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log regcomp.h $@
 $(ARCHCORE)regexp.h : regexp.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log regexp.h $@
 $(ARCHCORE)scope.h : scope.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log scope.h $@
 $(ARCHCORE)sv.h : sv.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log sv.h $@
 $(ARCHCORE)util.h : util.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log util.h $@
 $(ARCHCORE)vmsish.h : vmsish.h
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log vmsish.h $@
 $(ARCHCORE)$(DBG)libperl$(OLB) : $(DBG)libperl$(OLB) $(DBG)perlshr_xtras.ts
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log $(DBG)libperl$(OLB) $@
 $(ARCHCORE)perlshr_attr.opt : $(DBG)perlshr_xtras.ts
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log perlshr_attr.opt $@
 $(ARCHCORE)$(DBG)perlshr_bld.opt : $(DBG)perlshr_xtras.ts
-	@ Create/Directory $(ARCHCORE)
+	@ If f$$Search("[.lib.$(ARCH)]CORE.dir").eqs."" Then Create/Directory $(ARCHCORE)
 	Copy/Log $(DBG)perlshr_bld.opt $@
 $(ARCHAUTO)time.stamp :
-	@ Create/Directory $(ARCHAUTO)
+	@ If f$$Search("[.lib.$(ARCH)]auto.dir").eqs."" Then Create/Directory $(ARCHAUTO)
 	@ If f$$Search("$@").eqs."" Then Copy/NoConfirm _NLA0: $(MMS$TARGET)
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
@@ -1006,6 +1009,9 @@ tidy : cleanlis
 	- If f$$Search("[.Lib.Auto...]*.al;-1").nes."" Then Purge/NoConfirm/Log [.Lib.Auto...]*.al
 	- If f$$Search("[.Lib.Auto...]autosplit.ix;-1").nes."" Then Purge/NoConfirm/Log [.Lib.Auto...]autosplit.ix
 	- If f$$Search("[.Lib]DynaLoader.pm;-1").nes."" Then Purge/NoConfirm/Log [.Lib]DynaLoader.pm
+	- If f$$Search("[.Lib]Socket.pm;-1").nes."" Then Purge/NoConfirm/Log [.Lib]Socket.pm
+	- If f$$Search("[.Lib]Config.pm;-1").nes."" Then Purge/NoConfirm/Log [.Lib]Config.pm
+	- If f$$Search("[.Lib.$(ARCH)]Config.pm;-1").nes."" Then Purge/NoConfirm/Log [.Lib.$(ARCH)]Config.pm
 	- If f$$Search("[.Lib.VMS]*.*;-1").nes."" Then Purge/NoConfirm/Log [.Lib.VMS]*.*
 	- If f$$Search("[.Lib.ExtUtils]MM_VMS.pm;-1").nes."" Then Purge/NoConfirm/Log [.Lib.ExtUtils]MM_VMS.pm
 	- If f$$Search("$(ARCHCORE)*.*").nes."" Then Purge/NoConfirm/Log $(ARCHCORE)*.*
@@ -1038,6 +1044,8 @@ realclean : clean
 	- If f$$Search("[.Lib]DynaLoader.pm").nes."" Then Delete/NoConfirm/Log [.Lib]DynaLoader.pm;*
 	- If f$$Search("[.Lib.ExtUtils]MM_VMS.pm").nes."" Then Delete/NoConfirm/Log [.Lib.ExtUtils]MM_VMS.pm;*
 	- If f$$Search("*$(E)").nes."" Then Delete/NoConfirm/Log *$(E);*
+	- If f$$Search("[.Lib]Config.pm").nes."" Then Delete/NoConfirm/Log [.Lib]Config.pm;*
+	- If f$$Search("[.Lib.$(ARCH)]Config.pm").nes."" Then Delete/NoConfirm/Log [.Lib.$(ARCH)]Config.pm;*
 
 cleansrc : clean
 	- If f$$Search("*.C;-1").nes."" Then Purge/NoConfirm/Log *.C
@@ -1050,7 +1058,3 @@ cleansrc : clean
 	- If f$$Search("[.VMS]*.VMS;-1").nes."" Then Purge/NoConfirm/Log [.VMS]*.VMS
 	- If f$$Search("[.VMS...]*.pm;-1").nes."" Then Purge/NoConfirm/Log [.VMS...]*.pm
 	- If f$$Search("[.VMS...]*.xs;-1").nes."" Then Purge/NoConfirm/Log [.VMS...]*.xs
-	- If f$$Search("[.Lib.Auto...]*.al").nes."" Then Delete/NoConfirm/Log [.Lib.Auto...]*.al;*
-	- If f$$Search("[.Lib.Auto...]autosplit.ts").nes."" Then Delete/NoConfirm/Log [.Lib.Auto...]autosplit.ts;*
-	- If f$$Search("[.Lib.$(ARCH)]Config.pm").nes."" Then Delete/NoConfirm/Log [.Lib.$(ARCH)]Config.pm;*
-	- If f$$Search("[.Lib]Config.pm").nes."" Then Delete/NoConfirm/Log [.Lib]Config.pm;*