diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | mkconfig.rb | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rw-r--r-- | wince/Makefile.sub | 2 |
6 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Mon Oct 16 08:30:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * mkconfig.rb: *OBJS are not needed for extension libraries. + + * {bcc32,wince,win32}/Makefile.sub (config.status): fixed typo, + missing comma. + Sun Oct 15 01:03:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 59806abff..7476dc6c2 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -388,7 +388,7 @@ s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),; s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t 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;t t +s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t s,@COMMON_HEADERS@,winsock2.h windows.h,;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 @@ -1,6 +1,6 @@ bin: $(PROGRAM) $(WPROGRAM) -lib: $(LIBRUBY); -dll: $(LIBRUBY_SO); +lib: $(LIBRUBY) +dll: $(LIBRUBY_SO) RUBYOPT = diff --git a/mkconfig.rb b/mkconfig.rb index 7721495f9..e605db7dd 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -41,7 +41,7 @@ File.foreach "config.status" do |line| if /^s([%,])@(\w+)@\1(?:\|\#_!!_\#\|)?(.*)\1/ =~ line name = $2 val = $3.gsub(/\\(?=,)/, '') - next if /^(?:ac_.*|DEFS|configure_input|(?:top_)?srcdir)$/ =~ name + next if /^(?:ac_.*|DEFS|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name next if /^\$\(ac_\w+\)$/ =~ val next if /^\$\{ac_\w+\}$/ =~ val next if /^\$ac_\w+$/ =~ val diff --git a/win32/Makefile.sub b/win32/Makefile.sub index aabc4cc13..e555399b2 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -422,7 +422,7 @@ s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}. s,@RULE_SUBST@,{.;$$(srcdir);$$(topdir);$$(hdrdir)}%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@,m,;t t -s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN;t t +s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t !if defined(USE_WINSOCK2) s,@COMMON_HEADERS@,winsock2.h windows.h,;t t !else diff --git a/wince/Makefile.sub b/wince/Makefile.sub index dafaafbe6..dbcad66c1 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -406,7 +406,7 @@ s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}. s,@RULE_SUBST@,{.;$$(srcdir);$$(topdir);$$(hdrdir)}%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@,coredll winsock,;t t -s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN;t t +s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t s,@COMMON_HEADERS@,winsock.h windows.h,;t t s,@EXPORT_PREFIX@, ,;t t s,@arch@,$(ARCH)-$(OS),;t t |