This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Proper Makefile dependencies for the x2p/s2p rule.
authorNicholas Clark <nick@ccl4.org>
Sun, 28 Nov 2010 15:52:58 +0000 (15:52 +0000)
committerNicholas Clark <nick@ccl4.org>
Sun, 28 Nov 2010 15:52:58 +0000 (15:52 +0000)
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.

Makefile.SH

index f468062..557f4f8 100755 (executable)
@@ -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)