From: Nicholas Clark <nick@ccl4.org>
Date: Wed, 9 Sep 2009 09:28:57 +0000 (+0100)
Subject: Build the nonxs extensions before running mktables.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3dc3a5970f33d7064ab6c66f35aa3f8f7aa77f54;p=p5sagit%2Fp5-mst-13.2.git

Build the nonxs extensions before running mktables.
---

diff --git a/Makefile.SH b/Makefile.SH
index 40ec66f..1ab2d22 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -978,7 +978,7 @@ lib/lib.pm:	miniperl$(EXE_EXT) $(CONFIGPM)
 
 unidatafiles $(unidatafiles): uni.data
 
-uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables
+uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
 	cd lib/unicore && $(LDLIBPTH) $(RUN) ../../miniperl$(EXE_EXT) -I../../lib mktables -w
 	touch uni.data
 
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index ce3e6b4..2903804 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -554,7 +554,7 @@ $(ARCHDIR)Config_heavy.pl : [.lib]Config_heavy.pl
 $(ARCHDIR)vmspipe.com : vmspipe.com
         Copy $(MMS$SOURCE) $(ARCHDIR)
 
-unidatafiles.ts : $(MINIPERL_EXE) [.lib]Config.pm [.lib.unicore]mktables
+unidatafiles.ts : $(MINIPERL_EXE) [.lib]Config.pm [.lib.unicore]mktables nonxsext
 	$(MINIPERL) [.lib.unicore]mktables "-C" [.lib.unicore] 
 	@ If F$Search("$(MMS$TARGET)").nes."" Then Delete/NoLog/NoConfirm $(MMS$TARGET);*
 	@ Copy/NoConfirm _NLA0: $(MMS$TARGET)
diff --git a/win32/Makefile b/win32/Makefile
index 9b1a057..7c458e1 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1258,7 +1258,7 @@ inst_lib : $(CONFIGPM)
 	$(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
 	$(RCOPY) ..\lib $(INST_LIB)\*.*
 
-$(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables
+$(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
 	cd ..\lib\unicore && \
 	..\$(MINIPERL) -I.. mktables -check $@ $(FIRSTUNIFILE)
 
diff --git a/win32/makefile.mk b/win32/makefile.mk
index ca5fc29..ad3ed95 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1583,7 +1583,7 @@ inst_lib : $(CONFIGPM)
 	$(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
 	$(RCOPY) ..\lib $(INST_LIB)\*.*
 
-$(UNIDATAFILES) .UPDATEALL : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables
+$(UNIDATAFILES) .UPDATEALL : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs
 	cd ..\lib\unicore && \
 	..\$(MINIPERL) -I.. mktables