summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-01 07:15:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-01 07:15:18 +0000
commit28b7df782088e1e18b53659b0ba0c96a1b8b1c8b (patch)
tree76260bbe6dcc5d06f7a2d474bdfb4e9533957561
parentd7228e5bbae6a81f57f0ba96cbdefa21a9f4a330 (diff)
* revert r35510 and r35511 which caused removing the headers everytime.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/digest/md5/depend2
-rw-r--r--ext/digest/rmd160/depend2
-rw-r--r--ext/digest/sha1/depend2
-rw-r--r--ext/digest/sha2/depend2
-rw-r--r--lib/mkmf.rb9
5 files changed, 1 insertions, 16 deletions
diff --git a/ext/digest/md5/depend b/ext/digest/md5/depend
index 79f57ca6e0..8eaec20b4b 100644
--- a/ext/digest/md5/depend
+++ b/ext/digest/md5/depend
@@ -4,5 +4,3 @@ md5init.o: md5init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
$(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h md5.h \
$(srcdir)/../defs.h
md5ossl.o: md5ossl.h
-
-$(RUBY_EXTCONF_H): $(top_srcdir)/ext/openssl/deprecation.rb
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
index 8460ff749f..a21d7188dc 100644
--- a/ext/digest/rmd160/depend
+++ b/ext/digest/rmd160/depend
@@ -4,5 +4,3 @@ rmd160init.o: rmd160init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
$(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
rmd160.h $(srcdir)/../defs.h
rmd160ossl.o: rmd160ossl.h $(srcdir)/../defs.h
-
-$(RUBY_EXTCONF_H): $(top_srcdir)/ext/openssl/deprecation.rb
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
index 9aa98bd451..61607844d0 100644
--- a/ext/digest/sha1/depend
+++ b/ext/digest/sha1/depend
@@ -4,5 +4,3 @@ sha1init.o: sha1init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
$(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
sha1.h $(srcdir)/../defs.h
sha1ossl.o: sha1ossl.h $(srcdir)/../defs.h
-
-$(RUBY_EXTCONF_H): $(top_srcdir)/ext/openssl/deprecation.rb
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
index 32a7cbcacc..00e18e158d 100644
--- a/ext/digest/sha2/depend
+++ b/ext/digest/sha2/depend
@@ -4,5 +4,3 @@ sha2init.o: sha2init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
$(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
sha2.h $(srcdir)/../defs.h
sha2ossl.o: sha2ossl.h $(srcdir)/../defs.h
-
-$(RUBY_EXTCONF_H): $(top_srcdir)/ext/openssl/deprecation.rb
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 4c05ebf8a5..53f647aef1 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1897,14 +1897,7 @@ RULES
unless suffixes.empty?
depout.unshift(".SUFFIXES: ." + suffixes.uniq.join(" .") + "\n\n")
end
- if $extconf_h
- depout.unshift("$(OBJS): $(RUBY_EXTCONF_H)\n\n",
- "$(RUBY_EXTCONF_H): $(srcdir)/extconf.rb\n",
- "$(RUBY_EXTCONF_H):\n",
- "\t$(Q)$(RM) $(@)\n",
- "\t$(ECHO) $@ is outdated, re-configure\n",
- "\t@exit 1\n")
- end
+ depout.unshift("$(OBJS): $(RUBY_EXTCONF_H)\n\n") if $extconf_h
depout.flatten!
depout
end