addedbyconf = UU $(shextract) $(plextract) lib/lib.pm pstruct
+# Unicode data files generated by mktables
+unidatafiles = lib/unicore/Canonical.pl lib/unicore/Exact.pl \
+ lib/unicore/Properties lib/unicore/Decomposition.pl \
+ lib/unicore/CombiningClass.pl lib/unicore/Name.pl lib/unicore/PVA.pl
+
+# Directories of Unicode data files generated by mktables
+unidatadirs = lib/unicore/To lib/unicore/lib
+
h1 = EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h dosish.h
h2 = embed.h form.h gv.h handy.h hv.h keywords.h mg.h op.h opcode.h
h3 = pad.h patchlevel.h perl.h perlapi.h perly.h pp.h proto.h regcomp.h
.c.s:
$(CCCMDSRC) -S $*.c
-all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
+all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
@echo " ";
@echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
@-rm -f $@
$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL
+$(unidatafiles): miniperl$(EXE_EXT) lib/Config.pm lib/unicore/mktables
+ cd lib/unicore && ../../miniperl -I../../lib mktables
+
extra.pods: miniperl$(EXE_EXT)
-@test -f extra.pods && rm -f `cat extra.pods`
-@rm -f extra.pods
rm -rf $(addedbyconf)
rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
rm -f $(private) lib/Config.pod
+ rm -rf $(unidatafiles) $(unidatadirs)
rm -rf lib/auto
rm -f lib/.exists lib/*/.exists lib/*/*/.exists
rm -f h2ph.man pstruct
# is crashing.
minitest: miniperl$(EXE_EXT) lib/re.pm
-@test -f lib/lib.pm && test -f lib/Config.pm || \
- $(MAKE) lib/Config.pm lib/lib.pm
+ $(MAKE) lib/Config.pm lib/lib.pm $(unidatafiles)
@echo " "
@echo "You may see some irrelevant test failures if you have been unable"
- @echo "to build lib/Config.pm or lib/lib.pm."
+ @echo "to build lib/Config.pm, lib/lib.pm or the Unicode data files."
@echo " "
- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
&& $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty