diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 4 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 | ||||
| -rw-r--r-- | wince/Makefile.sub | 4 |
6 files changed, 23 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Wed Apr 7 10:43:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in, common.mk, */Makefile.sub (ext/extinit.o): OUTFLAG + doesn't work for object files on VC. + + * */Makefile.sub (config.h): need SIZEOF_TIME_T now. + Wed Apr 7 00:24:34 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * lib/rinda/rinda.rb: fix hash tuple bug. @@ -9,7 +16,7 @@ Wed Apr 7 00:24:34 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> Tue Apr 6 16:46:09 2004 Tanaka Akira <akr@m17n.org> * configure.in: check the size of time_t. - + * time.c (time_add): new function. (time_plus): use time_add. (time_minus): use time_add. diff --git a/Makefile.in b/Makefile.in index 1632a3ac22..f722bc7926 100644 --- a/Makefile.in +++ b/Makefile.in @@ -136,8 +136,6 @@ fake.rb: Makefile Makefile: $(srcdir)/Makefile.in -PHONY: - $(MKFILES): config.status $(srcdir)/common.mk MAKE=$(MAKE) $(SHELL) ./config.status @{ \ @@ -172,3 +170,6 @@ clean-local:: distclean-local:: @$(RM) ext/config.cache $(RBCONFIG) + +ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 7f8ac6059f..ca31fb5d66 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -215,6 +215,7 @@ config.h: \#define SIZEOF_VOIDP 4 \#define SIZEOF_FLOAT 4 \#define SIZEOF_DOUBLE 8 +\#define SIZEOF_TIME_T 4 \#define HAVE_PROTOTYPES 1 \#define TOKEN_PASTE(x,y) x\#\#y \#define HAVE_STDARG_PROTOTYPES 1 @@ -420,6 +421,9 @@ distclean-local:: @$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc +ext/extinit.obj: ext/extinit.c $(SETUP) + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c + main.$(OBJEXT): win32.h ascii.$(OBJEXT): win32.h array.$(OBJEXT): win32.h @@ -140,8 +140,6 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) PHONY: {$(VPATH)}parse.c: parse.y -ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c acosh.$(OBJEXT): {$(VPATH)}acosh.c alloca.$(OBJEXT): {$(VPATH)}alloca.c diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 6b6a17e9f8..a6db146c94 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -198,6 +198,7 @@ config.h: #define SIZEOF_VOIDP 4 #define SIZEOF_FLOAT 4 #define SIZEOF_DOUBLE 8 +#define SIZEOF_TIME_T 4 #define HAVE_PROTOTYPES 1 #define TOKEN_PASTE(x,y) x##y #define HAVE_STDARG_PROTOTYPES 1 @@ -443,3 +444,6 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(OBJS): {$(srcdir)}win32/win32.h dir.$(OBJEXT): {$(srcdir)}win32/dir.h + +ext/extinit.obj: ext/extinit.c $(SETUP) + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fo$@ -c ext/extinit.c diff --git a/wince/Makefile.sub b/wince/Makefile.sub index 88ea02d68e..34a8446950 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -207,6 +207,7 @@ config.h: #define SIZEOF_VOIDP 4 #define SIZEOF_FLOAT 4 #define SIZEOF_DOUBLE 8 +#define SIZEOF_TIME_T 4 #define HAVE_PROTOTYPES 1 #define TOKEN_PASTE(x,y) x##y #define HAVE_STDARG_PROTOTYPES 1 @@ -482,3 +483,6 @@ end $(OBJS): {$(srcdir)}win32/win32.h dir.$(OBJEXT): {$(srcdir)}win32/dir.h + +ext/extinit.obj: ext/extinit.c $(SETUP) + $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fo$@ -c ext/extinit.c |