Merge branch 'master' of git://git.denx.de/u-boot-i2c

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

diff --git a/net/Makefile b/net/Makefile
index 0eee330cfe3f01cdb89031bdf22f01d646c7cb03..0544f6bacd02c4e32138c6042637ff18c88698a2 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -23,17 +23,18 @@
 
 include $(TOPDIR)/config.mk
 
-# CFLAGS += -DET_DEBUG -DDEBUG
+# CFLAGS += -DDEBUG
 
-LIB    = $(obj)libnet.a
+LIB    = $(obj)libnet.o
 
-COBJS-y += net.o
-COBJS-y += tftp.o
-COBJS-y += bootp.o
-COBJS-y += rarp.o
-COBJS-y += eth.o
-COBJS-y += nfs.o
-COBJS-y += sntp.o
+COBJS-$(CONFIG_CMD_NET)  += bootp.o
+COBJS-$(CONFIG_CMD_DNS)  += dns.o
+COBJS-$(CONFIG_CMD_NET)  += eth.o
+COBJS-$(CONFIG_CMD_NET)  += net.o
+COBJS-$(CONFIG_CMD_NFS)  += nfs.o
+COBJS-$(CONFIG_CMD_RARP) += rarp.o
+COBJS-$(CONFIG_CMD_SNTP) += sntp.o
+COBJS-$(CONFIG_CMD_NET)  += tftp.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
@@ -42,7 +43,7 @@ OBJS  := $(addprefix $(obj),$(COBJS))
 all:   $(LIB)
 
 $(LIB):        $(obj).depend $(OBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
 #########################################################################