1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/extconf.rb.in: make the priority of the make rule of .c higher than .C .

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2001-05-28 13:25:34 +00:00
parent e406a28a71
commit e83171c4c4
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon May 28 22:12:01 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* ext/extconf.rb.in: make the priority of the make rule of .c
higher than .C .
Mon May 28 02:20:38 2001 Akinori MUSHA <knu@iDaemons.org> Mon May 28 02:20:38 2001 Akinori MUSHA <knu@iDaemons.org>
* dir.c (glob_helper): teach has_magic() to handle flags and get * dir.c (glob_helper): teach has_magic() to handle flags and get

31
ext/extmk.rb.in
View File

@ -501,21 +501,26 @@ EOS
install_rb(mfile, $srcdir) install_rb(mfile, $srcdir)
mfile.printf "\n" mfile.printf "\n"
if /mswin32/ !~ RUBY_PLATFORM unless /nmake/i =~ $make
unless /mswin32/ =~ RUBY_PLATFORM
src = '$<'
else
src = '$(subst /,\\\\,$<)'
end
mfile.puts " mfile.puts "
.c.@OBJEXT@:
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
.cc.@OBJEXT@: .cc.@OBJEXT@:
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src}
.cpp.@OBJEXT@: .cpp.@OBJEXT@:
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src}
.cxx.@OBJEXT@: .cxx.@OBJEXT@:
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src}
.C.@OBJEXT@: .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 " mfile.print "
{$(srcdir)}.c{}.@OBJEXT@: {$(srcdir)}.c{}.@OBJEXT@:
$(CC) -I. -I$(<D) $(CFLAGS) $(CPPFLAGS) -c $(<:/=\\) $(CC) -I. -I$(<D) $(CFLAGS) $(CPPFLAGS) -c $(<:/=\\)
@ -534,14 +539,6 @@ EOS
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\) $(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
.cxx.@OBJEXT@: .cxx.@OBJEXT@:
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\) $(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 end