diff options
| author | Nicholas Clark <nick@ccl4.org> | 2010-11-28 15:52:58 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2010-11-28 15:52:58 +0000 |
| commit | 3eaf69502c5993865935106db7a5beaf16b1819d (patch) | |
| tree | d430d037560780d166b53ef1f5129606460f53d6 /Makefile.SH | |
| parent | 014530329eda6c695780760ec2c4307a3c39c523 (diff) | |
| download | perl-3eaf69502c5993865935106db7a5beaf16b1819d.tar.gz | |
Proper Makefile dependencies for the x2p/s2p rule.
Without this, a parallel make for a static build can fail, as x2p/Makefile
uses ../perl for a static build, but there was no rule to ensure that ../perl
was built.
A static build currently still fails some tests, I think because Encode doesn't
link all encodings staticly.
Diffstat (limited to 'Makefile.SH')
| -rwxr-xr-x | Makefile.SH | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.SH b/Makefile.SH index f4680625de..557f4f864a 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -581,6 +581,9 @@ $spitshell >>$Makefile <<!GROK!THIS! translators: $x2p_deps @echo " "; echo " Making x2p stuff"; cd x2p; \$(LDLIBPTH) \$(MAKE) all +x2p/s2p: $x2p_deps + cd x2p; \$(LDLIBPTH) \$(MAKE) s2p + utilities: $util_deps @echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all @@ -1005,9 +1008,6 @@ lib/re.pm: ext/re/re.pm @-rm -f $@ cp ext/re/re.pm lib/re.pm -x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL - cd x2p; $(LDLIBPTH) $(MAKE) s2p - unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) |