From cab6d2daddc7c4648c81a591611b7967fb4b9cbf Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 16 Feb 2004 09:39:48 +0000 Subject: * win32/Makefile.sub (config.status): should create *.pdb on ext/, not .ext/. * win32/Makefile.sub (config.status): convert the name of import library. * lib/mkmf.rb (create_makefile): now don't need to remove $(TARGET).lib. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++++++++ lib/mkmf.rb | 1 - win32/Makefile.sub | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4d12fc85e..9961ed1b0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Mon Feb 16 18:35:58 2004 NAKAMURA Usaku + + * win32/Makefile.sub (config.status): should create *.pdb on ext/, + not .ext/. + + * win32/Makefile.sub (config.status): convert the name of import + library. + + * lib/mkmf.rb (create_makefile): now don't need to remove + $(TARGET).lib. + Mon Feb 16 15:45:22 2004 Nobuyoshi Nakada * configure.in: check functions, fork spawnv. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6272368140..c117741ee1 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -965,7 +965,6 @@ site-install-rb: install-rb mfile.print "$(RUBYARCHDIR)/" if $extout mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n\t" mfile.print "@-$(RM) $@\n\t" - mfile.print "@-$(RM) $(TARGET).lib\n\t" if $mswin mfile.print "@-$(MAKEDIRS) $(@D)\n\t" mfile.print LINK_SO, "\n\n" mfile.print "$(STATIC_LIB): $(OBJS)\n\t" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ba245e7939..4454d5a6dc 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -369,7 +369,7 @@ s,@EXEEXT@,.exe,;t t s,@OBJEXT@,obj,;t t s,@XCFLAGS@,$(XCFLAGS),;t t s,@XLDFLAGS@,$(XLDFLAGS),;t t -s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH) -def:$$(DEFFILE) -implib:$$(*F:.so=).lib,;t t +s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH) -def:$$(DEFFILE) -implib:$$(*F:.so=)-$$(arch).lib -pdb:$$(*F:.so=)-$$(arch).pdb,;t t s,@ARCH_FLAG@,$(ARCH_FLAG),;t t s,@STATIC@,$(STATIC),;t t s,@CCDLFLAGS@,,;t t -- cgit v1.2.3