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

[karo-tx-uboot.git] / post / rules.mk

diff --git a/post/rules.mk b/post/rules.mk
index 1ad6959003c945d91855bcc862b8ee22a1a0f920..1efc9c7d97d76f8639a4af8c621786c0c4322e36 100644 (file)
--- a/post/rules.mk
+++ b/post/rules.mk
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2002
+# (C) Copyright 2002-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -23,20 +23,24 @@
 
 include $(TOPDIR)/config.mk
 
-OBJS   = $(AOBJS) $(COBJS)
+COBJS  := $(COBJS-y)
+AOBJS  := $(AOBJS-y)
+SRCS   := $(AOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(AOBJS) $(COBJS))
+LIB    := $(obj)$(LIB)
 
 CPPFLAGS += -I$(TOPDIR)
 
 all:   $(LIB)
 
-$(LIB):        .depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+$(LIB):        $(obj).depend $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################
 
-.depend: Makefile $(AOBJS:.o=.S) $(COBJS:.o=.c)
-       $(CC) -M $(CFLAGS) $(AOBJS:.o=.S) $(COBJS:.o=.c) > .depend
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################