rtc: Fix merging problem

[u-boot] / lib_m68k / Makefile

diff --git a/lib_m68k/Makefile b/lib_m68k/Makefile
index 698da36e683f880a78c5630a1de092a615cbdd95..03784fd84e201ec16e55e11be198a1a55efa06e2 100644 (file)
--- a/lib_m68k/Makefile
+++ b/lib_m68k/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2000
+# (C) Copyright 2000-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -23,20 +23,23 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = lib$(ARCH).a
+LIB    = $(obj)lib$(ARCH).a
 
-AOBJS  =
-COBJS  = cache.o traps.o time.o board.o m68k_linux.o
-OBJS   = $(AOBJS) $(COBJS)
+SOBJS  =
 
-$(LIB):        .depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+COBJS  = cache.o traps.o time.o interrupts.o board.o m68k_linux.o
+
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+
+$(LIB):        $(obj).depend $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################
 
-.depend:       Makefile $(AOBJS:.o=.S) $(COBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(AOBJS:.o=.S) $(COBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################