summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-09 01:03:41 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-09 01:03:41 +0000
commitd65a9ff1cec282a519c727959f33a4645ffcefd2 (patch)
treeda0ba0f723e324ad57b09fb15f4af34fad9d6875
parent6e558fe938524285eea7840b020b42b3896ab8da (diff)
downloadruby-d65a9ff1cec282a519c727959f33a4645ffcefd2.tar.gz
ruby-d65a9ff1cec282a519c727959f33a4645ffcefd2.tar.xz
ruby-d65a9ff1cec282a519c727959f33a4645ffcefd2.zip
* ext/tk/make-tkutil, ext/tk/tkutil/subconf.rb: no longer used.
* ext/tk/tkutil/extconf.rb: need to compile tkutil. [ruby-dev:25607] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/tk/make-tkutil43
-rw-r--r--ext/tk/tkutil/extconf.rb4
-rw-r--r--ext/tk/tkutil/subconf.rb2
4 files changed, 10 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a20ec458..dff39dd50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 9 10:02:02 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/tk/make-tkutil, ext/tk/tkutil/subconf.rb: no longer used.
+
+ * ext/tk/tkutil/extconf.rb: need to compile tkutil. [ruby-dev:25607]
+
Tue Feb 8 23:48:36 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
diff --git a/ext/tk/make-tkutil b/ext/tk/make-tkutil
deleted file mode 100644
index a7884efdd..000000000
--- a/ext/tk/make-tkutil
+++ /dev/null
@@ -1,43 +0,0 @@
-all: all-tkutil
-all-tkutil:
- @(cd tkutil; $(MAKE) all)
-
-static: static-tkutil
-static-tkutil:
- @(cd tkutil; $(MAKE) static)
-
-clean: clean-tkutil
-clean-tkutil:
- @(cd tkutil; $(MAKE) clean)
-
-distclean: distclean-tkutil
-distclean-tkutil:
- @(cd tkutil; $(MAKE) distclean)
-
-realclean: realclean-tkutil
-realclean-tkutil:
- @(cd tkutil; $(MAKE) realclean)
-
-install: install-tkutil
-install-tkutil:
- @(cd tkutil; $(MAKE) install)
-
-install-so: install-tkutil-so
-install-tkutil-so:
- @(cd tkutil; $(MAKE) install-so)
-
-install-rb: install-tkutil-rb
-install-tkutil-rb:
- @(cd tkutil; $(MAKE) install-rb)
-
-site-install: site-install-tkutil
-site-install-tkutil:
- @(cd tkutil; $(MAKE) site-install)
-
-site-install-so: site-install-tkutil-so
-site-install-tkutil-so:
- @(cd tkutil; $(MAKE) site-install-so)
-
-site-install-rb: site-install-tkutil-rb
-site-install-tkutil-rb:
- @(cd tkutil; $(MAKE) site-install-rb)
diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb
new file mode 100644
index 000000000..e3aa00a4b
--- /dev/null
+++ b/ext/tk/tkutil/extconf.rb
@@ -0,0 +1,4 @@
+if compiled?('tk')
+ require 'mkmf'
+ create_makefile('tkutil')
+end
diff --git a/ext/tk/tkutil/subconf.rb b/ext/tk/tkutil/subconf.rb
deleted file mode 100644
index 5ff0bc1e6..000000000
--- a/ext/tk/tkutil/subconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('tkutil')