diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | bcc32/Makefile.sub | 9 | ||||
-rw-r--r-- | win32/Makefile.sub | 5 | ||||
-rw-r--r-- | wince/Makefile.sub | 5 |
4 files changed, 21 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu Dec 20 04:15:41 2007 NAKAMURA Usaku <usa@ruby-lang.org> + + * */Makefile.sub (DEFS, RM): output to config.status. + Thu Dec 20 02:59:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * common.mk (encs): create encoding directory. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 971b62c297..d478719cc9 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -127,6 +127,13 @@ OUTFLAG = -o !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,@SHELL@,$$(COMSPEC),;t t 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,@AR@,$(AR),;t t 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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 276dc4e84c..60e887dbbf 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -156,11 +156,12 @@ LDSHARED = $(LD) -LD 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,@SHELL@,$$(COMSPEC),;t t 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,@AR@,$(AR),;t t 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 diff --git a/wince/Makefile.sub b/wince/Makefile.sub index a7de413f40..8ac4d0220d 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -43,7 +43,7 @@ YFLAGS = -o y.tab.c 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 @@ CPPFLAGS = $(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$(SUBSYSVERSION:.=) \ -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,@SHELL@,$$(COMSPEC),;t t 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,@AR@,$(AR),;t t 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 |