[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[1876] Forgot to remove files / run autogen.sh
|
From: |
Robert Millan |
|
Subject: |
[1876] Forgot to remove files / run autogen.sh |
|
Date: |
Thu, 25 Sep 2008 14:17:44 +0000 |
Revision: 1876
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1876
Author: robertmh
Date: 2008-09-25 14:17:43 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
Forgot to remove files / run autogen.sh
Modified Paths:
--------------
trunk/grub2/DISTLIST
trunk/grub2/conf/i386-coreboot.mk
trunk/grub2/conf/i386-efi.mk
trunk/grub2/conf/i386-ieee1275.mk
trunk/grub2/conf/i386-pc.mk
trunk/grub2/conf/powerpc-ieee1275.mk
trunk/grub2/conf/x86_64-efi.mk
Removed Paths:
-------------
trunk/grub2/util/i386/get_disk_name.c
trunk/grub2/util/ieee1275/get_disk_name.c
Modified: trunk/grub2/DISTLIST
===================================================================
--- trunk/grub2/DISTLIST 2008-09-25 14:15:24 UTC (rev 1875)
+++ trunk/grub2/DISTLIST 2008-09-25 14:17:43 UTC (rev 1876)
@@ -434,7 +434,6 @@
util/grub.d/30_os-prober.in
util/grub.d/40_custom.in
util/grub.d/README
-util/i386/get_disk_name.c
util/i386/efi/grub-install.in
util/i386/efi/grub-mkimage.c
util/i386/pc/grub-install.in
@@ -442,7 +441,6 @@
util/i386/pc/grub-mkrescue.in
util/i386/pc/grub-setup.c
util/i386/pc/misc.c
-util/ieee1275/get_disk_name.c
util/ieee1275/grub-install.in
util/powerpc/ieee1275/grub-mkrescue.in
util/powerpc/ieee1275/misc.c
Modified: trunk/grub2/conf/i386-coreboot.mk
===================================================================
--- trunk/grub2/conf/i386-coreboot.mk 2008-09-25 14:15:24 UTC (rev 1875)
+++ trunk/grub2/conf/i386-coreboot.mk 2008-09-25 14:17:43 UTC (rev 1876)
@@ -170,13 +170,12 @@
endif
# For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \
- util/i386/get_disk_name.c
-CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_i386_get_disk_name.o
-MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d grub_mkdevicemap-util_i386_get_disk_name.d
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
+CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d
-grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_i386_get_disk_name.o
- $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o grub_mkdevicemap-util_i386_get_disk_name.o
$(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
+grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+ $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o $(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
grub_mkdevicemap-util_grub_mkdevicemap.o: util/grub-mkdevicemap.c
$(util/grub-mkdevicemap.c_DEPENDENCIES)
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
@@ -186,11 +185,7 @@
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
-include grub_mkdevicemap-util_misc.d
-grub_mkdevicemap-util_i386_get_disk_name.o: util/i386/get_disk_name.c
$(util/i386/get_disk_name.c_DEPENDENCIES)
- $(CC) -Iutil/i386 -I$(srcdir)/util/i386 $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
--include grub_mkdevicemap-util_i386_get_disk_name.d
-
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
Modified: trunk/grub2/conf/i386-efi.mk
===================================================================
--- trunk/grub2/conf/i386-efi.mk 2008-09-25 14:15:24 UTC (rev 1875)
+++ trunk/grub2/conf/i386-efi.mk 2008-09-25 14:17:43 UTC (rev 1876)
@@ -47,13 +47,12 @@
# kern/fs.c kern/env.c fs/fshelp.c
# For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \
- util/i386/get_disk_name.c
-CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_i386_get_disk_name.o
-MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d grub_mkdevicemap-util_i386_get_disk_name.d
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
+CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d
-grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_i386_get_disk_name.o
- $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o grub_mkdevicemap-util_i386_get_disk_name.o
$(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
+grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+ $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o $(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
grub_mkdevicemap-util_grub_mkdevicemap.o: util/grub-mkdevicemap.c
$(util/grub-mkdevicemap.c_DEPENDENCIES)
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
@@ -63,11 +62,7 @@
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
-include grub_mkdevicemap-util_misc.d
-grub_mkdevicemap-util_i386_get_disk_name.o: util/i386/get_disk_name.c
$(util/i386/get_disk_name.c_DEPENDENCIES)
- $(CC) -Iutil/i386 -I$(srcdir)/util/i386 $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
--include grub_mkdevicemap-util_i386_get_disk_name.d
-
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
Modified: trunk/grub2/conf/i386-ieee1275.mk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.mk 2008-09-25 14:15:24 UTC (rev 1875)
+++ trunk/grub2/conf/i386-ieee1275.mk 2008-09-25 14:17:43 UTC (rev 1876)
@@ -167,13 +167,12 @@
endif
# For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \
- util/i386/get_disk_name.c
-CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_i386_get_disk_name.o
-MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d grub_mkdevicemap-util_i386_get_disk_name.d
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
+CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d
-grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_i386_get_disk_name.o
- $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o grub_mkdevicemap-util_i386_get_disk_name.o
$(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
+grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+ $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o $(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
grub_mkdevicemap-util_grub_mkdevicemap.o: util/grub-mkdevicemap.c
$(util/grub-mkdevicemap.c_DEPENDENCIES)
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
@@ -183,11 +182,7 @@
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
-include grub_mkdevicemap-util_misc.d
-grub_mkdevicemap-util_i386_get_disk_name.o: util/i386/get_disk_name.c
$(util/i386/get_disk_name.c_DEPENDENCIES)
- $(CC) -Iutil/i386 -I$(srcdir)/util/i386 $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
--include grub_mkdevicemap-util_i386_get_disk_name.d
-
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
Modified: trunk/grub2/conf/i386-pc.mk
===================================================================
--- trunk/grub2/conf/i386-pc.mk 2008-09-25 14:15:24 UTC (rev 1875)
+++ trunk/grub2/conf/i386-pc.mk 2008-09-25 14:17:43 UTC (rev 1876)
@@ -493,13 +493,12 @@
# For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \
- util/i386/get_disk_name.c
-CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_i386_get_disk_name.o
-MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d grub_mkdevicemap-util_i386_get_disk_name.d
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
+CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d
-grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_i386_get_disk_name.o
- $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o grub_mkdevicemap-util_i386_get_disk_name.o
$(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
+grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+ $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o $(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
grub_mkdevicemap-util_grub_mkdevicemap.o: util/grub-mkdevicemap.c
$(util/grub-mkdevicemap.c_DEPENDENCIES)
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
@@ -509,11 +508,7 @@
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
-include grub_mkdevicemap-util_misc.d
-grub_mkdevicemap-util_i386_get_disk_name.o: util/i386/get_disk_name.c
$(util/i386/get_disk_name.c_DEPENDENCIES)
- $(CC) -Iutil/i386 -I$(srcdir)/util/i386 $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
--include grub_mkdevicemap-util_i386_get_disk_name.d
-
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
Modified: trunk/grub2/conf/powerpc-ieee1275.mk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.mk 2008-09-25 14:15:24 UTC (rev
1875)
+++ trunk/grub2/conf/powerpc-ieee1275.mk 2008-09-25 14:17:43 UTC (rev
1876)
@@ -35,13 +35,12 @@
endif
# For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \
- util/ieee1275/get_disk_name.c
-CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_ieee1275_get_disk_name.o
-MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d grub_mkdevicemap-util_ieee1275_get_disk_name.d
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
+CLEANFILES += grub-mkdevicemap$(EXEEXT)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+MOSTLYCLEANFILES += grub_mkdevicemap-util_grub_mkdevicemap.d
grub_mkdevicemap-util_misc.d
-grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
grub_mkdevicemap-util_ieee1275_get_disk_name.o
- $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o grub_mkdevicemap-util_ieee1275_get_disk_name.o
$(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
+grub-mkdevicemap: $(grub_mkdevicemap_DEPENDENCIES)
grub_mkdevicemap-util_grub_mkdevicemap.o grub_mkdevicemap-util_misc.o
+ $(CC) -o $@ grub_mkdevicemap-util_grub_mkdevicemap.o
grub_mkdevicemap-util_misc.o $(LDFLAGS) $(grub_mkdevicemap_LDFLAGS)
grub_mkdevicemap-util_grub_mkdevicemap.o: util/grub-mkdevicemap.c
$(util/grub-mkdevicemap.c_DEPENDENCIES)
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
@@ -51,11 +50,7 @@
$(CC) -Iutil -I$(srcdir)/util $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
$(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
-include grub_mkdevicemap-util_misc.d
-grub_mkdevicemap-util_ieee1275_get_disk_name.o: util/ieee1275/get_disk_name.c
$(util/ieee1275/get_disk_name.c_DEPENDENCIES)
- $(CC) -Iutil/ieee1275 -I$(srcdir)/util/ieee1275 $(CPPFLAGS) $(CFLAGS)
-DGRUB_UTIL=1 $(grub_mkdevicemap_CFLAGS) -MD -c -o $@ $<
--include grub_mkdevicemap-util_ieee1275_get_disk_name.d
-
# For grub-emu
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
Modified: trunk/grub2/conf/x86_64-efi.mk
===================================================================
--- trunk/grub2/conf/x86_64-efi.mk 2008-09-25 14:15:24 UTC (rev 1875)
+++ trunk/grub2/conf/x86_64-efi.mk 2008-09-25 14:17:43 UTC (rev 1876)
@@ -49,8 +49,7 @@
# kern/fs.c kern/env.c fs/fshelp.c
# For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c \
- util/i386/get_disk_name.c
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
# For grub-emu.
util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
Deleted: trunk/grub2/util/i386/get_disk_name.c
===================================================================
Deleted: trunk/grub2/util/ieee1275/get_disk_name.c
===================================================================
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [1876] Forgot to remove files / run autogen.sh,
Robert Millan <=