From b2ea5504bc1c979f786a4ed121f76dd933fff2d0 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 23 Aug 2012 10:20:37 +0000 Subject: * common.mk (win32/*): macro RUBY_H_INCLUDES is not defined there, so need to move denendency rules under the definition of it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ common.mk | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8133654776..6bb07bb370 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 23 19:18:33 2012 NAKAMURA Usaku + + * common.mk (win32/*): macro RUBY_H_INCLUDES is not defined there, + so need to move denendency rules under the definition of it. + Thu Aug 23 19:16:20 2012 NAKAMURA Usaku * win32/Makefile.sub: refactoring. remove unused rules, and update diff --git a/common.mk b/common.mk index daa2371f1a..601b0dd201 100644 --- a/common.mk +++ b/common.mk @@ -607,9 +607,6 @@ $(PLATFORM_D): $(Q) $(MAKEDIRS) $(PLATFORM_DIR) @exit > $@ -win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c $(RUBY_H_INCLUDES) $(PLATFORM_D) -win32/file.$(OBJEXT): {$(VPATH)}win32/file.c $(RUBY_H_INCLUDES) $(PLATFORM_D) - ### RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \ @@ -811,6 +808,9 @@ unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regint.h \ utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \ {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES) +win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c $(RUBY_H_INCLUDES) $(PLATFORM_D) +win32/file.$(OBJEXT): {$(VPATH)}win32/file.c $(RUBY_H_INCLUDES) $(PLATFORM_D) + $(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb $(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH)}defines.h \ -- cgit v1.2.3