diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-18 02:01:24 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-18 02:01:24 +0000 |
| commit | e929d3fe2cfb1233b6fbce2d596a885395aa46a4 (patch) | |
| tree | f2760f6150ea08dd8df976faf0864ecf45e91617 | |
| parent | 92279ade8079f19abf106178bd3e52095145262e (diff) | |
| download | ruby-e929d3fe2cfb1233b6fbce2d596a885395aa46a4.tar.gz ruby-e929d3fe2cfb1233b6fbce2d596a885395aa46a4.tar.xz ruby-e929d3fe2cfb1233b6fbce2d596a885395aa46a4.zip | |
* ext/dl/depend, ext/dl/extconf.rb, ext/socket/depend,
ext/socket/extconf.rb: shouldn't define DESTCLEANFILES in depend,
use $distcleanfiles in extconf.rb.
* win32/Makefile.sub (distclean-local): should remove .config.h.time.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/dl/depend | 2 | ||||
| -rw-r--r-- | ext/dl/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/socket/depend | 2 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
6 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Tue Oct 18 10:58:27 2005 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/dl/depend, ext/dl/extconf.rb, ext/socket/depend, + ext/socket/extconf.rb: shouldn't define DESTCLEANFILES in depend, + use $distcleanfiles in extconf.rb. + + * win32/Makefile.sub (distclean-local): should remove .config.h.time. + Mon Oct 17 09:42:50 2005 NAKAMURA Usaku <usa@ruby-lang.org> * mkconfig.rb: fixup configure_args for mswin32 configure. diff --git a/ext/dl/depend b/ext/dl/depend index 3d86c3405..3f05a2f80 100644 --- a/ext/dl/depend +++ b/ext/dl/depend @@ -1,5 +1,3 @@ -DISTCLEANFILES = $(srcdir)/callback.h - cfunc.o: cfunc.c dl.h cptr.o: cptr.c dl.h diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb index 6311fc82d..ef9f09438 100644 --- a/ext/dl/extconf.rb +++ b/ext/dl/extconf.rb @@ -7,6 +7,8 @@ end $INSTALLFILES = [ ["dl.h", "$(archdir)$(target_prefix)", ""], ] +$distcleanfiles = "callback.h" + check = true if( have_header("dlfcn.h") ) diff --git a/ext/socket/depend b/ext/socket/depend index eab099b0c..77d5b6655 100644 --- a/ext/socket/depend +++ b/ext/socket/depend @@ -1,5 +1,3 @@ -DISTCLEANFILES = $(srcdir)/constants.h - socket.o: socket.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h sockport.h constants.h getnameinfo.o: getnameinfo.c $(topdir)/config.h addrinfo.h sockport.h getaddrinfo.o: getaddrinfo.c $(topdir)/config.h addrinfo.h sockport.h diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index b14fa8efb..00821ccb0 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -268,6 +268,8 @@ end have_header("sys/un.h") have_header("sys/uio.h") +$distcleanfiles = "constants.h" + if have_func(test_func) have_func("hsterror") have_func("getipnodebyname") or have_func("gethostbyname2") diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 1b0279ce2..21639a223 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -469,7 +469,7 @@ clean-local:: @$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res distclean-local:: - @$(RM) ext\config.cache $(RBCONFIG:/=\) + @$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\) @$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc |