diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | common.mk | 5 |
3 files changed, 9 insertions, 4 deletions
@@ -1,4 +1,7 @@ -Fri Nov 16 17:30:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Nov 16 17:56:47 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in (incs): probes.h is a platform dependent file, so it + cannot be a part of prereq target. move it to all-incs. * configure.in (DTRACE): move after AC_PROG_CC since cross_compiling is set in it. diff --git a/Makefile.in b/Makefile.in index e3a1ff5d03..1af569b80c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -264,7 +264,8 @@ reconfig config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in \ $(srcdir)/configure: $(srcdir)/configure.in $(CHDIR) $(srcdir) && exec $(AUTOCONF) -incs: id.h probes.h +incs: id.h +all-incs: probes.h # Things which should be considered: # * with gperf v.s. without gperf @@ -170,7 +170,7 @@ showconfig: exts: build-ext EXTS_MK = exts.mk -$(EXTS_MK): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) +$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY) $(ECHO) generating makefile $@ $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure @@ -179,7 +179,7 @@ configure-ext: $(EXTS_MK) build-ext: $(EXTS_MK) $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) $(EXTSTATIC) LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)" -$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) +$(MKMAIN_CMD): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY) $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS) prog: program wprogram @@ -844,6 +844,7 @@ srcs-enc: $(ENC_MK) $(ECHO) making srcs under enc $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs +all-incs: incs incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \ $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h {$(VPATH)}id.h |