diff options
| author | Nicholas Clark <nick@ccl4.org> | 2009-09-18 14:17:05 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2009-09-18 14:19:12 +0100 |
| commit | 82dee7de92a0bd357037a76ff6e67939cc6e9adc (patch) | |
| tree | 0b381b152051ef16b1cbe37c959c6f12709af686 /Makefile.SH | |
| parent | b17397621f1e997fadd615214400d296c2677d96 (diff) | |
| download | perl-82dee7de92a0bd357037a76ff6e67939cc6e9adc.tar.gz | |
Move lib from lib to ext.
Nothing up to and including minitest uses lib, and not needing many special
case rules to extract from lib/lib_pm.PL simplifies all the Makefiles.
Diffstat (limited to 'Makefile.SH')
| -rw-r--r-- | Makefile.SH | 16 |
1 files changed, 5 insertions, 11 deletions
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 |