diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-07-28 09:26:53 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-07-28 09:26:53 +0000 |
commit | 16adedaa6d6ceb8e3f21e33dc6653aed3ffa6932 (patch) | |
tree | d1c104d8b5e197b22830a2c37f84327de76586b3 /win32 | |
parent | 7dcd244615f172994ca4af37108af7ff744d0998 (diff) |
990728
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile | 50 | ||||
-rw-r--r-- | win32/config.status | 36 |
2 files changed, 54 insertions, 32 deletions
diff --git a/win32/Makefile b/win32/Makefile index 6fc60bb164..4bf3d9be5a 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -7,25 +7,26 @@ VPATH = .:./missing CC = cl YACC = byacc -RANLIB = -AR = -INSTALL = ginstall -c -INSTALL_PROGRAM = $(INSTALL) -INSTALL_DATA = $(INSTALL) -m 644 PURIFY = +AUTOCONF = autoconf +prefix = CFLAGS = -nologo -DNT=1 -Ox -I. -I./missing -LDFLAGS = $(CFLAGS) -Fm -#CFLAGS = -nologo -DNT=1 -Zi -MD -#LDFLAGS = $(CFLAGS) -Fm -MD -LIBS = advapi32.lib wsock32.lib +LDFLAGS = $(CFLAGS) -Fm +#CFLAGS = -nologo -DNT=1 -Zi -MD +#LDFLAGS = $(CFLAGS) -Fm -MD +XLDFLAGS = +EXTLIBS = +LIBS = advapi32.lib wsock32.lib $(EXTLIBS) MISSING = crypt.obj alloca.obj win32.obj fnmatch.obj isinf.obj isnan.obj +LDSHARED = +DLDFLAGS = +SOLIBS = -prefix = RUBY_INSTALL_NAME=ruby -binsuffix = .exe -PROGRAM=$(RUBY_INSTALL_NAME)$(binsuffix) +EXEEXT = .exe +PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) STACK = 0x200000 ORGLIBPATH = $(LIB) @@ -77,14 +78,14 @@ OBJS = array.obj \ version.obj \ $(MISSING) -all: miniruby$(binsuffix) rbconfig.rb ext/Setup $(MISCLIBS) +all: miniruby$(EXEEXT) rbconfig.rb ext/Setup $(MISCLIBS) set LIB=..\..\win32;$(ORGLIBPATH) - @.\miniruby$(binsuffix) -Xext extmk.rb static + @.\miniruby$(EXEEXT) -Xext extmk.rb static -miniruby$(binsuffix): $(OBJS) $(MAINOBJ) $(EXTOBJS) +miniruby$(EXEEXT): $(OBJS) $(MAINOBJ) $(EXTOBJS) @echo $(EXTOBJS) @echo $(LIBS) - @rm -f miniruby$(binsuffix) + @rm -f miniruby$(EXEEXT) $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(OBJS) $(LIBS) -o $@ $(PROGRAM): $(LIBRUBY) $(MAINOBJ) rubymw.dll @@ -101,27 +102,28 @@ $(LIBRUBY): $(OBJS) lib /OUT:$(LIBRUBY) $(OBJS) install: rbconfig.rb - ./miniruby.exe $(srcdir)/instruby.rb $(DESTDIR) + .\miniruby.exe $(srcdir)/instruby.rb $(DESTDIR) clean:; @rm -f $(OBJS) $(LIBRUBY) rbconfig.rb - @rm -f ext/extinit.c ext/extinit.obj *.obj - @.\miniruby$(binsuffix) -Xext extmk.rb clean 2> nul || true + @rm -f ext/extinit.c ext/extinit.obj ext/vc*.pdb *.obj + @.\miniruby$(EXEEXT) -Xext extmk.rb clean distclean: clean @rm -f Makefile ext/extmk.rb config.h @rm -f ext/config.cache config.cache config.log config.status @rm -f *~ core *.core gmon.out y.tab.c y.output ruby.imp - @rm -f $(PROGRAM) miniruby$(binsuffix) + @rm -f *.map rubymw.* ruby.def + @rm -f $(PROGRAM) miniruby$(EXEEXT) realclean: distclean @rm -f parse.c @rm -f lex.c -test: miniruby$(binsuffix) - @.\miniruby$(binsuffix) $(srcdir)/rubytest.rb +test: miniruby$(EXEEXT) + @.\miniruby$(EXEEXT) $(srcdir)/rubytest.rb -rbconfig.rb: miniruby$(binsuffix) - @.\miniruby$(binsuffix) $(srcdir)/mkconfig.rb rbconfig.rb +rbconfig.rb: miniruby$(EXEEXT) + @.\miniruby$(EXEEXT) $(srcdir)/mkconfig.rb rbconfig.rb config.status: $(srcdir)/configure # $(SHELL) ./config.status --recheck diff --git a/win32/config.status b/win32/config.status index 3c5adfe823..66af519615 100644 --- a/win32/config.status +++ b/win32/config.status @@ -1,8 +1,12 @@ -s%@CFLAGS@% -O%g +ac_given_srcdir=. +ac_given_INSTALL="ginstall -c" +s%@SHELL@%%g +s%@CFLAGS@%-nologo -DNT=1 -Ox%g s%@CPPFLAGS@%%g s%@CXXFLAGS@%%g +s%@FFLAGS@%%g s%@DEFS@% - -DUSE_THREAD -DSIZEOF_INT=4 -DSIZEOF_SHORT=2 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DSIZEOF_FLOAT= 4 -DSIZEOF_DOUBLE 8 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_STDLIB_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=int -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -DHAVE_FMOD=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_CHSIZE=1 -DHAVE_GETGROUPS=1 -DHAVE_GETLOGIN=1 RSHIFT\(x,y\)\ \(\(x\)\>\>y\) FILE_COUNT _cnt DLEXT \".dll\" RUBY_LIB \";/usr/local/lib/ruby;.\" RUBY_ARCHLIB \"/usr/local/lib/ruby/i386-mswin32\" RUBY_PLATFORM \"i386-mswin32\" %g + -DUSE_THREAD -DSIZEOF_INT=4 -DSIZEOF_SHORT=2 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DSIZEOF_FLOAT=4 -DSIZEOF_DOUBLE=8 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_STDLIB_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=int -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -DHAVE_FMOD=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_CHSIZE=1 -DHAVE_GETGROUPS=1 -DHAVE_GETLOGIN=1 -DRSHIFT=\(x,y\)\ \(\(x\)\>\>y\) -DFILE_COUNT=_cnt -DDLEXT=\".dll\" -DRUBY_LIB=\";/usr/local/lib/ruby;.\" -DRUBY_ARCHLIB=\"/usr/local/lib/ruby/i386-mswin32\" -DRUBY_PLATFORM=\"i386-mswin32\" %g s%@LDFLAGS@%%g s%@LIBS@%advapi32.lib wsock32.lib%g s%@exec_prefix@%${prefix}%g @@ -24,29 +28,45 @@ s%@host@%i386-pc-mswin32%g s%@host_alias@%i386-mswin32%g s%@host_cpu@%i386%g s%@host_vendor@%pc%g -s%@host_os@%i386-mswin32%g +s%@host_os@%mswin32%g s%@CC@%cl%g s%@CPP@%cl -E%g -s%@YACC@%bison -y%g -s%@RANLIB@%ranlib%g +s%@YACC@%byacc%g +s%@RANLIB@%%g s%@AR@%lib%g s%@INSTALL_PROGRAM@%${INSTALL}%g +s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g s%@INSTALL_DATA@%${INSTALL} -m 644%g +s%@INSTALL_DLLIB@%${INSTALL} -m 555%g +s%@LN_S@%%g s%@SET_MAKE@%%g s%@LIBOBJS@% crypt.obj alloca.obj win32.obj fnmatch.obj isinf.obj isnan.obj%g s%@ALLOCA@%%g +s%@DEFAULT_KCODE@%%g +s%@EXEEXT@%.exe%g +s%@OBJEXT@%obj%g +s%@XLDFLAGS@%%g s%@DLDFLAGS@%%g s%@STATIC@%%g s%@CCDLFLAGS@%%g -s%@LDSHARED@%ld%g +s%@LDSHARED@%cl -LD%g s%@DLEXT@%dll%g s%@STRIP@%%g s%@EXTSTATIC@%%g s%@binsuffix@%.exe%g s%@setup@%Setup%g +s%@LIBRUBY_LDSHARED@%%g +s%@LIBRUBY_DLDFLAGS@%%g +s%@RUBY_INSTALL_NAME@%ruby%g +s%@LIBRUBY_A@%lib$(RUBY_INSTALL_NAME).lib%g +s%@LIBRUBY_SO@%%g +s%@LIBRUBY_ALIASES@%%g s%@LIBRUBY@%libruby.lib%g s%@LIBRUBYARG@%libruby.lib%g s%@SOLIBS@%%g -s%@srcdir%.%g s%@arch@%i386-mswin32%g -ac_given_srcdir=. +s%@configure_args@%%g +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +s%@INSTALL@%$INSTALL%g |