diff options
| -rw-r--r-- | common.mk | 26 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | win32/setup.mak | 1 |
3 files changed, 17 insertions, 11 deletions
@@ -913,14 +913,19 @@ INSNS2VMOPT = --srcdir="$(srcdir)" {$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl -srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c srcs-ext srcs-enc +srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c \ + srcs-lib srcs-ext srcs-enc EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c \ $(srcdir)/ext/dl/callback/callback.c $(srcdir)/ext/rbconfig/sizeof/sizes.c srcs-ext: $(EXT_SRCS) -srcs-enc: $(ENC_MK) lib/unicode_normalize/tables.rb +LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb + +srcs-lib: $(LIB_SRCS) + +srcs-enc: $(ENC_MK) $(ECHO) making srcs under enc $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs @@ -1075,9 +1080,7 @@ dist: up:: -$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)" -after-update:: after-configure update-gems - -after-configure:: update-unicode +after-update:: update-unicode update-gems update-config_files: PHONY $(Q) $(BASERUBY) -C "$(srcdir)/tool" \ @@ -1095,16 +1098,21 @@ update-gems: PHONY # ALWAYS_UPDATE_UNICODE = yes -update-unicode: PHONY +UNICODE_FILES = $(srcdir)/enc/unicode/data/UnicodeData.txt \ + $(srcdir)/enc/unicode/data/CompositionExclusions.txt \ + $(srcdir)/enc/unicode/data/NormalizationTest.txt + +update-unicode: $(UNICODE_FILES) PHONY + +$(UNICODE_FILES): $(ECHO) Downloading Unicode data files... $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data" $(Q) $(BASERUBY) -C "$(srcdir)/enc/unicode/data" \ ../../../tool/downloader.rb -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ UnicodeData.txt CompositionExclusions.txt NormalizationTest.txt -lib/unicode_normalize/tables.rb: $(srcdir)/tool/unicode_norm_gen.rb \ - $(srcdir)/enc/unicode/data/UnicodeData.txt \ - $(srcdir)/enc/unicode/data/CompositionExclusions.txt +$(srcdir)/lib/unicode_normalize/tables.rb: \ + $(srcdir)/tool/unicode_norm_gen.rb $(UNICODE_FILES) $(BASERUBY) -s -C "$(srcdir)" tool/unicode_norm_gen.rb \ -input=enc/unicode/data -ouput=lib/unicode_normalize diff --git a/configure.in b/configure.in index d153523101..3a0d9971cb 100644 --- a/configure.in +++ b/configure.in @@ -4231,5 +4231,4 @@ AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in, AC_OUTPUT } -${MAKE-make} after-configure } diff --git a/win32/setup.mak b/win32/setup.mak index c6bacbf337..840d3e6a68 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -218,5 +218,4 @@ $(CPU) = $(PROCESSOR_LEVEL) $(BANG)include $$(srcdir)/win32/Makefile.sub << @$(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat config.h config.status - @$(MAKE) -l after-configure @echo "type `nmake' to make ruby." |