From b7ff3d3b6811aaef57bb2d7bcef492aa3b921bd0 Mon Sep 17 00:00:00 2001 From: ngoto Date: Tue, 3 Feb 2015 10:43:27 +0000 Subject: * common.mk (ruby-glommed.o): dependency on $(OBJ) should be written in common.mk (in which OBJ is defined) because of Makefile include and parse order. This partly reverts r49419. [ruby-dev:48849] [Bug #10808] * Makefile.in (ruby-glommed.o): ditto. * Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because it is included in $(OBJS) since r49451. * Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 7a86cd5859..00ac990f4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -382,7 +382,7 @@ enc/jis/props.h: enc/jis/props.kwd @$(ECHO) copying dummy $(DEST_FILE) $(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE) -probes.@OBJEXT@: $(srcdir)/probes.d +probes.@OBJEXT@: $(srcdir)/probes.d $(DTRACE_DEPENDENT_OBJS) @$(ECHO) processing probes in object files $(Q) stamp="$*.stamp"; \ if test -f "$$stamp" -o -f "$@"; then \ @@ -398,9 +398,9 @@ probes.@OBJEXT@: $(srcdir)/probes.d # DTrace static library hacks described here: # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html -ruby-glommed.$(OBJEXT): $(OBJS) $(DTRACE_OBJ) +ruby-glommed.$(OBJEXT): @$(ECHO) generating a glommed object with DTrace probes for static library - $(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ) + $(Q) $(LD) -r -o $@ $(OBJS) clean-local:: $(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \ -- cgit v1.2.3