usa	2007-12-20 04:16:32 +0900 (Thu, 20 Dec 2007)

  New Revision: 14346

  Modified files:
    trunk/ChangeLog
    trunk/bcc32/Makefile.sub
    trunk/win32/Makefile.sub
    trunk/wince/Makefile.sub

  Log:
    * */Makefile.sub (DEFS, RM): output to config.status.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/wince/Makefile.sub?r1=14346&r2=14345
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14346&r2=14345
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=14346&r2=14345
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=14346&r2=14345

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14345)
+++ ChangeLog	(revision 14346)
@@ -1,3 +1,7 @@
+Thu Dec 20 04:15:41 2007  NAKAMURA Usaku  <usa@r...>
+
+	* */Makefile.sub (DEFS, RM): output to config.status.
+
 Thu Dec 20 02:59:05 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* common.mk (encs): create encoding directory.
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 14345)
+++ win32/Makefile.sub	(revision 14346)
@@ -156,11 +156,12 @@
 XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
 !if $(MSC_VER) >= 1400
 # Prevents VC++ 2005 (cl ver 14) warnings
-CPPFLAGS = $(CPPFLAGS) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+DEFS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 MANIFESTTOOL = mt -nologo
 LDSHARED_1 = $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2
 LDSHARED_2 = @$(RM) $(@:/=\).manifest
 !endif
+CPPFLAGS = $(DEFS) $(CPPFLAGS)
 
 DLDFLAGS = $(LDFLAGS) -dll
 SOLIBS = 
@@ -379,6 +380,7 @@
 s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
+s,@DEFS@,$(DEFS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
 s,@FFLAGS@,$(FFLAGS),;t t
@@ -424,6 +426,7 @@
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@RM@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcpy.obj strlcat.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub	(revision 14345)
+++ bcc32/Makefile.sub	(revision 14346)
@@ -127,6 +127,13 @@
 !ifndef CFLAGS
 CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
 !endif
+!ifndef DEFS
+DEFS =
+!endif
+!ifndef CPPFLAGS
+CPPFLAGS =
+!endif
+CPPFLAGS = $(DEFS) $(CPPFLAGS)
 !ifndef CXXFLAGS
 CXXFLAGS = $(CFLAGS)
 !endif
@@ -332,6 +339,7 @@
 s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
+s,@DEFS@,$(DEFS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
 s,@FFLAGS@,$(FFLAGS),;t t
@@ -377,6 +385,7 @@
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
Index: wince/Makefile.sub
===================================================================
--- wince/Makefile.sub	(revision 14345)
+++ wince/Makefile.sub	(revision 14346)
@@ -43,7 +43,7 @@
 AR = lib -nologo
 PURIFY =
 AUTOCONF = autoconf
-RM = $(srcdir)\win32\rm.bat
+RM = $(srcdir:/=\)\win32\rm.bat
 CP = copy > nul
 MV = ren > nul
 !if !defined(BASERUBY)
@@ -117,6 +117,7 @@
            -DFILENAME_MAX=MAX_PATH -DTLS_OUT_OF_INDEXES=0xFFFFFFFF \
            -DBUFSIZ=512 -D_UNICODE -DUNICODE
 !endif
+CPPFLAGS = $(DEFS) $(CPPFLAGS)
 !if !defined(CXXFLAGS)
 CXXFLAGS = $(CFLAGS)
 !endif
@@ -333,6 +334,7 @@
 s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
+s,@DEFS@,$(DEFS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
 s,@FFLAGS@,$(FFLAGS),;t t
@@ -378,6 +380,7 @@
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj isinf.obj isnan.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t

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