diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-28 13:25:34 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-28 13:25:34 +0000 |
| commit | 6024ca4f7239b1900b570f2d8c2842c48eaf3ad7 (patch) | |
| tree | d25b024163b1b2fb04daa80f9f1151d854c05e43 | |
| parent | ac3df710a71cebf06e39b3fda1e2cfec5919aba2 (diff) | |
* ext/extconf.rb.in: make the priority of the make rule of .c higher than .C .
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb.in | 31 |
2 files changed, 19 insertions, 17 deletions
@@ -1,3 +1,8 @@ +Mon May 28 22:12:01 2001 Nobuyoshi Nakada <[email protected]> + + * ext/extconf.rb.in: make the priority of the make rule of .c + higher than .C . + Mon May 28 02:43:16 2001 Akinori MUSHA <[email protected]> * dir.c (rb_glob_helper): teach has_magic() to handle flags and diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 9e454cc429..3f98afc474 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -502,21 +502,26 @@ EOS install_rb(mfile, $srcdir) mfile.printf "\n" - if /mswin32/ !~ RUBY_PLATFORM + unless /nmake/i =~ $make + unless /mswin32/ =~ RUBY_PLATFORM + src = '$<' + else + src = '$(subst /,\\\\,$<)' + end mfile.puts " -.c.@OBJEXT@: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - .cc.@OBJEXT@: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src} .cpp.@OBJEXT@: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src} .cxx.@OBJEXT@: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src} .C.@OBJEXT@: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src} + +.c.@OBJEXT@: + $(CC) $(CFLAGS) $(CPPFLAGS) -c #{src} " - elsif /nmake/i =~ $make + else mfile.print " {$(srcdir)}.c{}.@OBJEXT@: $(CC) -I. -I$(<D) $(CFLAGS) $(CPPFLAGS) -c $(<:/=\\) @@ -536,14 +541,6 @@ EOS .cxx.@OBJEXT@: $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\) " - else - mfile.print " -.c.@OBJEXT@: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<) - -.cc.@OBJEXT@ .cpp.@OBJEXT@ .cxx.@OBJEXT@ .C.@OBJEXT@: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<) -" end if $static |