From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1GQWbb-0007TS-KC for mharc-grub-devel@gnu.org; Thu, 21 Sep 2006 18:01:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1GQWbZ-0007Oq-Lg for grub-devel@gnu.org; Thu, 21 Sep 2006 18:01:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1GQWbW-0007LX-VV for grub-devel@gnu.org; Thu, 21 Sep 2006 18:01:13 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1GQWbW-0007L6-NR for grub-devel@gnu.org; Thu, 21 Sep 2006 18:01:10 -0400 Received: from [195.54.107.70] (helo=mxfep01.bredband.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1GQWf6-0004DS-QN for grub-devel@gnu.org; Thu, 21 Sep 2006 18:04:53 -0400 Received: from localhost.localdomain ([213.113.223.229] [213.113.223.229]) by mxfep01.bredband.com with ESMTP id <20060921220108.UMXY18694.mxfep01.bredband.com@localhost.localdomain>; Fri, 22 Sep 2006 00:01:08 +0200 From: Johan Rydberg To: Robert Millan References: <20060921185626.GA17233@khazad.dyndns.org> Date: Fri, 22 Sep 2006 00:24:10 +0200 In-Reply-To: <20060921185626.GA17233@khazad.dyndns.org> (Robert Millan's message of "Thu, 21 Sep 2006 20:56:26 +0200") Message-ID: <87odt83lkl.fsf@night.trouble.net> User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: grub-devel@gnu.org Subject: Re: CVS fails to build X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2006 22:01:13 -0000 --=-=-= Robert Millan writes: > As Marco said on IRC, the culprit is: > > 2006-08-15 Johan Rydberg > [...] > > I don't understand the commit to produce a proper fix. Perhaps it > should be reverted? This patch should fix the problem. It introduces a new per-target variable; target_DEPENDENCIES that will be added to the dependency list of the target. I'll commit it in a few days, or when you (or someone else) confirms that it works. 2006-09-22 Johan Rydberg * genmk.rb: Add DEPENDENCIES variables to modules, utilities, and programs. * conf/i386-pc.rmk (grub_emu_DEPENDENCIES): Declare. (normal_mod_DEPENDENCIES): Likewise. * conf/i386-pc.mk: Regenerate. * conf/i386-efi.mk: Likewise * conf/common.mk: Likewise. * conf/powerpc-ieee1275.mk: Likewise. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=grub.build.1.patch Content-Transfer-Encoding: quoted-printable ? build ? new-b ? p1 Index: genmk.rb =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/grub/grub2/genmk.rb,v retrieving revision 1.26 diff -u -r1.26 genmk.rb --- genmk.rb 15 Aug 2006 12:29:07 -0000 1.26 +++ genmk.rb 21 Sep 2006 14:32:59 -0000 @@ -117,9 +117,9 @@ $(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -#{pre_obj}: #{objs_str} +#{pre_obj}: $(#{prefix}_DEPENDENCIES) #{objs_str} -rm -f $@ - $(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{obj= s_str} =20 #{mod_obj}: #{mod_src} $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -c -= o $@ $< @@ -189,8 +189,8 @@ "CLEANFILES +=3D #{@name} #{objs_str} MOSTLYCLEANFILES +=3D #{deps_str} =20 -#{@name}: #{objs_str} - $(CC) -o $@ $^ $(LDFLAGS) $(#{prefix}_LDFLAGS) +#{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str} + $(CC) -o $@ #{objs_str} $(LDFLAGS) $(#{prefix}_LDFLAGS) =20 " + objs.collect_with_index do |obj, i| src =3D sources[i] @@ -227,8 +227,8 @@ "CLEANFILES +=3D #{@name} #{objs_str} MOSTLYCLEANFILES +=3D #{deps_str} =20 -#{@name}: #{objs_str} - $(TARGET_CC) -o $@ $^ $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS) +#{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str} + $(TARGET_CC) -o $@ #{objs_str} $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS) =20 " + objs.collect_with_index do |obj, i| src =3D sources[i] Index: conf/common.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/grub/grub2/conf/common.mk,v retrieving revision 1.16 diff -u -r1.16 common.mk --- conf/common.mk 15 Aug 2006 12:29:07 -0000 1.16 +++ conf/common.mk 21 Sep 2006 14:33:00 -0000 @@ -39,9 +39,9 @@ $(TARGET_CC) $(fshelp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-fshelp.o: fshelp_mod-fs_fshelp.o +pre-fshelp.o: $(fshelp_mod_DEPENDENCIES) fshelp_mod-fs_fshelp.o -rm -f $@ - $(TARGET_CC) $(fshelp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(fshelp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ fshe= lp_mod-fs_fshelp.o =20 mod-fshelp.o: mod-fshelp.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(fshelp_mod_CFLAGS) -c = -o $@ $< @@ -91,9 +91,9 @@ $(TARGET_CC) $(fat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-fat.o: fat_mod-fs_fat.o +pre-fat.o: $(fat_mod_DEPENDENCIES) fat_mod-fs_fat.o -rm -f $@ - $(TARGET_CC) $(fat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(fat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ fat_mod= -fs_fat.o =20 mod-fat.o: mod-fat.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(fat_mod_CFLAGS) -c -o = $@ $< @@ -143,9 +143,9 @@ $(TARGET_CC) $(ufs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-ufs.o: ufs_mod-fs_ufs.o +pre-ufs.o: $(ufs_mod_DEPENDENCIES) ufs_mod-fs_ufs.o -rm -f $@ - $(TARGET_CC) $(ufs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(ufs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ ufs_mod= -fs_ufs.o =20 mod-ufs.o: mod-ufs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ufs_mod_CFLAGS) -c -o = $@ $< @@ -195,9 +195,9 @@ $(TARGET_CC) $(ext2_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-ext2.o: ext2_mod-fs_ext2.o +pre-ext2.o: $(ext2_mod_DEPENDENCIES) ext2_mod-fs_ext2.o -rm -f $@ - $(TARGET_CC) $(ext2_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(ext2_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ ext2_m= od-fs_ext2.o =20 mod-ext2.o: mod-ext2.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ext2_mod_CFLAGS) -c -o= $@ $< @@ -247,9 +247,9 @@ $(TARGET_CC) $(minix_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-minix.o: minix_mod-fs_minix.o +pre-minix.o: $(minix_mod_DEPENDENCIES) minix_mod-fs_minix.o -rm -f $@ - $(TARGET_CC) $(minix_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(minix_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ minix= _mod-fs_minix.o =20 mod-minix.o: mod-minix.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(minix_mod_CFLAGS) -c -= o $@ $< @@ -299,9 +299,9 @@ $(TARGET_CC) $(hfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-hfs.o: hfs_mod-fs_hfs.o +pre-hfs.o: $(hfs_mod_DEPENDENCIES) hfs_mod-fs_hfs.o -rm -f $@ - $(TARGET_CC) $(hfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(hfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ hfs_mod= -fs_hfs.o =20 mod-hfs.o: mod-hfs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hfs_mod_CFLAGS) -c -o = $@ $< @@ -351,9 +351,9 @@ $(TARGET_CC) $(jfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-jfs.o: jfs_mod-fs_jfs.o +pre-jfs.o: $(jfs_mod_DEPENDENCIES) jfs_mod-fs_jfs.o -rm -f $@ - $(TARGET_CC) $(jfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(jfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ jfs_mod= -fs_jfs.o =20 mod-jfs.o: mod-jfs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(jfs_mod_CFLAGS) -c -o = $@ $< @@ -403,9 +403,9 @@ $(TARGET_CC) $(iso9660_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-iso9660.o: iso9660_mod-fs_iso9660.o +pre-iso9660.o: $(iso9660_mod_DEPENDENCIES) iso9660_mod-fs_iso9660.o -rm -f $@ - $(TARGET_CC) $(iso9660_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(iso9660_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ iso= 9660_mod-fs_iso9660.o =20 mod-iso9660.o: mod-iso9660.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(iso9660_mod_CFLAGS) -c= -o $@ $< @@ -455,9 +455,9 @@ $(TARGET_CC) $(xfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-xfs.o: xfs_mod-fs_xfs.o +pre-xfs.o: $(xfs_mod_DEPENDENCIES) xfs_mod-fs_xfs.o -rm -f $@ - $(TARGET_CC) $(xfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(xfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ xfs_mod= -fs_xfs.o =20 mod-xfs.o: mod-xfs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(xfs_mod_CFLAGS) -c -o = $@ $< @@ -507,9 +507,9 @@ $(TARGET_CC) $(affs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-affs.o: affs_mod-fs_affs.o +pre-affs.o: $(affs_mod_DEPENDENCIES) affs_mod-fs_affs.o -rm -f $@ - $(TARGET_CC) $(affs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(affs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ affs_m= od-fs_affs.o =20 mod-affs.o: mod-affs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(affs_mod_CFLAGS) -c -o= $@ $< @@ -559,9 +559,9 @@ $(TARGET_CC) $(sfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-sfs.o: sfs_mod-fs_sfs.o +pre-sfs.o: $(sfs_mod_DEPENDENCIES) sfs_mod-fs_sfs.o -rm -f $@ - $(TARGET_CC) $(sfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(sfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sfs_mod= -fs_sfs.o =20 mod-sfs.o: mod-sfs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sfs_mod_CFLAGS) -c -o = $@ $< @@ -611,9 +611,9 @@ $(TARGET_CC) $(hfsplus_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-hfsplus.o: hfsplus_mod-fs_hfsplus.o +pre-hfsplus.o: $(hfsplus_mod_DEPENDENCIES) hfsplus_mod-fs_hfsplus.o -rm -f $@ - $(TARGET_CC) $(hfsplus_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(hfsplus_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ hfs= plus_mod-fs_hfsplus.o =20 mod-hfsplus.o: mod-hfsplus.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hfsplus_mod_CFLAGS) -c= -o $@ $< @@ -666,9 +666,9 @@ $(TARGET_CC) $(amiga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-amiga.o: amiga_mod-partmap_amiga.o +pre-amiga.o: $(amiga_mod_DEPENDENCIES) amiga_mod-partmap_amiga.o -rm -f $@ - $(TARGET_CC) $(amiga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(amiga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ amiga= _mod-partmap_amiga.o =20 mod-amiga.o: mod-amiga.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(amiga_mod_CFLAGS) -c -= o $@ $< @@ -718,9 +718,9 @@ $(TARGET_CC) $(apple_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-apple.o: apple_mod-partmap_apple.o +pre-apple.o: $(apple_mod_DEPENDENCIES) apple_mod-partmap_apple.o -rm -f $@ - $(TARGET_CC) $(apple_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(apple_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ apple= _mod-partmap_apple.o =20 mod-apple.o: mod-apple.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(apple_mod_CFLAGS) -c -= o $@ $< @@ -770,9 +770,9 @@ $(TARGET_CC) $(pc_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-pc.o: pc_mod-partmap_pc.o +pre-pc.o: $(pc_mod_DEPENDENCIES) pc_mod-partmap_pc.o -rm -f $@ - $(TARGET_CC) $(pc_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(pc_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ pc_mod-p= artmap_pc.o =20 mod-pc.o: mod-pc.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(pc_mod_CFLAGS) -c -o $= @ $< @@ -822,9 +822,9 @@ $(TARGET_CC) $(sun_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-sun.o: sun_mod-partmap_sun.o +pre-sun.o: $(sun_mod_DEPENDENCIES) sun_mod-partmap_sun.o -rm -f $@ - $(TARGET_CC) $(sun_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(sun_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sun_mod= -partmap_sun.o =20 mod-sun.o: mod-sun.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sun_mod_CFLAGS) -c -o = $@ $< @@ -874,9 +874,9 @@ $(TARGET_CC) $(acorn_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-acorn.o: acorn_mod-partmap_acorn.o +pre-acorn.o: $(acorn_mod_DEPENDENCIES) acorn_mod-partmap_acorn.o -rm -f $@ - $(TARGET_CC) $(acorn_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(acorn_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ acorn= _mod-partmap_acorn.o =20 mod-acorn.o: mod-acorn.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(acorn_mod_CFLAGS) -c -= o $@ $< @@ -926,9 +926,9 @@ $(TARGET_CC) $(gpt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-gpt.o: gpt_mod-partmap_gpt.o +pre-gpt.o: $(gpt_mod_DEPENDENCIES) gpt_mod-partmap_gpt.o -rm -f $@ - $(TARGET_CC) $(gpt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(gpt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ gpt_mod= -partmap_gpt.o =20 mod-gpt.o: mod-gpt.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gpt_mod_CFLAGS) -c -o = $@ $< @@ -985,9 +985,9 @@ $(TARGET_CC) $(hello_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-hello.o: hello_mod-hello_hello.o +pre-hello.o: $(hello_mod_DEPENDENCIES) hello_mod-hello_hello.o -rm -f $@ - $(TARGET_CC) $(hello_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(hello_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ hello= _mod-hello_hello.o =20 mod-hello.o: mod-hello.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hello_mod_CFLAGS) -c -= o $@ $< @@ -1037,9 +1037,9 @@ $(TARGET_CC) $(boot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-boot.o: boot_mod-commands_boot.o +pre-boot.o: $(boot_mod_DEPENDENCIES) boot_mod-commands_boot.o -rm -f $@ - $(TARGET_CC) $(boot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(boot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ boot_m= od-commands_boot.o =20 mod-boot.o: mod-boot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(boot_mod_CFLAGS) -c -o= $@ $< @@ -1089,9 +1089,9 @@ $(TARGET_CC) $(terminal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-terminal.o: terminal_mod-commands_terminal.o +pre-terminal.o: $(terminal_mod_DEPENDENCIES) terminal_mod-commands_termina= l.o -rm -f $@ - $(TARGET_CC) $(terminal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(terminal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ te= rminal_mod-commands_terminal.o =20 mod-terminal.o: mod-terminal.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminal_mod_CFLAGS) -= c -o $@ $< @@ -1141,9 +1141,9 @@ $(TARGET_CC) $(ls_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-ls.o: ls_mod-commands_ls.o +pre-ls.o: $(ls_mod_DEPENDENCIES) ls_mod-commands_ls.o -rm -f $@ - $(TARGET_CC) $(ls_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(ls_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ ls_mod-c= ommands_ls.o =20 mod-ls.o: mod-ls.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ls_mod_CFLAGS) -c -o $= @ $< @@ -1193,9 +1193,9 @@ $(TARGET_CC) $(cmp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-cmp.o: cmp_mod-commands_cmp.o +pre-cmp.o: $(cmp_mod_DEPENDENCIES) cmp_mod-commands_cmp.o -rm -f $@ - $(TARGET_CC) $(cmp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(cmp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ cmp_mod= -commands_cmp.o =20 mod-cmp.o: mod-cmp.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cmp_mod_CFLAGS) -c -o = $@ $< @@ -1245,9 +1245,9 @@ $(TARGET_CC) $(cat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-cat.o: cat_mod-commands_cat.o +pre-cat.o: $(cat_mod_DEPENDENCIES) cat_mod-commands_cat.o -rm -f $@ - $(TARGET_CC) $(cat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(cat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ cat_mod= -commands_cat.o =20 mod-cat.o: mod-cat.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cat_mod_CFLAGS) -c -o = $@ $< @@ -1297,9 +1297,9 @@ $(TARGET_CC) $(help_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-help.o: help_mod-commands_help.o +pre-help.o: $(help_mod_DEPENDENCIES) help_mod-commands_help.o -rm -f $@ - $(TARGET_CC) $(help_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(help_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ help_m= od-commands_help.o =20 mod-help.o: mod-help.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(help_mod_CFLAGS) -c -o= $@ $< @@ -1349,9 +1349,9 @@ $(TARGET_CC) $(font_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-font.o: font_mod-font_manager.o +pre-font.o: $(font_mod_DEPENDENCIES) font_mod-font_manager.o -rm -f $@ - $(TARGET_CC) $(font_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(font_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ font_m= od-font_manager.o =20 mod-font.o: mod-font.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(font_mod_CFLAGS) -c -o= $@ $< @@ -1401,9 +1401,9 @@ $(TARGET_CC) $(search_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-search.o: search_mod-commands_search.o +pre-search.o: $(search_mod_DEPENDENCIES) search_mod-commands_search.o -rm -f $@ - $(TARGET_CC) $(search_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(search_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sear= ch_mod-commands_search.o =20 mod-search.o: mod-search.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(search_mod_CFLAGS) -c = -o $@ $< @@ -1453,9 +1453,9 @@ $(TARGET_CC) $(test_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-test.o: test_mod-commands_test.o +pre-test.o: $(test_mod_DEPENDENCIES) test_mod-commands_test.o -rm -f $@ - $(TARGET_CC) $(test_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(test_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ test_m= od-commands_test.o =20 mod-test.o: mod-test.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(test_mod_CFLAGS) -c -o= $@ $< @@ -1505,9 +1505,9 @@ $(TARGET_CC) $(loopback_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-loopback.o: loopback_mod-disk_loopback.o +pre-loopback.o: $(loopback_mod_DEPENDENCIES) loopback_mod-disk_loopback.o -rm -f $@ - $(TARGET_CC) $(loopback_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(loopback_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ lo= opback_mod-disk_loopback.o =20 mod-loopback.o: mod-loopback.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(loopback_mod_CFLAGS) -= c -o $@ $< @@ -1557,9 +1557,9 @@ $(TARGET_CC) $(configfile_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-configfile.o: configfile_mod-commands_configfile.o +pre-configfile.o: $(configfile_mod_DEPENDENCIES) configfile_mod-commands_c= onfigfile.o -rm -f $@ - $(TARGET_CC) $(configfile_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = $^ + $(TARGET_CC) $(configfile_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = configfile_mod-commands_configfile.o =20 mod-configfile.o: mod-configfile.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(configfile_mod_CFLAGS)= -c -o $@ $< @@ -1609,9 +1609,9 @@ $(TARGET_CC) $(terminfo_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-terminfo.o: terminfo_mod-term_terminfo.o terminfo_mod-term_tparm.o +pre-terminfo.o: $(terminfo_mod_DEPENDENCIES) terminfo_mod-term_terminfo.o = terminfo_mod-term_tparm.o -rm -f $@ - $(TARGET_CC) $(terminfo_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(terminfo_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ te= rminfo_mod-term_terminfo.o terminfo_mod-term_tparm.o =20 mod-terminfo.o: mod-terminfo.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminfo_mod_CFLAGS) -= c -o $@ $< @@ -1676,9 +1676,9 @@ $(TARGET_CC) $(blocklist_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-blocklist.o: blocklist_mod-commands_blocklist.o +pre-blocklist.o: $(blocklist_mod_DEPENDENCIES) blocklist_mod-commands_bloc= klist.o -rm -f $@ - $(TARGET_CC) $(blocklist_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(blocklist_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ b= locklist_mod-commands_blocklist.o =20 mod-blocklist.o: mod-blocklist.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(blocklist_mod_CFLAGS) = -c -o $@ $< @@ -1731,9 +1731,9 @@ $(TARGET_CC) $(gzio_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-gzio.o: gzio_mod-io_gzio.o +pre-gzio.o: $(gzio_mod_DEPENDENCIES) gzio_mod-io_gzio.o -rm -f $@ - $(TARGET_CC) $(gzio_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(gzio_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ gzio_m= od-io_gzio.o =20 mod-gzio.o: mod-gzio.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gzio_mod_CFLAGS) -c -o= $@ $< Index: conf/i386-efi.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/grub/grub2/conf/i386-efi.mk,v retrieving revision 1.14 diff -u -r1.14 i386-efi.mk --- conf/i386-efi.mk 15 Aug 2006 12:29:08 -0000 1.14 +++ conf/i386-efi.mk 21 Sep 2006 14:33:00 -0000 @@ -14,8 +14,8 @@ CLEANFILES +=3D grub-mkimage grub_mkimage-util_i386_efi_grub_mkimage.o gru= b_mkimage-util_misc.o grub_mkimage-util_resolve.o MOSTLYCLEANFILES +=3D grub_mkimage-util_i386_efi_grub_mkimage.d grub_mkima= ge-util_misc.d grub_mkimage-util_resolve.d =20 -grub-mkimage: grub_mkimage-util_i386_efi_grub_mkimage.o grub_mkimage-util_= misc.o grub_mkimage-util_resolve.o - $(CC) -o $@ $^ $(LDFLAGS) $(grub_mkimage_LDFLAGS) +grub-mkimage: $(grub_mkimage_DEPENDENCIES) grub_mkimage-util_i386_efi_grub= _mkimage.o grub_mkimage-util_misc.o grub_mkimage-util_resolve.o + $(CC) -o $@ grub_mkimage-util_i386_efi_grub_mkimage.o grub_mkimage-util_m= isc.o grub_mkimage-util_resolve.o $(LDFLAGS) $(grub_mkimage_LDFLAGS) =20 grub_mkimage-util_i386_efi_grub_mkimage.o: util/i386/efi/grub-mkimage.c $(CC) -Iutil/i386/efi -I$(srcdir)/util/i386/efi $(CPPFLAGS) $(CFLAGS) -DG= RUB_UTIL=3D1 $(grub_mkimage_CFLAGS) -MD -c -o $@ $< @@ -105,9 +105,9 @@ $(TARGET_CC) $(kernel_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-kernel.o: kernel_mod-kern_i386_efi_startup.o kernel_mod-kern_main.o ke= rnel_mod-kern_device.o kernel_mod-kern_disk.o kernel_mod-kern_dl.o kernel_m= od-kern_file.o kernel_mod-kern_fs.o kernel_mod-kern_err.o kernel_mod-kern_m= isc.o kernel_mod-kern_mm.o kernel_mod-kern_loader.o kernel_mod-kern_rescue.= o kernel_mod-kern_term.o kernel_mod-kern_i386_dl.o kernel_mod-kern_i386_efi= _init.o kernel_mod-kern_parser.o kernel_mod-kern_partition.o kernel_mod-ker= n_env.o kernel_mod-symlist.o kernel_mod-kern_efi_efi.o kernel_mod-kern_efi_= init.o kernel_mod-kern_efi_mm.o kernel_mod-term_efi_console.o kernel_mod-di= sk_efi_efidisk.o +pre-kernel.o: $(kernel_mod_DEPENDENCIES) kernel_mod-kern_i386_efi_startup.= o kernel_mod-kern_main.o kernel_mod-kern_device.o kernel_mod-kern_disk.o ke= rnel_mod-kern_dl.o kernel_mod-kern_file.o kernel_mod-kern_fs.o kernel_mod-k= ern_err.o kernel_mod-kern_misc.o kernel_mod-kern_mm.o kernel_mod-kern_loade= r.o kernel_mod-kern_rescue.o kernel_mod-kern_term.o kernel_mod-kern_i386_dl= .o kernel_mod-kern_i386_efi_init.o kernel_mod-kern_parser.o kernel_mod-kern= _partition.o kernel_mod-kern_env.o kernel_mod-symlist.o kernel_mod-kern_efi= _efi.o kernel_mod-kern_efi_init.o kernel_mod-kern_efi_mm.o kernel_mod-term_= efi_console.o kernel_mod-disk_efi_efidisk.o -rm -f $@ - $(TARGET_CC) $(kernel_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(kernel_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ kern= el_mod-kern_i386_efi_startup.o kernel_mod-kern_main.o kernel_mod-kern_devic= e.o kernel_mod-kern_disk.o kernel_mod-kern_dl.o kernel_mod-kern_file.o kern= el_mod-kern_fs.o kernel_mod-kern_err.o kernel_mod-kern_misc.o kernel_mod-ke= rn_mm.o kernel_mod-kern_loader.o kernel_mod-kern_rescue.o kernel_mod-kern_t= erm.o kernel_mod-kern_i386_dl.o kernel_mod-kern_i386_efi_init.o kernel_mod-= kern_parser.o kernel_mod-kern_partition.o kernel_mod-kern_env.o kernel_mod-= symlist.o kernel_mod-kern_efi_efi.o kernel_mod-kern_efi_init.o kernel_mod-k= ern_efi_mm.o kernel_mod-term_efi_console.o kernel_mod-disk_efi_efidisk.o =20 mod-kernel.o: mod-kernel.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_mod_CFLAGS) -c = -o $@ $< @@ -521,9 +521,9 @@ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-normal.o: normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_m= od-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execut= e.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-norma= l_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod= -normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o norm= al_mod-normal_i386_setjmp.o +pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o normal_mo= d-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion= .o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-norm= al_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-nor= mal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o norm= al_mod-normal_script.o normal_mod-normal_i386_setjmp.o -rm -f $@ - $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ norm= al_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o= normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-norm= al_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod= -normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o norm= al_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_i386_= setjmp.o =20 mod-normal.o: mod-normal.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -c = -o $@ $< @@ -769,9 +769,9 @@ $(TARGET_CC) $(_chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-_chain.o: _chain_mod-loader_efi_chainloader.o +pre-_chain.o: $(_chain_mod_DEPENDENCIES) _chain_mod-loader_efi_chainloader= .o -rm -f $@ - $(TARGET_CC) $(_chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(_chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ _cha= in_mod-loader_efi_chainloader.o =20 mod-_chain.o: mod-_chain.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_chain_mod_CFLAGS) -c = -o $@ $< @@ -821,9 +821,9 @@ $(TARGET_CC) $(chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-chain.o: chain_mod-loader_efi_chainloader_normal.o +pre-chain.o: $(chain_mod_DEPENDENCIES) chain_mod-loader_efi_chainloader_no= rmal.o -rm -f $@ - $(TARGET_CC) $(chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ chain= _mod-loader_efi_chainloader_normal.o =20 mod-chain.o: mod-chain.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(chain_mod_CFLAGS) -c -= o $@ $< @@ -873,9 +873,9 @@ $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-_linux.o: _linux_mod-loader_i386_efi_linux.o +pre-_linux.o: $(_linux_mod_DEPENDENCIES) _linux_mod-loader_i386_efi_linux.o -rm -f $@ - $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ _lin= ux_mod-loader_i386_efi_linux.o =20 mod-_linux.o: mod-_linux.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_linux_mod_CFLAGS) -c = -o $@ $< @@ -925,9 +925,9 @@ $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-linux.o: linux_mod-loader_i386_efi_linux_normal.o +pre-linux.o: $(linux_mod_DEPENDENCIES) linux_mod-loader_i386_efi_linux_nor= mal.o -rm -f $@ - $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ linux= _mod-loader_i386_efi_linux_normal.o =20 mod-linux.o: mod-linux.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -c -= o $@ $< Index: conf/i386-pc.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/grub/grub2/conf/i386-pc.mk,v retrieving revision 1.77 diff -u -r1.77 i386-pc.mk --- conf/i386-pc.mk 14 Sep 2006 19:04:18 -0000 1.77 +++ conf/i386-pc.mk 21 Sep 2006 14:33:00 -0000 @@ -191,8 +191,8 @@ CLEANFILES +=3D grub-mkimage grub_mkimage-util_i386_pc_grub_mkimage.o grub= _mkimage-util_misc.o grub_mkimage-util_resolve.o MOSTLYCLEANFILES +=3D grub_mkimage-util_i386_pc_grub_mkimage.d grub_mkimag= e-util_misc.d grub_mkimage-util_resolve.d =20 -grub-mkimage: grub_mkimage-util_i386_pc_grub_mkimage.o grub_mkimage-util_m= isc.o grub_mkimage-util_resolve.o - $(CC) -o $@ $^ $(LDFLAGS) $(grub_mkimage_LDFLAGS) +grub-mkimage: $(grub_mkimage_DEPENDENCIES) grub_mkimage-util_i386_pc_grub_= mkimage.o grub_mkimage-util_misc.o grub_mkimage-util_resolve.o + $(CC) -o $@ grub_mkimage-util_i386_pc_grub_mkimage.o grub_mkimage-util_mi= sc.o grub_mkimage-util_resolve.o $(LDFLAGS) $(grub_mkimage_LDFLAGS) =20 grub_mkimage-util_i386_pc_grub_mkimage.o: util/i386/pc/grub-mkimage.c $(CC) -Iutil/i386/pc -I$(srcdir)/util/i386/pc $(CPPFLAGS) $(CFLAGS) -DGRU= B_UTIL=3D1 $(grub_mkimage_CFLAGS) -MD -c -o $@ $< @@ -218,8 +218,8 @@ CLEANFILES +=3D grub-setup grub_setup-util_i386_pc_grub_setup.o grub_setup= -util_i386_pc_biosdisk.o grub_setup-util_misc.o grub_setup-util_i386_pc_get= root.o grub_setup-kern_device.o grub_setup-kern_disk.o grub_setup-kern_err.= o grub_setup-kern_misc.o grub_setup-fs_fat.o grub_setup-fs_ext2.o grub_setu= p-fs_xfs.o grub_setup-fs_affs.o grub_setup-fs_sfs.o grub_setup-kern_parser.= o grub_setup-kern_partition.o grub_setup-partmap_pc.o grub_setup-fs_ufs.o g= rub_setup-fs_minix.o grub_setup-fs_hfs.o grub_setup-fs_jfs.o grub_setup-fs_= hfsplus.o grub_setup-kern_file.o grub_setup-kern_fs.o grub_setup-kern_env.o= grub_setup-fs_fshelp.o MOSTLYCLEANFILES +=3D grub_setup-util_i386_pc_grub_setup.d grub_setup-util= _i386_pc_biosdisk.d grub_setup-util_misc.d grub_setup-util_i386_pc_getroot.= d grub_setup-kern_device.d grub_setup-kern_disk.d grub_setup-kern_err.d gru= b_setup-kern_misc.d grub_setup-fs_fat.d grub_setup-fs_ext2.d grub_setup-fs_= xfs.d grub_setup-fs_affs.d grub_setup-fs_sfs.d grub_setup-kern_parser.d gru= b_setup-kern_partition.d grub_setup-partmap_pc.d grub_setup-fs_ufs.d grub_s= etup-fs_minix.d grub_setup-fs_hfs.d grub_setup-fs_jfs.d grub_setup-fs_hfspl= us.d grub_setup-kern_file.d grub_setup-kern_fs.d grub_setup-kern_env.d grub= _setup-fs_fshelp.d =20 -grub-setup: grub_setup-util_i386_pc_grub_setup.o grub_setup-util_i386_pc_b= iosdisk.o grub_setup-util_misc.o grub_setup-util_i386_pc_getroot.o grub_set= up-kern_device.o grub_setup-kern_disk.o grub_setup-kern_err.o grub_setup-ke= rn_misc.o grub_setup-fs_fat.o grub_setup-fs_ext2.o grub_setup-fs_xfs.o grub= _setup-fs_affs.o grub_setup-fs_sfs.o grub_setup-kern_parser.o grub_setup-ke= rn_partition.o grub_setup-partmap_pc.o grub_setup-fs_ufs.o grub_setup-fs_mi= nix.o grub_setup-fs_hfs.o grub_setup-fs_jfs.o grub_setup-fs_hfsplus.o grub_= setup-kern_file.o grub_setup-kern_fs.o grub_setup-kern_env.o grub_setup-fs_= fshelp.o - $(CC) -o $@ $^ $(LDFLAGS) $(grub_setup_LDFLAGS) +grub-setup: $(grub_setup_DEPENDENCIES) grub_setup-util_i386_pc_grub_setup.= o grub_setup-util_i386_pc_biosdisk.o grub_setup-util_misc.o grub_setup-util= _i386_pc_getroot.o grub_setup-kern_device.o grub_setup-kern_disk.o grub_set= up-kern_err.o grub_setup-kern_misc.o grub_setup-fs_fat.o grub_setup-fs_ext2= .o grub_setup-fs_xfs.o grub_setup-fs_affs.o grub_setup-fs_sfs.o grub_setup-= kern_parser.o grub_setup-kern_partition.o grub_setup-partmap_pc.o grub_setu= p-fs_ufs.o grub_setup-fs_minix.o grub_setup-fs_hfs.o grub_setup-fs_jfs.o gr= ub_setup-fs_hfsplus.o grub_setup-kern_file.o grub_setup-kern_fs.o grub_setu= p-kern_env.o grub_setup-fs_fshelp.o + $(CC) -o $@ grub_setup-util_i386_pc_grub_setup.o grub_setup-util_i386_pc_= biosdisk.o grub_setup-util_misc.o grub_setup-util_i386_pc_getroot.o grub_se= tup-kern_device.o grub_setup-kern_disk.o grub_setup-kern_err.o grub_setup-k= ern_misc.o grub_setup-fs_fat.o grub_setup-fs_ext2.o grub_setup-fs_xfs.o gru= b_setup-fs_affs.o grub_setup-fs_sfs.o grub_setup-kern_parser.o grub_setup-k= ern_partition.o grub_setup-partmap_pc.o grub_setup-fs_ufs.o grub_setup-fs_m= inix.o grub_setup-fs_hfs.o grub_setup-fs_jfs.o grub_setup-fs_hfsplus.o grub= _setup-kern_file.o grub_setup-kern_fs.o grub_setup-kern_env.o grub_setup-fs= _fshelp.o $(LDFLAGS) $(grub_setup_LDFLAGS) =20 grub_setup-util_i386_pc_grub_setup.o: util/i386/pc/grub-setup.c $(CC) -Iutil/i386/pc -I$(srcdir)/util/i386/pc $(CPPFLAGS) $(CFLAGS) -DGRU= B_UTIL=3D1 $(grub_setup_CFLAGS) -MD -c -o $@ $< @@ -327,8 +327,8 @@ CLEANFILES +=3D grub-mkdevicemap grub_mkdevicemap-util_i386_pc_grub_mkdevi= cemap.o grub_mkdevicemap-util_misc.o MOSTLYCLEANFILES +=3D grub_mkdevicemap-util_i386_pc_grub_mkdevicemap.d gru= b_mkdevicemap-util_misc.d =20 -grub-mkdevicemap: grub_mkdevicemap-util_i386_pc_grub_mkdevicemap.o grub_mk= devicemap-util_misc.o - $(CC) -o $@ $^ $(LDFLAGS) $(grub_mkdevicemap_LDFLAGS) +grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES) grub_mkdevicemap-util_i= 386_pc_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o + $(CC) -o $@ grub_mkdevicemap-util_i386_pc_grub_mkdevicemap.o grub_mkdevic= emap-util_misc.o $(LDFLAGS) $(grub_mkdevicemap_LDFLAGS) =20 grub_mkdevicemap-util_i386_pc_grub_mkdevicemap.o: util/i386/pc/grub-mkdevi= cemap.c $(CC) -Iutil/i386/pc -I$(srcdir)/util/i386/pc $(CPPFLAGS) $(CFLAGS) -DGRU= B_UTIL=3D1 $(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $< @@ -349,8 +349,8 @@ CLEANFILES +=3D grub-probefs grub_probefs-util_i386_pc_grub_probefs.o grub= _probefs-util_i386_pc_biosdisk.o grub_probefs-util_misc.o grub_probefs-util= _i386_pc_getroot.o grub_probefs-kern_device.o grub_probefs-kern_disk.o grub= _probefs-kern_err.o grub_probefs-kern_misc.o grub_probefs-fs_fat.o grub_pro= befs-fs_ext2.o grub_probefs-kern_parser.o grub_probefs-kern_partition.o gru= b_probefs-partmap_pc.o grub_probefs-fs_ufs.o grub_probefs-fs_minix.o grub_p= robefs-fs_hfs.o grub_probefs-fs_jfs.o grub_probefs-kern_fs.o grub_probefs-k= ern_env.o grub_probefs-fs_fshelp.o grub_probefs-fs_xfs.o grub_probefs-fs_af= fs.o grub_probefs-fs_sfs.o grub_probefs-fs_hfsplus.o MOSTLYCLEANFILES +=3D grub_probefs-util_i386_pc_grub_probefs.d grub_probef= s-util_i386_pc_biosdisk.d grub_probefs-util_misc.d grub_probefs-util_i386_p= c_getroot.d grub_probefs-kern_device.d grub_probefs-kern_disk.d grub_probef= s-kern_err.d grub_probefs-kern_misc.d grub_probefs-fs_fat.d grub_probefs-fs= _ext2.d grub_probefs-kern_parser.d grub_probefs-kern_partition.d grub_probe= fs-partmap_pc.d grub_probefs-fs_ufs.d grub_probefs-fs_minix.d grub_probefs-= fs_hfs.d grub_probefs-fs_jfs.d grub_probefs-kern_fs.d grub_probefs-kern_env= .d grub_probefs-fs_fshelp.d grub_probefs-fs_xfs.d grub_probefs-fs_affs.d gr= ub_probefs-fs_sfs.d grub_probefs-fs_hfsplus.d =20 -grub-probefs: grub_probefs-util_i386_pc_grub_probefs.o grub_probefs-util_i= 386_pc_biosdisk.o grub_probefs-util_misc.o grub_probefs-util_i386_pc_getroo= t.o grub_probefs-kern_device.o grub_probefs-kern_disk.o grub_probefs-kern_e= rr.o grub_probefs-kern_misc.o grub_probefs-fs_fat.o grub_probefs-fs_ext2.o = grub_probefs-kern_parser.o grub_probefs-kern_partition.o grub_probefs-partm= ap_pc.o grub_probefs-fs_ufs.o grub_probefs-fs_minix.o grub_probefs-fs_hfs.o= grub_probefs-fs_jfs.o grub_probefs-kern_fs.o grub_probefs-kern_env.o grub_= probefs-fs_fshelp.o grub_probefs-fs_xfs.o grub_probefs-fs_affs.o grub_probe= fs-fs_sfs.o grub_probefs-fs_hfsplus.o - $(CC) -o $@ $^ $(LDFLAGS) $(grub_probefs_LDFLAGS) +grub-probefs: $(grub_probefs_DEPENDENCIES) grub_probefs-util_i386_pc_grub_= probefs.o grub_probefs-util_i386_pc_biosdisk.o grub_probefs-util_misc.o gru= b_probefs-util_i386_pc_getroot.o grub_probefs-kern_device.o grub_probefs-ke= rn_disk.o grub_probefs-kern_err.o grub_probefs-kern_misc.o grub_probefs-fs_= fat.o grub_probefs-fs_ext2.o grub_probefs-kern_parser.o grub_probefs-kern_p= artition.o grub_probefs-partmap_pc.o grub_probefs-fs_ufs.o grub_probefs-fs_= minix.o grub_probefs-fs_hfs.o grub_probefs-fs_jfs.o grub_probefs-kern_fs.o = grub_probefs-kern_env.o grub_probefs-fs_fshelp.o grub_probefs-fs_xfs.o grub= _probefs-fs_affs.o grub_probefs-fs_sfs.o grub_probefs-fs_hfsplus.o + $(CC) -o $@ grub_probefs-util_i386_pc_grub_probefs.o grub_probefs-util_i3= 86_pc_biosdisk.o grub_probefs-util_misc.o grub_probefs-util_i386_pc_getroot= .o grub_probefs-kern_device.o grub_probefs-kern_disk.o grub_probefs-kern_er= r.o grub_probefs-kern_misc.o grub_probefs-fs_fat.o grub_probefs-fs_ext2.o g= rub_probefs-kern_parser.o grub_probefs-kern_partition.o grub_probefs-partma= p_pc.o grub_probefs-fs_ufs.o grub_probefs-fs_minix.o grub_probefs-fs_hfs.o = grub_probefs-fs_jfs.o grub_probefs-kern_fs.o grub_probefs-kern_env.o grub_p= robefs-fs_fshelp.o grub_probefs-fs_xfs.o grub_probefs-fs_affs.o grub_probef= s-fs_sfs.o grub_probefs-fs_hfsplus.o $(LDFLAGS) $(grub_probefs_LDFLAGS) =20 grub_probefs-util_i386_pc_grub_probefs.o: util/i386/pc/grub-probefs.c $(CC) -Iutil/i386/pc -I$(srcdir)/util/i386/pc $(CPPFLAGS) $(CFLAGS) -DGRU= B_UTIL=3D1 $(grub_probefs_CFLAGS) -MD -c -o $@ $< @@ -450,6 +450,8 @@ =20 =20 # For grub-emu. +grub_emu_DEPENDENCIES =3D grub_script.tab.c grub_script.tab.h \ + grub_modules_init.h grub_emu_SOURCES =3D commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/help.c \ commands/terminal.c commands/ls.c commands/test.c \ @@ -474,8 +476,8 @@ CLEANFILES +=3D grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o = grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_he= lp.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_= test.o grub_emu-commands_search.o grub_emu-commands_blocklist.o grub_emu-co= mmands_i386_pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loop= back.o grub_emu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_= fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu= -fs_minix.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-= fs_hfsplus.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o= grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-normal= _execute.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o = grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-k= ern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o grub_emu-= kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cm= dline.o grub_emu-normal_command.o grub_emu-normal_function.o grub_emu-norma= l_completion.o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-norma= l_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-par= tmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partma= p_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-util_conso= le.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_bi= osdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o grub_= emu-grub_emu_init.o MOSTLYCLEANFILES +=3D grub_emu-commands_boot.d grub_emu-commands_cat.d gru= b_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_help.= d grub_emu-commands_terminal.d grub_emu-commands_ls.d grub_emu-commands_tes= t.d grub_emu-commands_search.d grub_emu-commands_blocklist.d grub_emu-comma= nds_i386_pc_halt.d grub_emu-commands_i386_pc_reboot.d grub_emu-disk_loopbac= k.d grub_emu-fs_affs.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_fsh= elp.d grub_emu-fs_hfs.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-fs= _minix.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-fs_= hfsplus.d grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d gr= ub_emu-kern_dl.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-normal_ex= ecute.d grub_emu-kern_file.d grub_emu-kern_fs.d grub_emu-normal_lexer.d gru= b_emu-kern_loader.d grub_emu-kern_main.d grub_emu-kern_misc.d grub_emu-kern= _parser.d grub_emu-grub_script_tab.d grub_emu-kern_partition.d grub_emu-ker= n_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdli= ne.d grub_emu-normal_command.d grub_emu-normal_function.d grub_emu-normal_c= ompletion.d grub_emu-normal_main.d grub_emu-normal_menu.d grub_emu-normal_m= enu_entry.d grub_emu-normal_misc.d grub_emu-normal_script.d grub_emu-partma= p_amiga.d grub_emu-partmap_apple.d grub_emu-partmap_pc.d grub_emu-partmap_s= un.d grub_emu-partmap_acorn.d grub_emu-partmap_gpt.d grub_emu-util_console.= d grub_emu-util_grub_emu.d grub_emu-util_misc.d grub_emu-util_i386_pc_biosd= isk.d grub_emu-util_i386_pc_getroot.d grub_emu-util_i386_pc_misc.d grub_emu= -grub_emu_init.d =20 -grub-emu: grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-comman= ds_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_emu-c= ommands_terminal.o grub_emu-commands_ls.o grub_emu-commands_test.o grub_emu= -commands_search.o grub_emu-commands_blocklist.o grub_emu-commands_i386_pc_= halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loopback.o grub_emu= -fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub_e= mu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o gru= b_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_hfsplus.o gr= ub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-kern_= dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-normal_execute.o grub= _emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o grub_emu-kern_l= oader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o gr= ub_emu-grub_script_tab.o grub_emu-kern_partition.o grub_emu-kern_rescue.o g= rub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_em= u-normal_command.o grub_emu-normal_function.o grub_emu-normal_completion.o = grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o = grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o gr= ub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_em= u-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-util_console.o grub_emu-u= til_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_e= mu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-grub_emu_in= it.o - $(CC) -o $@ $^ $(LDFLAGS) $(grub_emu_LDFLAGS) +grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o grub_emu-comma= nds_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-c= ommands_help.o grub_emu-commands_terminal.o grub_emu-commands_ls.o grub_emu= -commands_test.o grub_emu-commands_search.o grub_emu-commands_blocklist.o g= rub_emu-commands_i386_pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu= -disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o gr= ub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.= o grub_emu-fs_minix.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o= grub_emu-fs_hfsplus.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-k= ern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_= emu-normal_execute.o grub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-norma= l_lexer.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o = grub_emu-kern_parser.o grub_emu-grub_script_tab.o grub_emu-kern_partition.o= grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu= -normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_function.o grub= _emu-normal_completion.o grub_emu-normal_main.o grub_emu-normal_menu.o grub= _emu-normal_menu_entry.o grub_emu-normal_misc.o grub_emu-normal_script.o gr= ub_emu-partmap_amiga.o grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_= emu-partmap_sun.o grub_emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-= util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_= i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_mi= sc.o grub_emu-grub_emu_init.o + $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-com= mands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_em= u-commands_terminal.o grub_emu-commands_ls.o grub_emu-commands_test.o grub_= emu-commands_search.o grub_emu-commands_blocklist.o grub_emu-commands_i386_= pc_halt.o grub_emu-commands_i386_pc_reboot.o grub_emu-disk_loopback.o grub_= emu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o gru= b_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o = grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_hfsplus.o= grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-ke= rn_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-normal_execute.o g= rub_emu-kern_file.o grub_emu-kern_fs.o grub_emu-normal_lexer.o grub_emu-ker= n_loader.o grub_emu-kern_main.o grub_emu-kern_misc.o grub_emu-kern_parser.o= grub_emu-grub_script_tab.o grub_emu-kern_partition.o grub_emu-kern_rescue.= o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub= _emu-normal_command.o grub_emu-normal_function.o grub_emu-normal_completion= .o grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry= .o grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o= grub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub= _emu-partmap_acorn.o grub_emu-partmap_gpt.o grub_emu-util_console.o grub_em= u-util_grub_emu.o grub_emu-util_misc.o grub_emu-util_i386_pc_biosdisk.o gru= b_emu-util_i386_pc_getroot.o grub_emu-util_i386_pc_misc.o grub_emu-grub_emu= _init.o $(LDFLAGS) $(grub_emu_LDFLAGS) =20 grub_emu-commands_boot.o: commands/boot.c $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL= =3D1 $(grub_emu_CFLAGS) -MD -c -o $@ $< @@ -777,9 +779,9 @@ $(TARGET_CC) $(_chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-_chain.o: _chain_mod-loader_i386_pc_chainloader.o +pre-_chain.o: $(_chain_mod_DEPENDENCIES) _chain_mod-loader_i386_pc_chainlo= ader.o -rm -f $@ - $(TARGET_CC) $(_chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(_chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ _cha= in_mod-loader_i386_pc_chainloader.o =20 mod-_chain.o: mod-_chain.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_chain_mod_CFLAGS) -c = -o $@ $< @@ -829,9 +831,9 @@ $(TARGET_CC) $(chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-chain.o: chain_mod-loader_i386_pc_chainloader_normal.o +pre-chain.o: $(chain_mod_DEPENDENCIES) chain_mod-loader_i386_pc_chainloade= r_normal.o -rm -f $@ - $(TARGET_CC) $(chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(chain_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ chain= _mod-loader_i386_pc_chainloader_normal.o =20 mod-chain.o: mod-chain.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(chain_mod_CFLAGS) -c -= o $@ $< @@ -881,9 +883,9 @@ $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-_linux.o: _linux_mod-loader_i386_pc_linux.o +pre-_linux.o: $(_linux_mod_DEPENDENCIES) _linux_mod-loader_i386_pc_linux.o -rm -f $@ - $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ _lin= ux_mod-loader_i386_pc_linux.o =20 mod-_linux.o: mod-_linux.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_linux_mod_CFLAGS) -c = -o $@ $< @@ -933,9 +935,9 @@ $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-linux.o: linux_mod-loader_i386_pc_linux_normal.o +pre-linux.o: $(linux_mod_DEPENDENCIES) linux_mod-loader_i386_pc_linux_norm= al.o -rm -f $@ - $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ linux= _mod-loader_i386_pc_linux_normal.o =20 mod-linux.o: mod-linux.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -c -= o $@ $< @@ -971,6 +973,7 @@ linux_mod_LDFLAGS =3D $(COMMON_LDFLAGS) =20 # For normal.mod. +normal_mod_DEPENDENCIES =3D grub_script.tab.c grub_script.tab.h normal_mod_SOURCES =3D normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ @@ -989,9 +992,9 @@ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-normal.o: normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_m= od-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execut= e.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-norma= l_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod= -normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o norm= al_mod-normal_i386_setjmp.o +pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o normal_mo= d-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion= .o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-norm= al_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-nor= mal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o norm= al_mod-normal_script.o normal_mod-normal_i386_setjmp.o -rm -f $@ - $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ norm= al_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o= normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-norm= al_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod= -normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o norm= al_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_i386_= setjmp.o =20 mod-normal.o: mod-normal.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -c = -o $@ $< @@ -1237,9 +1240,9 @@ $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-reboot.o: reboot_mod-commands_i386_pc_reboot.o +pre-reboot.o: $(reboot_mod_DEPENDENCIES) reboot_mod-commands_i386_pc_reboo= t.o -rm -f $@ - $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ rebo= ot_mod-commands_i386_pc_reboot.o =20 mod-reboot.o: mod-reboot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -c = -o $@ $< @@ -1289,9 +1292,9 @@ $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-halt.o: halt_mod-commands_i386_pc_halt.o +pre-halt.o: $(halt_mod_DEPENDENCIES) halt_mod-commands_i386_pc_halt.o -rm -f $@ - $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ halt_m= od-commands_i386_pc_halt.o =20 mod-halt.o: mod-halt.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -c -o= $@ $< @@ -1346,9 +1349,9 @@ $(TARGET_CC) $(_multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-_multiboot.o: _multiboot_mod-loader_i386_pc_multiboot.o +pre-_multiboot.o: $(_multiboot_mod_DEPENDENCIES) _multiboot_mod-loader_i38= 6_pc_multiboot.o -rm -f $@ - $(TARGET_CC) $(_multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = $^ + $(TARGET_CC) $(_multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = _multiboot_mod-loader_i386_pc_multiboot.o =20 mod-_multiboot.o: mod-_multiboot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_multiboot_mod_CFLAGS)= -c -o $@ $< @@ -1398,9 +1401,9 @@ $(TARGET_CC) $(multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-multiboot.o: multiboot_mod-loader_i386_pc_multiboot_normal.o +pre-multiboot.o: $(multiboot_mod_DEPENDENCIES) multiboot_mod-loader_i386_p= c_multiboot_normal.o -rm -f $@ - $(TARGET_CC) $(multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(multiboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ m= ultiboot_mod-loader_i386_pc_multiboot_normal.o =20 mod-multiboot.o: mod-multiboot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(multiboot_mod_CFLAGS) = -c -o $@ $< @@ -1451,9 +1454,9 @@ $(TARGET_CC) $(vbe_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-vbe.o: vbe_mod-video_i386_pc_vbe.o vbe_mod-video_i386_pc_vbeblit.o vbe= _mod-video_i386_pc_vbefill.o vbe_mod-video_i386_pc_vbeutil.o +pre-vbe.o: $(vbe_mod_DEPENDENCIES) vbe_mod-video_i386_pc_vbe.o vbe_mod-vid= eo_i386_pc_vbeblit.o vbe_mod-video_i386_pc_vbefill.o vbe_mod-video_i386_pc_= vbeutil.o -rm -f $@ - $(TARGET_CC) $(vbe_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(vbe_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ vbe_mod= -video_i386_pc_vbe.o vbe_mod-video_i386_pc_vbeblit.o vbe_mod-video_i386_pc_= vbefill.o vbe_mod-video_i386_pc_vbeutil.o =20 mod-vbe.o: mod-vbe.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(vbe_mod_CFLAGS) -c -o = $@ $< @@ -1548,9 +1551,9 @@ $(TARGET_CC) $(vbeinfo_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-vbeinfo.o: vbeinfo_mod-commands_i386_pc_vbeinfo.o +pre-vbeinfo.o: $(vbeinfo_mod_DEPENDENCIES) vbeinfo_mod-commands_i386_pc_vb= einfo.o -rm -f $@ - $(TARGET_CC) $(vbeinfo_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(vbeinfo_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ vbe= info_mod-commands_i386_pc_vbeinfo.o =20 mod-vbeinfo.o: mod-vbeinfo.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(vbeinfo_mod_CFLAGS) -c= -o $@ $< @@ -1600,9 +1603,9 @@ $(TARGET_CC) $(vbetest_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-vbetest.o: vbetest_mod-commands_i386_pc_vbetest.o +pre-vbetest.o: $(vbetest_mod_DEPENDENCIES) vbetest_mod-commands_i386_pc_vb= etest.o -rm -f $@ - $(TARGET_CC) $(vbetest_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(vbetest_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ vbe= test_mod-commands_i386_pc_vbetest.o =20 mod-vbetest.o: mod-vbetest.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(vbetest_mod_CFLAGS) -c= -o $@ $< @@ -1652,9 +1655,9 @@ $(TARGET_CC) $(play_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-play.o: play_mod-commands_i386_pc_play.o +pre-play.o: $(play_mod_DEPENDENCIES) play_mod-commands_i386_pc_play.o -rm -f $@ - $(TARGET_CC) $(play_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(play_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ play_m= od-commands_i386_pc_play.o =20 mod-play.o: mod-play.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(play_mod_CFLAGS) -c -o= $@ $< @@ -1704,9 +1707,9 @@ $(TARGET_CC) $(video_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-video.o: video_mod-video_video.o +pre-video.o: $(video_mod_DEPENDENCIES) video_mod-video_video.o -rm -f $@ - $(TARGET_CC) $(video_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(video_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ video= _mod-video_video.o =20 mod-video.o: mod-video.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(video_mod_CFLAGS) -c -= o $@ $< @@ -1756,9 +1759,9 @@ $(TARGET_CC) $(gfxterm_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-gfxterm.o: gfxterm_mod-term_gfxterm.o +pre-gfxterm.o: $(gfxterm_mod_DEPENDENCIES) gfxterm_mod-term_gfxterm.o -rm -f $@ - $(TARGET_CC) $(gfxterm_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(gfxterm_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ gfx= term_mod-term_gfxterm.o =20 mod-gfxterm.o: mod-gfxterm.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gfxterm_mod_CFLAGS) -c= -o $@ $< @@ -1808,9 +1811,9 @@ $(TARGET_CC) $(videotest_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-videotest.o: videotest_mod-commands_videotest.o +pre-videotest.o: $(videotest_mod_DEPENDENCIES) videotest_mod-commands_vide= otest.o -rm -f $@ - $(TARGET_CC) $(videotest_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(videotest_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ v= ideotest_mod-commands_videotest.o =20 mod-videotest.o: mod-videotest.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(videotest_mod_CFLAGS) = -c -o $@ $< @@ -1860,9 +1863,9 @@ $(TARGET_CC) $(bitmap_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-bitmap.o: bitmap_mod-video_bitmap.o +pre-bitmap.o: $(bitmap_mod_DEPENDENCIES) bitmap_mod-video_bitmap.o -rm -f $@ - $(TARGET_CC) $(bitmap_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(bitmap_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ bitm= ap_mod-video_bitmap.o =20 mod-bitmap.o: mod-bitmap.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(bitmap_mod_CFLAGS) -c = -o $@ $< @@ -1912,9 +1915,9 @@ $(TARGET_CC) $(tga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-tga.o: tga_mod-video_readers_tga.o +pre-tga.o: $(tga_mod_DEPENDENCIES) tga_mod-video_readers_tga.o -rm -f $@ - $(TARGET_CC) $(tga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(tga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ tga_mod= -video_readers_tga.o =20 mod-tga.o: mod-tga.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(tga_mod_CFLAGS) -c -o = $@ $< Index: conf/i386-pc.rmk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/grub/grub2/conf/i386-pc.rmk,v retrieving revision 1.68 diff -u -r1.68 i386-pc.rmk --- conf/i386-pc.rmk 14 Sep 2006 19:04:18 -0000 1.68 +++ conf/i386-pc.rmk 21 Sep 2006 14:33:00 -0000 @@ -78,6 +78,8 @@ fs/xfs.c fs/affs.c fs/sfs.c fs/hfsplus.c =20 # For grub-emu. +grub_emu_DEPENDENCIES =3D grub_script.tab.c grub_script.tab.h \ + grub_modules_init.h grub_emu_SOURCES =3D commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/help.c \ commands/terminal.c commands/ls.c commands/test.c \ @@ -135,6 +137,7 @@ linux_mod_LDFLAGS =3D $(COMMON_LDFLAGS) =20 # For normal.mod. +normal_mod_DEPENDENCIES =3D grub_script.tab.c grub_script.tab.h normal_mod_SOURCES =3D normal/arg.c normal/cmdline.c normal/command.c \ normal/completion.c normal/execute.c \ normal/function.c normal/lexer.c normal/main.c normal/menu.c \ Index: conf/powerpc-ieee1275.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/grub/grub2/conf/powerpc-ieee1275.mk,v retrieving revision 1.66 diff -u -r1.66 powerpc-ieee1275.mk --- conf/powerpc-ieee1275.mk 15 Aug 2006 12:29:08 -0000 1.66 +++ conf/powerpc-ieee1275.mk 21 Sep 2006 14:33:00 -0000 @@ -35,8 +35,8 @@ CLEANFILES +=3D grub-mkimage grub_mkimage-util_powerpc_ieee1275_grub_mkima= ge.o grub_mkimage-util_misc.o grub_mkimage-util_resolve.o MOSTLYCLEANFILES +=3D grub_mkimage-util_powerpc_ieee1275_grub_mkimage.d gr= ub_mkimage-util_misc.d grub_mkimage-util_resolve.d =20 -grub-mkimage: grub_mkimage-util_powerpc_ieee1275_grub_mkimage.o grub_mkima= ge-util_misc.o grub_mkimage-util_resolve.o - $(CC) -o $@ $^ $(LDFLAGS) $(grub_mkimage_LDFLAGS) +grub-mkimage: $(grub_mkimage_DEPENDENCIES) grub_mkimage-util_powerpc_ieee1= 275_grub_mkimage.o grub_mkimage-util_misc.o grub_mkimage-util_resolve.o + $(CC) -o $@ grub_mkimage-util_powerpc_ieee1275_grub_mkimage.o grub_mkimag= e-util_misc.o grub_mkimage-util_resolve.o $(LDFLAGS) $(grub_mkimage_LDFLAGS) =20 grub_mkimage-util_powerpc_ieee1275_grub_mkimage.o: util/powerpc/ieee1275/g= rub-mkimage.c $(CC) -Iutil/powerpc/ieee1275 -I$(srcdir)/util/powerpc/ieee1275 $(CPPFLAG= S) $(CFLAGS) -DGRUB_UTIL=3D1 $(grub_mkimage_CFLAGS) -MD -c -o $@ $< @@ -76,8 +76,8 @@ CLEANFILES +=3D grub-emu grub_emu-commands_boot.o grub_emu-commands_cat.o = grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_he= lp.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub_emu-comma= nds_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-co= mmands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_lo= opback.o grub_emu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-f= s_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_e= mu-fs_minix.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_em= u-fs_hfsplus.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk= .o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern= _file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub= _emu-kern_misc.o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-= kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cm= dline.o grub_emu-normal_command.o grub_emu-normal_completion.o grub_emu-nor= mal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-n= ormal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-n= ormal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o grub_emu-par= tmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_= acorn.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc= .o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_em= u-util_powerpc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu= _init.o MOSTLYCLEANFILES +=3D grub_emu-commands_boot.d grub_emu-commands_cat.d gru= b_emu-commands_cmp.d grub_emu-commands_configfile.d grub_emu-commands_help.= d grub_emu-commands_search.d grub_emu-commands_terminal.d grub_emu-commands= _test.d grub_emu-commands_ls.d grub_emu-commands_blocklist.d grub_emu-comma= nds_ieee1275_halt.d grub_emu-commands_ieee1275_reboot.d grub_emu-disk_loopb= ack.d grub_emu-fs_affs.d grub_emu-fs_ext2.d grub_emu-fs_fat.d grub_emu-fs_f= shelp.d grub_emu-fs_hfs.d grub_emu-fs_iso9660.d grub_emu-fs_jfs.d grub_emu-= fs_minix.d grub_emu-fs_sfs.d grub_emu-fs_ufs.d grub_emu-fs_xfs.d grub_emu-f= s_hfsplus.d grub_emu-io_gzio.d grub_emu-kern_device.d grub_emu-kern_disk.d = grub_emu-kern_dl.d grub_emu-kern_env.d grub_emu-kern_err.d grub_emu-kern_fi= le.d grub_emu-kern_fs.d grub_emu-kern_loader.d grub_emu-kern_main.d grub_em= u-kern_misc.d grub_emu-kern_parser.d grub_emu-kern_partition.d grub_emu-ker= n_rescue.d grub_emu-kern_term.d grub_emu-normal_arg.d grub_emu-normal_cmdli= ne.d grub_emu-normal_command.d grub_emu-normal_completion.d grub_emu-normal= _execute.d grub_emu-normal_function.d grub_emu-normal_lexer.d grub_emu-norm= al_main.d grub_emu-normal_menu.d grub_emu-normal_menu_entry.d grub_emu-norm= al_misc.d grub_emu-normal_script.d grub_emu-partmap_amiga.d grub_emu-partma= p_apple.d grub_emu-partmap_pc.d grub_emu-partmap_sun.d grub_emu-partmap_aco= rn.d grub_emu-util_console.d grub_emu-util_grub_emu.d grub_emu-util_misc.d = grub_emu-util_i386_pc_biosdisk.d grub_emu-util_i386_pc_getroot.d grub_emu-u= til_powerpc_ieee1275_misc.d grub_emu-grub_script_tab.d grub_emu-grub_emu_in= it.d =20 -grub-emu: grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-comman= ds_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_emu-c= ommands_search.o grub_emu-commands_terminal.o grub_emu-commands_test.o grub= _emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-commands_ieee1275= _halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o grub_e= mu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o grub= _emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.o g= rub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_hfsplus.o = grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-ker= n_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub_em= u-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_misc.= o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.o g= rub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub_em= u-normal_command.o grub_emu-normal_completion.o grub_emu-normal_execute.o g= rub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o gr= ub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o gr= ub_emu-normal_script.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o gr= ub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub_em= u-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-uti= l_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_powerpc_= ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o - $(CC) -o $@ $^ $(LDFLAGS) $(grub_emu_LDFLAGS) +grub-emu: $(grub_emu_DEPENDENCIES) grub_emu-commands_boot.o grub_emu-comma= nds_cat.o grub_emu-commands_cmp.o grub_emu-commands_configfile.o grub_emu-c= ommands_help.o grub_emu-commands_search.o grub_emu-commands_terminal.o grub= _emu-commands_test.o grub_emu-commands_ls.o grub_emu-commands_blocklist.o g= rub_emu-commands_ieee1275_halt.o grub_emu-commands_ieee1275_reboot.o grub_e= mu-disk_loopback.o grub_emu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o = grub_emu-fs_fshelp.o grub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jf= s.o grub_emu-fs_minix.o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs= .o grub_emu-fs_hfsplus.o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu= -kern_disk.o grub_emu-kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o gru= b_emu-kern_file.o grub_emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_m= ain.o grub_emu-kern_misc.o grub_emu-kern_parser.o grub_emu-kern_partition.o= grub_emu-kern_rescue.o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu= -normal_cmdline.o grub_emu-normal_command.o grub_emu-normal_completion.o gr= ub_emu-normal_execute.o grub_emu-normal_function.o grub_emu-normal_lexer.o = grub_emu-normal_main.o grub_emu-normal_menu.o grub_emu-normal_menu_entry.o = grub_emu-normal_misc.o grub_emu-normal_script.o grub_emu-partmap_amiga.o gr= ub_emu-partmap_apple.o grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_em= u-partmap_acorn.o grub_emu-util_console.o grub_emu-util_grub_emu.o grub_emu= -util_misc.o grub_emu-util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot= .o grub_emu-util_powerpc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_em= u-grub_emu_init.o + $(CC) -o $@ grub_emu-commands_boot.o grub_emu-commands_cat.o grub_emu-com= mands_cmp.o grub_emu-commands_configfile.o grub_emu-commands_help.o grub_em= u-commands_search.o grub_emu-commands_terminal.o grub_emu-commands_test.o g= rub_emu-commands_ls.o grub_emu-commands_blocklist.o grub_emu-commands_ieee1= 275_halt.o grub_emu-commands_ieee1275_reboot.o grub_emu-disk_loopback.o gru= b_emu-fs_affs.o grub_emu-fs_ext2.o grub_emu-fs_fat.o grub_emu-fs_fshelp.o g= rub_emu-fs_hfs.o grub_emu-fs_iso9660.o grub_emu-fs_jfs.o grub_emu-fs_minix.= o grub_emu-fs_sfs.o grub_emu-fs_ufs.o grub_emu-fs_xfs.o grub_emu-fs_hfsplus= .o grub_emu-io_gzio.o grub_emu-kern_device.o grub_emu-kern_disk.o grub_emu-= kern_dl.o grub_emu-kern_env.o grub_emu-kern_err.o grub_emu-kern_file.o grub= _emu-kern_fs.o grub_emu-kern_loader.o grub_emu-kern_main.o grub_emu-kern_mi= sc.o grub_emu-kern_parser.o grub_emu-kern_partition.o grub_emu-kern_rescue.= o grub_emu-kern_term.o grub_emu-normal_arg.o grub_emu-normal_cmdline.o grub= _emu-normal_command.o grub_emu-normal_completion.o grub_emu-normal_execute.= o grub_emu-normal_function.o grub_emu-normal_lexer.o grub_emu-normal_main.o= grub_emu-normal_menu.o grub_emu-normal_menu_entry.o grub_emu-normal_misc.o= grub_emu-normal_script.o grub_emu-partmap_amiga.o grub_emu-partmap_apple.o= grub_emu-partmap_pc.o grub_emu-partmap_sun.o grub_emu-partmap_acorn.o grub= _emu-util_console.o grub_emu-util_grub_emu.o grub_emu-util_misc.o grub_emu-= util_i386_pc_biosdisk.o grub_emu-util_i386_pc_getroot.o grub_emu-util_power= pc_ieee1275_misc.o grub_emu-grub_script_tab.o grub_emu-grub_emu_init.o $(LD= FLAGS) $(grub_emu_LDFLAGS) =20 grub_emu-commands_boot.o: commands/boot.c $(CC) -Icommands -I$(srcdir)/commands $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL= =3D1 $(grub_emu_CFLAGS) -MD -c -o $@ $< @@ -353,8 +353,8 @@ CLEANFILES +=3D kernel.elf kernel_elf-kern_powerpc_ieee1275_crt0.o kernel_= elf-kern_powerpc_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o kerne= l_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_el= f-kern_dl.o kernel_elf-kern_file.o kernel_elf-kern_fs.o kernel_elf-kern_err= .o kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o ker= nel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-kern_powerpc_ieee12= 75_init.o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_powerpc_ieee= 1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parser.o ke= rnel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_powerpc_dl.= o kernel_elf-kernel_elf_symlist.o kernel_elf-kern_powerpc_cache.o MOSTLYCLEANFILES +=3D kernel_elf-kern_powerpc_ieee1275_crt0.d kernel_elf-k= ern_powerpc_ieee1275_cmain.d kernel_elf-kern_ieee1275_ieee1275.d kernel_elf= -kern_main.d kernel_elf-kern_device.d kernel_elf-kern_disk.d kernel_elf-ker= n_dl.d kernel_elf-kern_file.d kernel_elf-kern_fs.d kernel_elf-kern_err.d ke= rnel_elf-kern_misc.d kernel_elf-kern_mm.d kernel_elf-kern_loader.d kernel_e= lf-kern_rescue.d kernel_elf-kern_term.d kernel_elf-kern_powerpc_ieee1275_in= it.d kernel_elf-term_ieee1275_ofconsole.d kernel_elf-kern_powerpc_ieee1275_= openfw.d kernel_elf-disk_ieee1275_ofdisk.d kernel_elf-kern_parser.d kernel_= elf-kern_partition.d kernel_elf-kern_env.d kernel_elf-kern_powerpc_dl.d ker= nel_elf-kernel_elf_symlist.d kernel_elf-kern_powerpc_cache.d =20 -kernel.elf: kernel_elf-kern_powerpc_ieee1275_crt0.o kernel_elf-kern_powerp= c_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main= .o kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_dl.o ker= nel_elf-kern_file.o kernel_elf-kern_fs.o kernel_elf-kern_err.o kernel_elf-k= ern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o kernel_elf-kern_re= scue.o kernel_elf-kern_term.o kernel_elf-kern_powerpc_ieee1275_init.o kerne= l_elf-term_ieee1275_ofconsole.o kernel_elf-kern_powerpc_ieee1275_openfw.o k= ernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parser.o kernel_elf-kern_p= artition.o kernel_elf-kern_env.o kernel_elf-kern_powerpc_dl.o kernel_elf-ke= rnel_elf_symlist.o kernel_elf-kern_powerpc_cache.o - $(TARGET_CC) -o $@ $^ $(TARGET_LDFLAGS) $(kernel_elf_LDFLAGS) +kernel.elf: $(kernel_elf_DEPENDENCIES) kernel_elf-kern_powerpc_ieee1275_cr= t0.o kernel_elf-kern_powerpc_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee= 1275.o kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk= .o kernel_elf-kern_dl.o kernel_elf-kern_file.o kernel_elf-kern_fs.o kernel_= elf-kern_err.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_= loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-kern_po= werpc_ieee1275_init.o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_= powerpc_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern= _parser.o kernel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern= _powerpc_dl.o kernel_elf-kernel_elf_symlist.o kernel_elf-kern_powerpc_cache= .o + $(TARGET_CC) -o $@ kernel_elf-kern_powerpc_ieee1275_crt0.o kernel_elf-ker= n_powerpc_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-k= ern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_= dl.o kernel_elf-kern_file.o kernel_elf-kern_fs.o kernel_elf-kern_err.o kern= el_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o kernel_elf= -kern_rescue.o kernel_elf-kern_term.o kernel_elf-kern_powerpc_ieee1275_init= .o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_powerpc_ieee1275_op= enfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parser.o kernel_el= f-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_powerpc_dl.o kerne= l_elf-kernel_elf_symlist.o kernel_elf-kern_powerpc_cache.o $(TARGET_LDFLAGS= ) $(kernel_elf_LDFLAGS) =20 kernel_elf-kern_powerpc_ieee1275_crt0.o: kern/powerpc/ieee1275/crt0.S $(TARGET_CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(= TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $< @@ -497,9 +497,9 @@ $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-_linux.o: _linux_mod-loader_powerpc_ieee1275_linux.o +pre-_linux.o: $(_linux_mod_DEPENDENCIES) _linux_mod-loader_powerpc_ieee127= 5_linux.o -rm -f $@ - $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(_linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ _lin= ux_mod-loader_powerpc_ieee1275_linux.o =20 mod-_linux.o: mod-_linux.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(_linux_mod_CFLAGS) -c = -o $@ $< @@ -549,9 +549,9 @@ $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-linux.o: linux_mod-loader_powerpc_ieee1275_linux_normal.o +pre-linux.o: $(linux_mod_DEPENDENCIES) linux_mod-loader_powerpc_ieee1275_l= inux_normal.o -rm -f $@ - $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(linux_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ linux= _mod-loader_powerpc_ieee1275_linux_normal.o =20 mod-linux.o: mod-linux.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(linux_mod_CFLAGS) -c -= o $@ $< @@ -605,9 +605,9 @@ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-normal.o: normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_m= od-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execut= e.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-norma= l_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod= -normal_misc.o normal_mod-grub_script_tab.o normal_mod-normal_script.o norm= al_mod-normal_powerpc_setjmp.o +pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o normal_mo= d-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion= .o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-norm= al_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-nor= mal_menu_entry.o normal_mod-normal_misc.o normal_mod-grub_script_tab.o norm= al_mod-normal_script.o normal_mod-normal_powerpc_setjmp.o -rm -f $@ - $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ norm= al_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o= normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-norm= al_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod= -normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o norm= al_mod-grub_script_tab.o normal_mod-normal_script.o normal_mod-normal_power= pc_setjmp.o =20 mod-normal.o: mod-normal.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -c = -o $@ $< @@ -853,9 +853,9 @@ $(TARGET_CC) $(suspend_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-suspend.o: suspend_mod-commands_ieee1275_suspend.o +pre-suspend.o: $(suspend_mod_DEPENDENCIES) suspend_mod-commands_ieee1275_s= uspend.o -rm -f $@ - $(TARGET_CC) $(suspend_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(suspend_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sus= pend_mod-commands_ieee1275_suspend.o =20 mod-suspend.o: mod-suspend.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(suspend_mod_CFLAGS) -c= -o $@ $< @@ -905,9 +905,9 @@ $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-reboot.o: reboot_mod-commands_ieee1275_reboot.o +pre-reboot.o: $(reboot_mod_DEPENDENCIES) reboot_mod-commands_ieee1275_rebo= ot.o -rm -f $@ - $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ rebo= ot_mod-commands_ieee1275_reboot.o =20 mod-reboot.o: mod-reboot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -c = -o $@ $< @@ -957,9 +957,9 @@ $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-halt.o: halt_mod-commands_ieee1275_halt.o +pre-halt.o: $(halt_mod_DEPENDENCIES) halt_mod-commands_ieee1275_halt.o -rm -f $@ - $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ halt_m= od-commands_ieee1275_halt.o =20 mod-halt.o: mod-halt.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -c -o= $@ $< Index: conf/sparc64-ieee1275.mk =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/grub/grub2/conf/sparc64-ieee1275.mk,v retrieving revision 1.19 diff -u -r1.19 sparc64-ieee1275.mk --- conf/sparc64-ieee1275.mk 15 Aug 2006 12:29:08 -0000 1.19 +++ conf/sparc64-ieee1275.mk 21 Sep 2006 14:33:00 -0000 @@ -72,8 +72,8 @@ CLEANFILES +=3D kernel.elf kernel_elf-kern_sparc64_ieee1275_init.o kernel_= elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main.o kernel_elf-kern_device.= o kernel_elf-kern_disk.o kernel_elf-kern_dl.o kernel_elf-kern_file.o kernel= _elf-kern_fs.o kernel_elf-kern_err.o kernel_elf-kern_misc.o kernel_elf-kern= _mm.o kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_ter= m.o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_sparc64_ieee1275_o= penfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_partition.o kerne= l_elf-kern_env.o kernel_elf-kern_sparc64_dl.o kernel_elf-kernel_elf_symlist= .o kernel_elf-kern_sparc64_cache.o kernel_elf-kern_parser.o MOSTLYCLEANFILES +=3D kernel_elf-kern_sparc64_ieee1275_init.d kernel_elf-k= ern_ieee1275_ieee1275.d kernel_elf-kern_main.d kernel_elf-kern_device.d ker= nel_elf-kern_disk.d kernel_elf-kern_dl.d kernel_elf-kern_file.d kernel_elf-= kern_fs.d kernel_elf-kern_err.d kernel_elf-kern_misc.d kernel_elf-kern_mm.d= kernel_elf-kern_loader.d kernel_elf-kern_rescue.d kernel_elf-kern_term.d k= ernel_elf-term_ieee1275_ofconsole.d kernel_elf-kern_sparc64_ieee1275_openfw= .d kernel_elf-disk_ieee1275_ofdisk.d kernel_elf-kern_partition.d kernel_elf= -kern_env.d kernel_elf-kern_sparc64_dl.d kernel_elf-kernel_elf_symlist.d ke= rnel_elf-kern_sparc64_cache.d kernel_elf-kern_parser.d =20 -kernel.elf: kernel_elf-kern_sparc64_ieee1275_init.o kernel_elf-kern_ieee12= 75_ieee1275.o kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-ke= rn_disk.o kernel_elf-kern_dl.o kernel_elf-kern_file.o kernel_elf-kern_fs.o = kernel_elf-kern_err.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_el= f-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-= term_ieee1275_ofconsole.o kernel_elf-kern_sparc64_ieee1275_openfw.o kernel_= elf-disk_ieee1275_ofdisk.o kernel_elf-kern_partition.o kernel_elf-kern_env.= o kernel_elf-kern_sparc64_dl.o kernel_elf-kernel_elf_symlist.o kernel_elf-k= ern_sparc64_cache.o kernel_elf-kern_parser.o - $(TARGET_CC) -o $@ $^ $(TARGET_LDFLAGS) $(kernel_elf_LDFLAGS) +kernel.elf: $(kernel_elf_DEPENDENCIES) kernel_elf-kern_sparc64_ieee1275_in= it.o kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main.o kernel_elf-= kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_dl.o kernel_elf-kern_f= ile.o kernel_elf-kern_fs.o kernel_elf-kern_err.o kernel_elf-kern_misc.o ker= nel_elf-kern_mm.o kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_= elf-kern_term.o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_sparc6= 4_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parti= tion.o kernel_elf-kern_env.o kernel_elf-kern_sparc64_dl.o kernel_elf-kernel= _elf_symlist.o kernel_elf-kern_sparc64_cache.o kernel_elf-kern_parser.o + $(TARGET_CC) -o $@ kernel_elf-kern_sparc64_ieee1275_init.o kernel_elf-ker= n_ieee1275_ieee1275.o kernel_elf-kern_main.o kernel_elf-kern_device.o kerne= l_elf-kern_disk.o kernel_elf-kern_dl.o kernel_elf-kern_file.o kernel_elf-ke= rn_fs.o kernel_elf-kern_err.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o k= ernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o ker= nel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_sparc64_ieee1275_openfw.o= kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_partition.o kernel_elf-k= ern_env.o kernel_elf-kern_sparc64_dl.o kernel_elf-kernel_elf_symlist.o kern= el_elf-kern_sparc64_cache.o kernel_elf-kern_parser.o $(TARGET_LDFLAGS) $(ke= rnel_elf_LDFLAGS) =20 kernel_elf-kern_sparc64_ieee1275_init.o: kern/sparc64/ieee1275/init.c $(TARGET_CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(= TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $< @@ -196,9 +196,9 @@ $(TARGET_CC) $(fshelp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-fshelp.o: fshelp_mod-fs_fshelp.o +pre-fshelp.o: $(fshelp_mod_DEPENDENCIES) fshelp_mod-fs_fshelp.o -rm -f $@ - $(TARGET_CC) $(fshelp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(fshelp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ fshe= lp_mod-fs_fshelp.o =20 mod-fshelp.o: mod-fshelp.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(fshelp_mod_CFLAGS) -c = -o $@ $< @@ -248,9 +248,9 @@ $(TARGET_CC) $(fat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-fat.o: fat_mod-fs_fat.o +pre-fat.o: $(fat_mod_DEPENDENCIES) fat_mod-fs_fat.o -rm -f $@ - $(TARGET_CC) $(fat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(fat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ fat_mod= -fs_fat.o =20 mod-fat.o: mod-fat.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(fat_mod_CFLAGS) -c -o = $@ $< @@ -300,9 +300,9 @@ $(TARGET_CC) $(ext2_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-ext2.o: ext2_mod-fs_ext2.o +pre-ext2.o: $(ext2_mod_DEPENDENCIES) ext2_mod-fs_ext2.o -rm -f $@ - $(TARGET_CC) $(ext2_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(ext2_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ ext2_m= od-fs_ext2.o =20 mod-ext2.o: mod-ext2.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ext2_mod_CFLAGS) -c -o= $@ $< @@ -352,9 +352,9 @@ $(TARGET_CC) $(ufs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-ufs.o: ufs_mod-fs_ufs.o +pre-ufs.o: $(ufs_mod_DEPENDENCIES) ufs_mod-fs_ufs.o -rm -f $@ - $(TARGET_CC) $(ufs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(ufs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ ufs_mod= -fs_ufs.o =20 mod-ufs.o: mod-ufs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ufs_mod_CFLAGS) -c -o = $@ $< @@ -404,9 +404,9 @@ $(TARGET_CC) $(minix_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-minix.o: minix_mod-fs_minix.o +pre-minix.o: $(minix_mod_DEPENDENCIES) minix_mod-fs_minix.o -rm -f $@ - $(TARGET_CC) $(minix_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(minix_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ minix= _mod-fs_minix.o =20 mod-minix.o: mod-minix.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(minix_mod_CFLAGS) -c -= o $@ $< @@ -456,9 +456,9 @@ $(TARGET_CC) $(hfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-hfs.o: hfs_mod-fs_hfs.o +pre-hfs.o: $(hfs_mod_DEPENDENCIES) hfs_mod-fs_hfs.o -rm -f $@ - $(TARGET_CC) $(hfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(hfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ hfs_mod= -fs_hfs.o =20 mod-hfs.o: mod-hfs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hfs_mod_CFLAGS) -c -o = $@ $< @@ -508,9 +508,9 @@ $(TARGET_CC) $(jfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-jfs.o: jfs_mod-fs_jfs.o +pre-jfs.o: $(jfs_mod_DEPENDENCIES) jfs_mod-fs_jfs.o -rm -f $@ - $(TARGET_CC) $(jfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(jfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ jfs_mod= -fs_jfs.o =20 mod-jfs.o: mod-jfs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(jfs_mod_CFLAGS) -c -o = $@ $< @@ -565,9 +565,9 @@ $(TARGET_CC) $(xfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-xfs.o: xfs_mod-fs_xfs.o +pre-xfs.o: $(xfs_mod_DEPENDENCIES) xfs_mod-fs_xfs.o -rm -f $@ - $(TARGET_CC) $(xfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(xfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ xfs_mod= -fs_xfs.o =20 mod-xfs.o: mod-xfs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(xfs_mod_CFLAGS) -c -o = $@ $< @@ -617,9 +617,9 @@ $(TARGET_CC) $(affs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-affs.o: affs_mod-fs_affs.o +pre-affs.o: $(affs_mod_DEPENDENCIES) affs_mod-fs_affs.o -rm -f $@ - $(TARGET_CC) $(affs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(affs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ affs_m= od-fs_affs.o =20 mod-affs.o: mod-affs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(affs_mod_CFLAGS) -c -o= $@ $< @@ -669,9 +669,9 @@ $(TARGET_CC) $(sfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-sfs.o: sfs_mod-fs_sfs.o +pre-sfs.o: $(sfs_mod_DEPENDENCIES) sfs_mod-fs_sfs.o -rm -f $@ - $(TARGET_CC) $(sfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(sfs_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sfs_mod= -fs_sfs.o =20 mod-sfs.o: mod-sfs.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sfs_mod_CFLAGS) -c -o = $@ $< @@ -736,9 +736,9 @@ $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-normal.o: normal_mod-normal_arg.o normal_mod-normal_cmdline.o normal_m= od-normal_command.o normal_mod-normal_completion.o normal_mod-normal_execut= e.o normal_mod-normal_function.o normal_mod-normal_lexer.o normal_mod-norma= l_main.o normal_mod-normal_menu.o normal_mod-normal_menu_entry.o normal_mod= -normal_misc.o normal_mod-normal_script.o normal_mod-normal_sparc64_setjmp.= o normal_mod-grub_script_tab.o +pre-normal.o: $(normal_mod_DEPENDENCIES) normal_mod-normal_arg.o normal_mo= d-normal_cmdline.o normal_mod-normal_command.o normal_mod-normal_completion= .o normal_mod-normal_execute.o normal_mod-normal_function.o normal_mod-norm= al_lexer.o normal_mod-normal_main.o normal_mod-normal_menu.o normal_mod-nor= mal_menu_entry.o normal_mod-normal_misc.o normal_mod-normal_script.o normal= _mod-normal_sparc64_setjmp.o normal_mod-grub_script_tab.o -rm -f $@ - $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(normal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ norm= al_mod-normal_arg.o normal_mod-normal_cmdline.o normal_mod-normal_command.o= normal_mod-normal_completion.o normal_mod-normal_execute.o normal_mod-norm= al_function.o normal_mod-normal_lexer.o normal_mod-normal_main.o normal_mod= -normal_menu.o normal_mod-normal_menu_entry.o normal_mod-normal_misc.o norm= al_mod-normal_script.o normal_mod-normal_sparc64_setjmp.o normal_mod-grub_s= cript_tab.o =20 mod-normal.o: mod-normal.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(normal_mod_CFLAGS) -c = -o $@ $< @@ -984,9 +984,9 @@ $(TARGET_CC) $(hello_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-hello.o: hello_mod-hello_hello.o +pre-hello.o: $(hello_mod_DEPENDENCIES) hello_mod-hello_hello.o -rm -f $@ - $(TARGET_CC) $(hello_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(hello_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ hello= _mod-hello_hello.o =20 mod-hello.o: mod-hello.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(hello_mod_CFLAGS) -c -= o $@ $< @@ -1036,9 +1036,9 @@ $(TARGET_CC) $(boot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-boot.o: boot_mod-commands_boot.o +pre-boot.o: $(boot_mod_DEPENDENCIES) boot_mod-commands_boot.o -rm -f $@ - $(TARGET_CC) $(boot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(boot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ boot_m= od-commands_boot.o =20 mod-boot.o: mod-boot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(boot_mod_CFLAGS) -c -o= $@ $< @@ -1088,9 +1088,9 @@ $(TARGET_CC) $(terminal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-terminal.o: terminal_mod-commands_terminal.o +pre-terminal.o: $(terminal_mod_DEPENDENCIES) terminal_mod-commands_termina= l.o -rm -f $@ - $(TARGET_CC) $(terminal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(terminal_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ te= rminal_mod-commands_terminal.o =20 mod-terminal.o: mod-terminal.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(terminal_mod_CFLAGS) -= c -o $@ $< @@ -1140,9 +1140,9 @@ $(TARGET_CC) $(ls_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-ls.o: ls_mod-commands_ls.o +pre-ls.o: $(ls_mod_DEPENDENCIES) ls_mod-commands_ls.o -rm -f $@ - $(TARGET_CC) $(ls_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(ls_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ ls_mod-c= ommands_ls.o =20 mod-ls.o: mod-ls.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(ls_mod_CFLAGS) -c -o $= @ $< @@ -1192,9 +1192,9 @@ $(TARGET_CC) $(cmp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-cmp.o: cmp_mod-commands_cmp.o +pre-cmp.o: $(cmp_mod_DEPENDENCIES) cmp_mod-commands_cmp.o -rm -f $@ - $(TARGET_CC) $(cmp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(cmp_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ cmp_mod= -commands_cmp.o =20 mod-cmp.o: mod-cmp.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cmp_mod_CFLAGS) -c -o = $@ $< @@ -1244,9 +1244,9 @@ $(TARGET_CC) $(cat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-cat.o: cat_mod-commands_cat.o +pre-cat.o: $(cat_mod_DEPENDENCIES) cat_mod-commands_cat.o -rm -f $@ - $(TARGET_CC) $(cat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(cat_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ cat_mod= -commands_cat.o =20 mod-cat.o: mod-cat.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cat_mod_CFLAGS) -c -o = $@ $< @@ -1296,9 +1296,9 @@ $(TARGET_CC) $(font_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-font.o: font_mod-font_manager.o +pre-font.o: $(font_mod_DEPENDENCIES) font_mod-font_manager.o -rm -f $@ - $(TARGET_CC) $(font_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(font_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ font_m= od-font_manager.o =20 mod-font.o: mod-font.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(font_mod_CFLAGS) -c -o= $@ $< @@ -1348,9 +1348,9 @@ $(TARGET_CC) $(amiga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-amiga.o: amiga_mod-partmap_amiga.o +pre-amiga.o: $(amiga_mod_DEPENDENCIES) amiga_mod-partmap_amiga.o -rm -f $@ - $(TARGET_CC) $(amiga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(amiga_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ amiga= _mod-partmap_amiga.o =20 mod-amiga.o: mod-amiga.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(amiga_mod_CFLAGS) -c -= o $@ $< @@ -1400,9 +1400,9 @@ $(TARGET_CC) $(apple_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-apple.o: apple_mod-partmap_apple.o +pre-apple.o: $(apple_mod_DEPENDENCIES) apple_mod-partmap_apple.o -rm -f $@ - $(TARGET_CC) $(apple_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(apple_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ apple= _mod-partmap_apple.o =20 mod-apple.o: mod-apple.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(apple_mod_CFLAGS) -c -= o $@ $< @@ -1452,9 +1452,9 @@ $(TARGET_CC) $(pc_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-pc.o: pc_mod-partmap_pc.o +pre-pc.o: $(pc_mod_DEPENDENCIES) pc_mod-partmap_pc.o -rm -f $@ - $(TARGET_CC) $(pc_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(pc_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ pc_mod-p= artmap_pc.o =20 mod-pc.o: mod-pc.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(pc_mod_CFLAGS) -c -o $= @ $< @@ -1504,9 +1504,9 @@ $(TARGET_CC) $(sun_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-sun.o: sun_mod-partmap_sun.o +pre-sun.o: $(sun_mod_DEPENDENCIES) sun_mod-partmap_sun.o -rm -f $@ - $(TARGET_CC) $(sun_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(sun_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sun_mod= -partmap_sun.o =20 mod-sun.o: mod-sun.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sun_mod_CFLAGS) -c -o = $@ $< @@ -1556,9 +1556,9 @@ $(TARGET_CC) $(acorn_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-acorn.o: acorn_mod-partmap_acorn.o +pre-acorn.o: $(acorn_mod_DEPENDENCIES) acorn_mod-partmap_acorn.o -rm -f $@ - $(TARGET_CC) $(acorn_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(acorn_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ acorn= _mod-partmap_acorn.o =20 mod-acorn.o: mod-acorn.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(acorn_mod_CFLAGS) -c -= o $@ $< @@ -1607,9 +1607,9 @@ $(TARGET_CC) $(loopback_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-loopback.o: loopback_mod-disk_loopback.o +pre-loopback.o: $(loopback_mod_DEPENDENCIES) loopback_mod-disk_loopback.o -rm -f $@ - $(TARGET_CC) $(loopback_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(loopback_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ lo= opback_mod-disk_loopback.o =20 mod-loopback.o: mod-loopback.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(loopback_mod_CFLAGS) -= c -o $@ $< @@ -1659,9 +1659,9 @@ $(TARGET_CC) $(suspend_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-suspend.o: suspend_mod-commands_ieee1275_suspend.o +pre-suspend.o: $(suspend_mod_DEPENDENCIES) suspend_mod-commands_ieee1275_s= uspend.o -rm -f $@ - $(TARGET_CC) $(suspend_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(suspend_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sus= pend_mod-commands_ieee1275_suspend.o =20 mod-suspend.o: mod-suspend.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(suspend_mod_CFLAGS) -c= -o $@ $< @@ -1711,9 +1711,9 @@ $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-reboot.o: reboot_mod-commands_ieee1275_reboot.o +pre-reboot.o: $(reboot_mod_DEPENDENCIES) reboot_mod-commands_ieee1275_rebo= ot.o -rm -f $@ - $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(reboot_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ rebo= ot_mod-commands_ieee1275_reboot.o =20 mod-reboot.o: mod-reboot.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(reboot_mod_CFLAGS) -c = -o $@ $< @@ -1763,9 +1763,9 @@ $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-halt.o: halt_mod-commands_ieee1275_halt.o +pre-halt.o: $(halt_mod_DEPENDENCIES) halt_mod-commands_ieee1275_halt.o -rm -f $@ - $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(halt_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ halt_m= od-commands_ieee1275_halt.o =20 mod-halt.o: mod-halt.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(halt_mod_CFLAGS) -c -o= $@ $< @@ -1815,9 +1815,9 @@ $(TARGET_CC) $(help_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-help.o: help_mod-commands_help.o +pre-help.o: $(help_mod_DEPENDENCIES) help_mod-commands_help.o -rm -f $@ - $(TARGET_CC) $(help_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(help_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ help_m= od-commands_help.o =20 mod-help.o: mod-help.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(help_mod_CFLAGS) -c -o= $@ $< @@ -1877,9 +1877,9 @@ $(TARGET_CC) $(configfile_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-configfile.o: configfile_mod-commands_configfile.o +pre-configfile.o: $(configfile_mod_DEPENDENCIES) configfile_mod-commands_c= onfigfile.o -rm -f $@ - $(TARGET_CC) $(configfile_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = $^ + $(TARGET_CC) $(configfile_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ = configfile_mod-commands_configfile.o =20 mod-configfile.o: mod-configfile.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(configfile_mod_CFLAGS)= -c -o $@ $< @@ -1929,9 +1929,9 @@ $(TARGET_CC) $(search_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-search.o: search_mod-commands_search.o +pre-search.o: $(search_mod_DEPENDENCIES) search_mod-commands_search.o -rm -f $@ - $(TARGET_CC) $(search_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(search_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sear= ch_mod-commands_search.o =20 mod-search.o: mod-search.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(search_mod_CFLAGS) -c = -o $@ $< @@ -1981,9 +1981,9 @@ $(TARGET_CC) $(gzio_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .= comment $@ =20 -pre-gzio.o: gzio_mod-io_gzio.o +pre-gzio.o: $(gzio_mod_DEPENDENCIES) gzio_mod-io_gzio.o -rm -f $@ - $(TARGET_CC) $(gzio_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^ + $(TARGET_CC) $(gzio_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ gzio_m= od-io_gzio.o =20 mod-gzio.o: mod-gzio.c $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(gzio_mod_CFLAGS) -c -o= $@ $< --=-=-=--