diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-23 05:32:01 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-23 05:32:01 +0000 |
| commit | 52a67fe60d08eb982586695b8bd6b1ceb32b30da (patch) | |
| tree | f646169c2368463a264425eae104519995a29a98 /win32 | |
| parent | 69d80a31202da7ab038f3ced858fc064e75d43f6 (diff) | |
* Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local):
separate files under directories due to directory separator.
* */Makefile.sub (MKFILES): common.mk and */Makefile.sub should not be
removed.
* win32/Makefile.sub, wince/Makefile.sub: $* cannot appear in explicit
rules.
* cygwin/GNUmakefile.in: some mingw stuffs were missed.
* lib/mkmf.rb (create_makefile): Borland make wrongly removes braces
from command lines.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 26 | ||||
| -rwxr-xr-x | win32/rm.bat | 4 |
2 files changed, 17 insertions, 13 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 198f8e81d6..f8d0d51f0d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1,7 +1,7 @@ # -*- makefile -*- SHELL = $(COMSPEC) -MKFILES = Makefile $(srcdir)/win32/Makefile.sub $(srcdir)/common.mk +MKFILES = Makefile NULL = nul #### Start of system configuration section. #### @@ -171,7 +171,7 @@ DLDOBJS = WINMAINOBJ = winmain.$(OBJEXT) -all: +all: $(srcdir)/win32/Makefile.sub $(srcdir)/common.mk !include $(srcdir)/common.mk @@ -271,10 +271,11 @@ config.h: #define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)" <<KEEP -config.status: $(MKFILES) +config.status: $(MKFILES) $(srcdir)/win32/Makefile.sub $(srcdir)/common.mk @echo Creating <<$@ # Generated automatically by Makefile.sub. s,@SHELL@,$$(COMSPEC),;t t +s,@PATH_SEPARATOR@,;,;t t s,@CFLAGS@,$(CFLAGS),;t t s,@CPPFLAGS@,$(CPPFLAGS),;t t s,@CXXFLAGS@,$(CXXFLAGS),;t t @@ -366,6 +367,7 @@ s,@TRY_LINK@,$$(CC) -Feconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS s,@COMMON_LIBS@,m,;t t s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN;t t s,@COMMON_HEADERS@,winsock2.h windows.h,;t t +s,@DISTCLEANFILES@,vc*.pdb,;t t s,@EXPORT_PREFIX@, ,;t t s,@arch@,$(ARCH)-$(OS),;t t s,@sitearch@,$(ARCH)-$(RT),;t t @@ -380,13 +382,14 @@ miniruby$(EXEEXT): @echo. $(LIBS) $(PURIFY) $(CC) $(MAINOBJ) $(LIBRUBY_A) $(LIBS) -Fe$@ $(LDFLAGS) -$(PROGRAM): $*.res - $(PURIFY) $(CC) $(MAINOBJ) $*.res \ +$(PROGRAM): $(RUBY_INSTALL_NAME).res + $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \ $(OUTFLAG)$@ $(LIBRUBYARG) $(LDFLAGS) $(XLDFLAGS) -$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $*.res - $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) $*.res \ - $(OUTFLAG)$@ $(LIBRUBYARG) $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows +$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res + $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \ + $(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \ + $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows $(LIBRUBY_A): $(OBJS) $(DMYEXT) $(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT) @@ -394,10 +397,11 @@ $(LIBRUBY_A): $(OBJS) $(DMYEXT) $(LIBRUBY): $(RUBYDEF) $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF) -$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $*.res +$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res @echo. $(DLDOBJS) - $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $*.res $(LIBS) \ - -Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS) + $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \ + $(RUBY_SO_NAME).res $(LIBS) -Fe$@ $(LDFLAGS) \ + $(LIBRUBY_DLDFLAGS) $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) diff --git a/win32/rm.bat b/win32/rm.bat index ee18ea6946..c7307617ee 100755 --- a/win32/rm.bat +++ b/win32/rm.bat @@ -1,9 +1,9 @@ @echo off
-::: $Id$
+::: $Id: rm.bat,v 1.1 2004/03/21 23:21:30 nobu Exp $
if "%1" == "-f" shift
:begin
if "%1" == "" goto :end
-if exist %1 del %1
+if exist "%1" del "%1"
shift
goto :begin
:end
|