summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--MANIFEST1
-rw-r--r--ext/extmk.rb2
-rw-r--r--lib/mkmf.rb2
4 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ba8160c916..fff877b596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 3 11:36:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
+
+ * lib/mkmf.rb (configuration): DLDFLAGS was duplicated.
+
Tue Dec 2 23:18:12 2003 Minero Aoki <aamine@loveruby.net>
* lib/net/http.rb: wrote the warning about HTTP_PROXY environment
diff --git a/MANIFEST b/MANIFEST
index b925a0ba08..3fedde1189 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -84,6 +84,7 @@ bcc32/setup.mak
bin/erb
bin/irb
bin/rdoc
+bin/testrb
cygwin/GNUmakefile.in
djgpp/GNUmakefile.in
djgpp/README.djgpp
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 5f99c85ea9..fe777a4ceb 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -184,7 +184,7 @@ end
$ruby << " -I$(topdir) -I$(hdrdir)/lib"
$config_h = '$(topdir)/config.h'
-MTIMES = [File.mtime(__FILE__)]
+MTIMES = [__FILE__, srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
# get static-link modules
$static_ext = {}
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index bb79a5e4c5..080aa051b1 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -725,7 +725,7 @@ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
CFLAGS = #{CONFIG['CCDLFLAGS'] unless $static} #$CFLAGS #$ARCH_FLAG
CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{$CPPFLAGS}
CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
-DLDFLAGS = #$LDFLAGS #{CONFIG['DLDFLAGS']} #$DLDFLAGS #$ARCH_FLAG
+DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG
LDSHARED = #{CONFIG['LDSHARED']}
AR = #{CONFIG['AR']}
EXEEXT = #{CONFIG['EXEEXT']}