ruby-changes:17511
From: nobu <ko1@a...>
Date: Sat, 16 Oct 2010 10:58:14 +0900 (JST)
Subject: [ruby-changes:17511] Ruby:r29516 (trunk): * Makefile.in (CPP): already used in .c.i rule.
nobu 2010-10-16 10:55:01 +0900 (Sat, 16 Oct 2010) New Revision: 29516 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29516 Log: * Makefile.in (CPP): already used in .c.i rule. * cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and --preprocessor options explicitly. [ruby-core:32776] Modified files: trunk/ChangeLog trunk/Makefile.in trunk/cygwin/GNUmakefile.in Index: ChangeLog =================================================================== --- ChangeLog (revision 29515) +++ ChangeLog (revision 29516) @@ -1,3 +1,10 @@ +Sat Oct 16 10:54:57 2010 Nobuyoshi Nakada <nobu@r...> + + * Makefile.in (CPP): already used in .c.i rule. + + * cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and + --preprocessor options explicitly. [ruby-core:32776] + Sat Oct 16 10:06:08 2010 Nobuyoshi Nakada <nobu@r...> * ext/sdbm/_sdbm.c (SEEDUPS, BADMESS): make settable using command Index: cygwin/GNUmakefile.in =================================================================== --- cygwin/GNUmakefile.in (revision 29515) +++ cygwin/GNUmakefile.in (revision 29516) @@ -2,7 +2,8 @@ -include uncommon.mk ENABLE_SHARED=@ENABLE_SHARED@ -DLLWRAP = @DLLWRAP@ --target=@target_os@ +DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)" +WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED ifeq (@target_os@,cygwin) DLL_BASE_NAME := $(LIBRUBY_SO:.dll=) @@ -38,7 +39,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ %.res.@OBJEXT@: %.rc - @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ + $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ Index: Makefile.in =================================================================== --- Makefile.in (revision 29515) +++ Makefile.in (revision 29516) @@ -11,6 +11,7 @@ hdrdir = $(srcdir)/include CC = @CC@ +CPP = @CPP@ YACC = bison PURIFY = AUTOCONF = autoconf -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/