From 3eaf69502c5993865935106db7a5beaf16b1819d Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Sun, 28 Nov 2010 15:52:58 +0000
Subject: 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.
---
 Makefile.SH | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile.SH')

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)
-- 
cgit v1.2.1