nobu	2014-12-23 20:33:54 +0900 (Tue, 23 Dec 2014)

  New Revision: 48929

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48929

  Log:
    fiddle: clean-libffi
    
    * ext/fiddle/depend (clean-libffi): clean libffi directory.

  Modified files:
    trunk/ext/fiddle/depend
    trunk/ext/fiddle/extconf.rb
Index: ext/fiddle/depend
===================================================================
--- ext/fiddle/depend	(revision 48928)
+++ ext/fiddle/depend	(revision 48929)
@@ -25,4 +25,21 @@ build-libffi: $(LIBFFI_A) https://github.com/ruby/ruby/blob/trunk/ext/fiddle/depend#L25
 build-libffi $(LIBFFI_A):
 	$(Q) $(SUBMAKE_LIBFFI)
 
+clean-libffi:
+	$(Q) $(SUBMAKE_LIBFFI) clean
+
+distclean-libffi:
+	$(Q) $(SUBMAKE_LIBFFI) distclean
+	$(Q) $(RM) $(LIBFFI_DIR)/local.exp
+	$(Q) $(RUBY) -rfileutils -e 'FileUtils.rmdir(Dir.glob(ARGV[0]+"/**/"), :parents=>true)' $(LIBFFI_DIR)
+
+realclean-libffi:
+	$(Q) $(RMDIRS) $(LIBFFI_DIR)
+
+clean-none distclean-none realclean-none:
+
+clean: clean-$(LIBFFI_CLEAN)
+distclean: distclean-$(LIBFFI_CLEAN)
+realclean: realclean-$(LIBFFI_CLEAN)
+
 configure: configure-libffi
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 48928)
+++ ext/fiddle/extconf.rb	(revision 48929)
@@ -127,8 +127,9 @@ if libffi https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L127
   $LOCAL_LIBS.prepend("#{libffi.a} ").strip!
 end
 create_makefile 'fiddle' do |conf|
-  next conf unless libffi
-  if $mswin
+  if !libffi
+    next conf << "LIBFFI_CLEAN = none\n"
+  elsif $mswin
     submake = "make -C $(LIBFFI_DIR)\n"
   elsif $gnumake
     submake = "$(MAKE) -C $(LIBFFI_DIR)\n"
@@ -148,6 +149,7 @@ create_makefile 'fiddle' do |conf| https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L149
    LIBFFI_LDFLAGS = #{libffi.ldflags}
    FFI_H = $(LIBFFI_DIR)/include/ffi.h
    SUBMAKE_LIBFFI = #{submake}
+   LIBFFI_CLEAN = libffi
   MK
 end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/