diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
4 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Aug 7 14:16:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb, {bcc32,win32}/Makefile.sub (CLEANLIBS, CLEANOBJS): + moved clean targets to platfrom makefiles. + Thu Aug 7 13:12:30 2008 NAKAMURA Usaku <usa@ruby-lang.org> * ext/socket/getaddrinfo.c (gai_strerror): ignore only on Haiku. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 31b522eb2..6923e4d9e 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -476,6 +476,8 @@ s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t s,@COMMON_HEADERS@,winsock2.h windows.h,;t t +s,@cleanlibs@,$$*.tds,;t t +s,@cleanobjs@,$$*-$$(arch).def $$*.il? $$*.lib,;t t s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t s,@EXPORT_PREFIX@,_,;t t s,@arch@,$(ARCH)-$(OS),;t t diff --git a/lib/mkmf.rb b/lib/mkmf.rb index b834c104e..df8861a71 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1604,11 +1604,11 @@ STATIC_LIB = #{staticlib unless $static.nil?} " #" # TODO: fixme install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]} - n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET).' + n = ($extout ? '$(RUBYARCHDIR)/' : '') + '$(TARGET)' mfile.print " TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB) -CLEANLIBS = #{n}#{CONFIG['DLEXT']} #{n}il? #{n}tds #{n}map -CLEANOBJS = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.exp *.bak +CLEANLIBS = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}} +CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, '$(TARGET)')}} *.bak all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 413f7c6c1..bb8f6daeb 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -629,12 +629,13 @@ s,@LINK_SO@,@$$(RM) $$(@:/=\).manifest,;t t !endif s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) $$(COUTFLAG)$$(@) -c -Tc$$(<:\=/),;t t s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) $$(COUTFLAG)$$(@) -c -Tp$$(<:\=/),;t t -s,@COMPILE_RULES@,{$$(hdrdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(srcdir)}.%s{}.%s: .%s.%s:,;t t +s,@COMPILE_RULES@,{$$(hdrdir)}.%s.%s: {$$(topdir)}.%s.%s: {$$(srcdir)}.%s.%s: .%s.%s:,;t t s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t s,@TRY_LINK@,$$(CC) -Feconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS) -link $$(LDFLAGS) $$(LIBPATH) $$(XLDFLAGS),;t t s,@COMMON_LIBS@,$(COMMON_LIBS),;t t s,@COMMON_MACROS@,$(COMMON_MACROS),;t t s,@COMMON_HEADERS@,$(COMMON_HEADERS),;t t +s,@cleanobjs@,$$*.exp $$*.lib $$*.pdb,;t t s,@DISTCLEANFILES@,vc*.pdb,;t t s,@EXPORT_PREFIX@, ,;t t s,@arch@,$(ARCH)-$(PLATFORM),;t t |