[前][次][番号順一覧][スレッド一覧]

ruby-changes:45674

From: nobu <ko1@a...>
Date: Wed, 1 Mar 2017 14:44:44 +0900 (JST)
Subject: [ruby-changes:45674] nobu:r57747 (trunk): zlib: clean zlib

nobu	2017-03-01 14:44:37 +0900 (Wed, 01 Mar 2017)

  New Revision: 57747

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

  Log:
    zlib: clean zlib
    
    * ext/zlib/extconf.rb: clean zlib libraries generated in the
      place.

  Modified files:
    trunk/ext/zlib/extconf.rb
Index: ext/zlib/extconf.rb
===================================================================
--- ext/zlib/extconf.rb	(revision 57746)
+++ ext/zlib/extconf.rb	(revision 57747)
@@ -30,14 +30,19 @@ else https://github.com/ruby/ruby/blob/trunk/ext/zlib/extconf.rb#L30
       $libs = append_library($libs, "zdll")
       dll = "zlib1.dll"
       $extso << dll
+      $cleanfiles << "$(topdir)/#{dll}" << "$(ZIMPLIB)"
+      zmk = "\t$(MAKE) -f $(ZSRC)/win32/Makefile.#{$nmake ? 'msc' : 'gcc'} TOP=$(ZSRC)"
       addconf.push(
         "ZIMPLIB = zdll.lib\n",
         "$(TARGET_SO): $(ZIMPLIB)\n",
         "$(ZIMPLIB):\n",
-        "\t$(MAKE) -f $(ZSRC)/win32/Makefile.#{$nmake ? 'msc' : 'gcc'} TOP=$(ZSRC) $@\n",
+        "#{zmk} $@\n",
         "install-so: $(topdir)/#{dll}",
         "$(topdir)/#{dll}: $(ZIMPLIB)\n",
         "\t$(Q) $(COPY) #{dll} $(@D)\n",
+        "clean: clean-zsrc\n",
+        "clean-zsrc:\n",
+        "#{zmk} clean\n",
       )
     end
     Logging.message "using zlib in #{zsrc}\n"

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

[前][次][番号順一覧][スレッド一覧]