Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / disk / Makefile

diff --git a/disk/Makefile b/disk/Makefile
index 3bdb018a06659384552aaccd3df9247de50ff837..5affe344ebdabdd614ea802574d83f59f76ded33 100644 (file)
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -25,17 +25,23 @@ include $(TOPDIR)/config.mk
 
 #CFLAGS += -DET_DEBUG -DDEBUG
 
-LIB    = $(obj)libdisk.a
+LIB    = $(obj)libdisk.o
 
-COBJS  = part.o part_mac.o part_dos.o part_iso.o part_amiga.o
+COBJS-$(CONFIG_PARTITIONS)     += part.o
+COBJS-$(CONFIG_MAC_PARTITION)   += part_mac.o
+COBJS-$(CONFIG_DOS_PARTITION)   += part_dos.o
+COBJS-$(CONFIG_ISO_PARTITION)   += part_iso.o
+COBJS-$(CONFIG_AMIGA_PARTITION) += part_amiga.o
+COBJS-$(CONFIG_EFI_PARTITION)   += part_efi.o
 
+COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 
 all:   $(LIB)
 
 $(LIB):        $(obj).depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
 #########################################################################