[前][次][番号順一覧][スレッド一覧]

ruby-changes:25621

From: nobu <ko1@a...>
Date: Fri, 16 Nov 2012 17:56:58 +0900 (JST)
Subject: [ruby-changes:25621] nobu:r37678 (trunk): Makefile.in: move probes.h to all-incs

nobu	2012-11-16 17:56:49 +0900 (Fri, 16 Nov 2012)

  New Revision: 37678

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

  Log:
    Makefile.in: move probes.h to all-incs
    
    * Makefile.in (incs): probes.h is a platform dependent file, so it
      cannot be a part of prereq target.  move it to all-incs.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37677)
+++ ChangeLog	(revision 37678)
@@ -1,5 +1,8 @@
-Fri Nov 16 17:30:50 2012  Nobuyoshi Nakada  <nobu@r...>
+Fri Nov 16 17:56:47 2012  Nobuyoshi Nakada  <nobu@r...>
 
+	* 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.
 
Index: common.mk
===================================================================
--- common.mk	(revision 37677)
+++ common.mk	(revision 37678)
@@ -170,7 +170,7 @@
 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 @@
 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 @@
 	$(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
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 37677)
+++ Makefile.in	(revision 37678)
@@ -264,7 +264,8 @@
 $(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

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

[前][次][番号順一覧][スレッド一覧]