diff options
| -rw-r--r-- | MANIFEST | 5 | ||||
| -rw-r--r-- | Makefile.SH | 16 | ||||
| -rw-r--r-- | NetWare/Makefile | 2 | ||||
| -rwxr-xr-x | Porting/Maintainers.pl | 5 | ||||
| -rw-r--r-- | ext/lib/lib_pm.PL (renamed from lib/lib_pm.PL) | 0 | ||||
| -rw-r--r-- | ext/lib/t/01lib.t (renamed from lib/lib.t) | 0 | ||||
| -rw-r--r-- | vms/descrip_mms.template | 7 | ||||
| -rw-r--r-- | win32/Makefile | 3 | ||||
| -rw-r--r-- | win32/makefile.mk | 2 |
9 files changed, 11 insertions, 29 deletions
@@ -1555,6 +1555,8 @@ ext/IPC-SysV/t/pod.t IPC::SysV test file ext/IPC-SysV/t/sem.t IPC::SysV test file ext/IPC-SysV/t/shm.t IPC::SysV test file ext/IPC-SysV/typemap IPC::SysV typemap +ext/lib/lib_pm.PL For "use lib", produces lib/lib.pm +ext/lib/Makefile.PL ext/libnet/Changes libnet ext/libnet/Config.eg libnet ext/libnet/demos/ftp libnet @@ -1592,6 +1594,7 @@ ext/libnet/t/nntp.t libnet ext/libnet/t/require.t libnet ext/libnet/t/smtp.t libnet ext/libnet/t/time.t libnet +ext/lib/t/01lib.t For "use lib" testing ext/List-Util/Changes Util extension ext/List-Util/lib/List/Util.pm List::Util ext/List-Util/lib/List/Util/PP.pm List::Util @@ -3432,8 +3435,6 @@ lib/integer.t For "use integer" testing lib/Internals.t For Internals::* testing lib/less.pm For "use less" lib/less.t See if less support works -lib/lib_pm.PL For "use lib", produces lib/lib.pm -lib/lib.t For "use lib" testing lib/locale.pm For "use locale" lib/locale.t See if locale support works lib/look.pl A "look" equivalent diff --git a/Makefile.SH b/Makefile.SH index 58c4449370..a04995323d 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -428,11 +428,10 @@ shextract = Makefile cflags config.h makeaperl makedepend \ pl = pod/pod2html.PL pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL \ pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL -# lib/lib.pm is not listed here because it has a rule of its own. plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text \ pod/pod2usage pod/podchecker pod/podselect -addedbyconf = UU $(shextract) $(plextract) lib/lib.pm pstruct +addedbyconf = UU $(shextract) $(plextract) pstruct # Unicode data files generated by mktables unidatafiles = lib/unicore/Canonical.pl lib/unicore/Exact.pl \ @@ -553,7 +552,7 @@ perl$(OBJ_EXT): git_version.h translators: miniperl$(EXE_EXT) $(CONFIGPM) $(dynamic_ext) FORCE @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all -utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) lib/lib.pm FORCE +utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) FORCE @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all @@ -949,7 +948,7 @@ esac $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: preplibrary -preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm lib/re.pm $(PREPLIBRARY_LIBPERL) +preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL) $(CONFIGPM_FROM_CONFIG_SH) $(CONFIGPOD): config.sh miniperl$(EXE_EXT) configpm Porting/Glossary lib/Config_git.pl $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib configpm @@ -968,10 +967,6 @@ $(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p $(dynamic_ext) x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL cd x2p; $(LDLIBPTH) $(MAKE) s2p -lib/lib.pm: miniperl$(EXE_EXT) $(CONFIGPM) - @-rm -f $@ - $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib $(Icwd) lib/lib_pm.PL - unidatafiles $(unidatafiles): uni.data uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) @@ -1416,11 +1411,10 @@ test.taintwarn: test_prep PERL=./perl TEST_ARGS=-taintwarn $(MAKE) _test minitest.prep: - -@test -f lib/lib.pm && test -f lib/Config.pm || \ - $(MAKE) lib/Config.pm lib/lib.pm $(unidatafiles) + -@test test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles) @echo " " @echo "You may see some irrelevant test failures if you have been unable" - @echo "to build lib/Config.pm, lib/lib.pm or the Unicode data files." + @echo "to build lib/Config.pm, or the Unicode data files." @echo " " # Can't depend on lib/Config.pm because that might be where miniperl diff --git a/NetWare/Makefile b/NetWare/Makefile index 9ae1c7a2dd..c39bb6e9f8 100644 --- a/NetWare/Makefile +++ b/NetWare/Makefile @@ -1382,8 +1382,6 @@ utils: $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT) $(X2P) copy ..\README.netware .\perlnw5.pod $(MAKE) -f ..\win32\pod.mak converters - cd ..\lib - $(MINIPERL) lib_pm.PL cd ..\netware $(MINIPERL) $(PL2BAT) $(UTILS) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index cf09eb5541..18e3d4ee59 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -821,11 +821,8 @@ use File::Glob qw(:case); { 'MAINTAINER' => 'smueller', 'DISTRIBUTION' => 'SMUELLER/lib-0.62.tar.gz', - 'FILES' => q[lib/lib_pm.PL lib/lib.t], + 'FILES' => q[ext/lib/], 'EXCLUDED' => [ qw{forPAUSE/lib.pm t/00pod.t} ], - 'MAP' => { 'lib_pm.PL' => 'lib/lib_pm.PL', - 't/01lib.t' => 'lib/lib.t', - }, 'CPAN' => 1, 'UPSTREAM' => "blead", }, diff --git a/lib/lib_pm.PL b/ext/lib/lib_pm.PL index fabdbd0a7d..fabdbd0a7d 100644 --- a/lib/lib_pm.PL +++ b/ext/lib/lib_pm.PL diff --git a/lib/lib.t b/ext/lib/t/01lib.t index d39a656bf8..d39a656bf8 100644 --- a/lib/lib.t +++ b/ext/lib/t/01lib.t diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index 40b7753a10..8a2f2d9aa4 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -360,7 +360,7 @@ CRTLOPTS =,$(CRTL)/Options unidatadirs = lib/unicore/To lib/unicore/lib # Modules which must be installed before we can build extensions -LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm [.lib]lib.pm $(ARCHDIR)vmspipe.com [.lib]re.pm +LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]re.pm utils1 = [.lib.pods]perldoc.com [.lib.ExtUtils]Miniperl.pm [.utils]c2ph.com [.utils]h2ph.com utils2 = [.utils]h2xs.com [.utils]libnetcfg.com [.lib]perlbug.com [.utils]dprofpp.com @@ -568,9 +568,6 @@ dynext : $(LIBPREREQ) $(DBG)perlshr$(E) unidatafiles.ts DynaLoader$(O) preplibra nonxsext : $(LIBPREREQ) preplibrary $(MINIPERL_EXE) $(MINIPERL) make_ext.pl "MAKE=$(MMS)" "--nonxs" -[.lib]lib.pm : [.lib]lib_pm.PL - $(MINIPERL) $(MMS$SOURCE) - [.lib.VMS]Filespec.pm : [.vms.ext]Filespec.pm @ If F$Search("[.lib]VMS.Dir").eqs."" Then Create/Directory [.lib.VMS] Copy/NoConfirm/Log $(MMS$SOURCE) [.lib.VMS] @@ -1445,7 +1442,7 @@ test_harness : all [.t.lib]vmsfspec.t - @[.vms]test.com "$(E)" "$(__DEBUG__)" @ $(MINIPERL) -e "print ""Ran tests"";" > [.t]rantests. -minitest : $(MINITEST_EXE) [.lib]re.pm [.lib]lib.pm [.lib.VMS]Filespec.pm unidatafiles.ts +minitest : $(MINITEST_EXE) [.lib]re.pm [.lib.VMS]Filespec.pm unidatafiles.ts @ PERL_TEST_DRIVER == "minitest" - @[.vms]test.com "$(E)" "$(__DEBUG__)" diff --git a/win32/Makefile b/win32/Makefile index 8e911cb536..e3348f5c63 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1119,8 +1119,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.win32 ..\pod\perlwin32.pod copy ..\pod\perl5110delta.pod ..\pod\perldelta.pod $(MAKE) -f ..\win32\pod.mak converters - cd ..\lib - $(PERLEXE) $(ICWD) lib_pm.PL cd ..\win32 $(PERLEXE) $(PL2BAT) $(UTILS) $(PERLEXE) $(ICWD) ..\autodoc.pl .. @@ -1140,7 +1138,6 @@ distclean: realclean -del /f $(LIBDIR)\Encode.pm $(LIBDIR)\encoding.pm $(LIBDIR)\Errno.pm -del /f $(LIBDIR)\Config.pod $(LIBDIR)\POSIX.pod $(LIBDIR)\threads.pm -del /f $(LIBDIR)\.exists $(LIBDIR)\attributes.pm $(LIBDIR)\DynaLoader.pm - -del /f $(LIBDIR)\XSLoader.pm $(LIBDIR)\lib.pm -del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm diff --git a/win32/makefile.mk b/win32/makefile.mk index e1e58fc693..1498ea0420 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1449,7 +1449,6 @@ utils: $(PERLEXE) $(X2P) copy ..\README.win32 ..\pod\perlwin32.pod copy ..\pod\perl5110delta.pod ..\pod\perldelta.pod cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters - cd ..\lib && $(PERLEXE) $(ICWD) lib_pm.PL $(PERLEXE) $(PL2BAT) $(UTILS) $(PERLEXE) $(ICWD) ..\autodoc.pl .. $(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q @@ -1468,7 +1467,6 @@ distclean: realclean -del /f $(LIBDIR)\Encode.pm $(LIBDIR)\encoding.pm $(LIBDIR)\Errno.pm -del /f $(LIBDIR)\Config.pod $(LIBDIR)\POSIX.pod $(LIBDIR)\threads.pm -del /f $(LIBDIR)\.exists $(LIBDIR)\attributes.pm $(LIBDIR)\DynaLoader.pm - -del /f $(LIBDIR)\XSLoader.pm $(LIBDIR)\lib.pm -del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm |