[2417] 2009-07-16 Vladimir Serbinenko <address@hidden>

[Vladimir Serbinenko]

Revision: 2417
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2417
Author:   phcoder
Date:     2009-07-16 14:53:33 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
2009-07-16  Vladimir Serbinenko  <address@hidden>

        Fix libusb

        * Makefile.in (LIBUSB): new macro
        * genmk.rb (Utility/print_tail): new method
        (Utility/rule): use intermediary variable #{prefix}_OBJECTS
        (top level): call util.print_tail at the end.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/Makefile.in
    trunk/grub2/genmk.rb

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-07-15 22:51:47 UTC (rev 2416)
+++ trunk/grub2/ChangeLog       2009-07-16 14:53:33 UTC (rev 2417)
@@ -1,5 +1,14 @@
 2009-07-16  Vladimir Serbinenko  <address@hidden>
 
+       Fix libusb
+
+       * Makefile.in (LIBUSB): new macro
+       * genmk.rb (Utility/print_tail): new method
+       (Utility/rule): use intermediary variable #{prefix}_OBJECTS
+       (top level): call util.print_tail at the end.
+
+2009-07-16  Vladimir Serbinenko  <address@hidden>
+
        Make FreeBSD accept zpool.cache
 
        * loader/i386/bsd.c (grub_freebsd_add_meta_module): spoof filename if

Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in     2009-07-15 22:51:47 UTC (rev 2416)
+++ trunk/grub2/Makefile.in     2009-07-16 14:53:33 UTC (rev 2417)
@@ -95,6 +95,7 @@
 AWK = @AWK@
 LIBCURSES = @LIBCURSES@
 LIBLZO = @LIBLZO@
+LIBUSB = @LIBUSB@
 YACC = @YACC@
 UNIFONT_BDF = @UNIFONT_BDF@
 

Modified: trunk/grub2/genmk.rb
===================================================================
--- trunk/grub2/genmk.rb        2009-07-15 22:51:47 UTC (rev 2416)
+++ trunk/grub2/genmk.rb        2009-07-16 14:53:33 UTC (rev 2417)
@@ -220,6 +220,13 @@
     @dir = dir
     @name = name
   end
+  def print_tail()
+    prefix = @name.to_var
+    print "address@hidden: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
+       $(CC) -o $@ $(#{prefix}_OBJECTS) $(LDFLAGS) $(#{prefix}_LDFLAGS)
+
+"
+  end
   attr_reader :dir, :name
 
   def rule(sources)
@@ -234,10 +241,8 @@
 
     "CLEANFILES += address@hidden(EXEEXT) #{objs_str}
 MOSTLYCLEANFILES += #{deps_str}
+#{prefix}_OBJECTS += #{objs_str}
 
address@hidden: $(#{prefix}_DEPENDENCIES) #{objs_str}
-       $(CC) -o $@ #{objs_str} $(LDFLAGS) $(#{prefix}_LDFLAGS)
-
 " + objs.collect_with_index do |obj, i|
       src = sources[i]
       fake_obj = File.basename(src).suffix('o')
@@ -395,4 +400,5 @@
   end
 
 end
+utils.each {|util| util.print_tail()}