naruse	2012-11-19 10:04:53 +0900 (Mon, 19 Nov 2012)

  New Revision: 37713

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37713

  Log:
    * Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use.
    
    * common.mk: fix path of probes.dmyh.
    
    * configure.in: FreeBSD's USDT requires libelf.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 37712)
+++ configure.in	(revision 37713)
@@ -1286,6 +1286,10 @@
 		AC_DEFINE(BROKEN_SETREGID, 1)
                 ac_cv_sizeof_rlim_t=8],
 [freebsd*], [	LIBS="-lm $LIBS"
+		if test "${rb_cv_prog_dtrace_g}" = "yes"; then
+			# FreeBSD's dtrace requires libelf
+			LIBS="-lelf $LIBS"
+		fi
 		ac_cv_func_getpeername=no
 		ac_cv_func_getsockname=no
 		ac_cv_func_shutdown=no
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37712)
+++ ChangeLog	(revision 37713)
@@ -1,3 +1,11 @@
+Mon Nov 19 10:00:10 2012  NARUSE, Yui  <naruse@r...>
+
+	* Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use.
+
+	* common.mk: fix path of probes.dmyh.
+
+	* configure.in: FreeBSD's USDT requires libelf.
+
 Mon Nov 19 01:11:59 2012  Naohisa Goto  <ngotogenome@g...>
 
 	* vm_core.h, probes_helper.h (RUBY_DTRACE_FUNC_ENTRY_HOOK,
Index: common.mk
===================================================================
--- common.mk	(revision 37712)
+++ common.mk	(revision 37713)
@@ -435,7 +435,7 @@
 clean-local:: PHONY
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) {$(VPATH)}probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
 clean-ext:: PHONY
 clean-golf: PHONY
 	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
@@ -460,7 +460,7 @@
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
-	$(Q)$(RM) parse.c parse.h lex.c newline.c revision.h probes.dmyh
+	$(Q)$(RM) parse.c parse.h lex.c newline.c revision.h {$(VPATH)}probes.dmyh
 realclean-ext::
 realclean-golf: distclean-golf
 realclean-capi: PHONY
@@ -901,10 +901,10 @@
 	$(ECHO) generating $@
 	$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
 
-$(srcdir)/probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
+{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
 	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
 
-{$(srcdir)}.dmyh.h:
+{$(VPATH)}.dmyh.h:
 	@$(ECHO) copying dummy $(DEST_FILE)
 	$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 37712)
+++ Makefile.in	(revision 37713)
@@ -177,6 +177,8 @@
 configure_args = @configure_args@
 #### End of variables
 
+.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
+
 all:
 
 .DEFAULT: all

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/