This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / usr / Makefile

diff --git a/usr/Makefile b/usr/Makefile
index f269a5f..965759f 100644 (file)
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -3,12 +3,7 @@ obj-y := initramfs_data.o
 
 hostprogs-y  := gen_init_cpio
 
-clean-files := initramfs_data.cpio.gz initramfs_list
-
-# If you want a different list of files in the initramfs_data.cpio
-# then you can either overwrite the cpio_list in this directory
-# or set INITRAMFS_LIST to another filename.
-INITRAMFS_LIST := $(obj)/initramfs_list
+clean-files := initramfs_data.cpio.gz
 
 # initramfs_data.o contains the initramfs_data.cpio.gz image.
 # The image is included using .incbin, a dependency which is not
@@ -23,17 +18,10 @@ $(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE
 # Commented out for now
 # initramfs-y := $(obj)/root/hello
 
-filechk_initramfs_list = $(CONFIG_SHELL) \
- $(srctree)/scripts/gen_initramfs_list.sh $(CONFIG_INITRAMFS_SOURCE)
-                          
-$(obj)/initramfs_list: FORCE
-       $(call filechk,initramfs_list)
-
 quiet_cmd_cpio = CPIO    $@
-      cmd_cpio = ./$< $(obj)/initramfs_list > $@
+      cmd_cpio = ./$< > $@
 
-$(obj)/initramfs_data.cpio: $(obj)/gen_init_cpio \
-                            $(initramfs-y) $(obj)/initramfs_list FORCE
+$(obj)/initramfs_data.cpio: $(obj)/gen_init_cpio $(initramfs-y) FORCE
        $(call if_changed,cpio)
 
 targets += initramfs_data.cpio