From 44a7c87076068d098b9bc11f70a1989f2cfdacc1 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 23 Aug 2012 10:18:23 +0000 Subject: [PATCH] * win32/Makefile.sub: refactoring. remove unused rules, and update some rules which are not used usually to fit current macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/Makefile.sub | 14 ++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e95625b550..8133654776 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 23 19:16:20 2012 NAKAMURA Usaku + + * win32/Makefile.sub: refactoring. remove unused rules, and update + some rules which are not used usually to fit current macros. + Thu Aug 23 16:46:10 2012 Nobuyoshi Nakada * file.c (rb_find_file_ext_safe, rb_find_file_safe): default to diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c0cdfa9fb7..13e6471f4b 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1006,15 +1006,9 @@ $(ruby_pc): $(RBCONFIG) {$(srcdir)/missing}.c.obj: $(ECHO) compiling $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) -{$(srcdir)/win32}.c.obj: - $(ECHO) compiling $(<:\=/) - $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(win_srcdir)}.c.obj: $(ECHO) compiling $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) -{$(win_srcdir)/sys}.c.obj: - $(ECHO) compiling $(<:\=/) - $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(srcdir)}.c{}.obj: $(ECHO) compiling $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) @@ -1025,10 +1019,10 @@ $(ruby_pc): $(RBCONFIG) {$(srcdir)/missing}.c.asm: $(ECHO) translating $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) -{$(srcdir)/win32}.c.asm: +{$(win_srcdir)}.c.asm: $(ECHO) translating $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) -{$(srcdir)}.c.asm: +{$(srcdir)}.c{}.asm: $(ECHO) translating $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) .c.asm: @@ -1038,10 +1032,10 @@ $(ruby_pc): $(RBCONFIG) {$(srcdir)/missing}.c.i: $(ECHO) preprocessing $(<:\=/) $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) > $@ -{$(srcdir)/win32}.c.i: +{$(win_srcdir)}.c.i: $(ECHO) preprocessing $(<:\=/) $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) -{$(srcdir)}.c.i: +{$(srcdir)}.c{}.i: $(ECHO) preprocessing $(<:\=/) $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) .c.i: