OSDN Git Service

Android.mk: fix an improper dependency
authorChih-Wei Huang <cwhuang@linux.org.tw>
Sat, 1 Jan 2011 13:05:15 +0000 (21:05 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Sat, 1 Jan 2011 13:05:15 +0000 (21:05 +0800)
Android.mk

index 4f87601..f3995c2 100644 (file)
@@ -76,7 +76,7 @@ $(INSTALL_RAMDISK): $(wildcard $(LOCAL_PATH)/install/*/*) | $(MKBOOTFS)
        $(MKBOOTFS) $(dir $(dir $(<D))) | gzip -9 > $@
 
 boot_dir := $(PRODUCT_OUT)/boot
-$(boot_dir): $(wildcard $(LOCAL_PATH)/boot/isolinux/*) $(systemimg) | $(ACP)
+$(boot_dir): $(wildcard $(LOCAL_PATH)/boot/isolinux/*) $(systemimg) $(GENERIC_X86_CONFIG_MK) | $(ACP)
        rm -rf $@
        $(ACP) -pr $(dir $(<D)) $@
 
@@ -84,7 +84,7 @@ BUILT_IMG := $(addprefix $(PRODUCT_OUT)/,ramdisk.img initrd.img install.img) $(s
 BUILT_IMG += $(if $(TARGET_PREBUILT_KERNEL),$(TARGET_PREBUILT_KERNEL),$(PRODUCT_OUT)/kernel)
 
 ISO_IMAGE := $(PRODUCT_OUT)/$(TARGET_PRODUCT).iso
-$(ISO_IMAGE): $(boot_dir) $(BUILT_IMG) $(GENERIC_X86_CONFIG_MK)
+$(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
        @echo ----- Making iso image ------
        $(hide) $(call check-density,$</isolinux/isolinux.cfg)
        $(hide) sed -i "s|\(Installation CD\)\(.*\)|\1 $(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</isolinux/isolinux.cfg