diff options
| author | Nicholas Clark <nick@ccl4.org> | 2010-10-05 14:45:15 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2010-10-05 14:45:15 +0100 |
| commit | 467132b90d291170637564b5b65d1e7578ba831f (patch) | |
| tree | 67e2c1662f491ca2ef57e864ccde9ed9c92e9322 | |
| parent | 33c64ab22a4a0f496017dca0dbf7da214054ffdd (diff) | |
| download | perl-467132b90d291170637564b5b65d1e7578ba831f.tar.gz | |
Eliminate the now unused Makefile targets plextract, pl and pllist.
| -rw-r--r-- | Cross/Makefile-cross-SH | 19 | ||||
| -rwxr-xr-x | Makefile.SH | 20 |
2 files changed, 5 insertions, 34 deletions
diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index b4be56f001..9b45943352 100644 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -329,15 +329,7 @@ private = preplibrary $(CONFIGPM) $(CROSS_LIB)/Config.pod shextract = Makefile cflags config.h makeaperl makedepend \ makedir myconfig writemain pod/Makefile -# Files to be built with variable substitution after miniperl is -# available. Dependencies handled manually below (for now). - -pl = - -# lib/lib.pm is not listed here because it has a rule of its own. -plextract = - -addedbyconf = UU $(shextract) $(plextract) lib/lib.pm pstruct +addedbyconf = UU $(shextract) lib/lib.pm pstruct # Unicode data files generated by mktables unidatafiles = lib/unicore/Decomposition.pl lib/unicore/TestProp.pl \ @@ -742,10 +734,6 @@ lib/re.pm: ext/re/re.pm @-rm -f $@ cp ext/re/re.pm lib/re.pm -$(plextract): miniperl $(CONFIGPM) x2p/s2p - @-rm -f $@ - $(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL - lib/lib.pm: miniperl $(CONFIGPM) @-rm -f $@ $(LDLIBPTH) ./miniperl -Ilib -MCross lib/lib_pm.PL @@ -1250,7 +1238,7 @@ noknack: utilities nokfilenack: utilities $(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok -A -.PHONY: clist hlist shlist pllist +.PHONY: clist hlist shlist clist: $(c) echo $(c) | tr ' ' $(TRNL) >.clist @@ -1261,9 +1249,6 @@ hlist: $(h) shlist: $(sh) echo $(sh) | tr ' ' $(TRNL) >.shlist -pllist: $(pl) - echo $(pl) | tr ' ' $(TRNL) >.pllist - Makefile: Makefile.SH ./config.sh $(SHELL) Makefile.SH diff --git a/Makefile.SH b/Makefile.SH index df310c68f6..f886564046 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -440,14 +440,7 @@ sh = Makefile.SH cflags.SH config_h.SH makeaperl.SH makedepend.SH \ shextract = Makefile cflags config.h makeaperl makedepend \ makedir myconfig writemain pod/Makefile -# Files to be built with variable substitution after miniperl is -# available. Dependencies handled manually below (for now). - -pl = - -plextract = - -addedbyconf = UU $(shextract) $(plextract) pstruct +addedbyconf = UU $(shextract) pstruct # Unicode data files generated by mktables unidatafiles = lib/unicore/Decomposition.pl lib/unicore/TestProp.pl \ @@ -575,7 +568,7 @@ translators: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE !NO!SUBS! $spitshell >>$Makefile <<!GROK!THIS! -utilities: \$(MINIPERL_EXE) \$(CONFIGPM) \$(plextract) FORCE lib/auto/Cwd/Cwd.$dlext +utilities: \$(MINIPERL_EXE) \$(CONFIGPM) FORCE lib/auto/Cwd/Cwd.$dlext @echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all !GROK!THIS! @@ -998,10 +991,6 @@ lib/re.pm: ext/re/re.pm @-rm -f $@ cp ext/re/re.pm lib/re.pm -$(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext) - @-rm -f $@ - $(MINIPERL) $@.PL - x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL cd x2p; $(LDLIBPTH) $(MAKE) s2p @@ -1530,7 +1519,7 @@ noknack: utilities nokfilenack: utilities $(RUN_PERL) -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok -A -.PHONY: clist hlist shlist pllist +.PHONY: clist hlist shlist clist: $(c) echo $(c) | tr ' ' $(TRNL) >.clist @@ -1541,9 +1530,6 @@ hlist: $(h) shlist: $(sh) echo $(sh) | tr ' ' $(TRNL) >.shlist -pllist: $(pl) - echo $(pl) | tr ' ' $(TRNL) >.pllist - Makefile: Makefile.SH ./config.sh $(SHELL) Makefile.SH |