diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-04 01:03:57 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-04 01:03:57 +0200 |
commit | 6741ae92f37caea8a22d1dcfaeab356f94b64676 (patch) | |
tree | 8abb7ed1b67b2b75733e02a923a229ed8176863f /lib_arm/Makefile | |
parent | 360b4103677b27ad4018174a1d186218969d83a1 (diff) | |
parent | f93286397ed2a7084efb0362a43ee09f11702349 (diff) |
Merge with /home/m8/git/u-boot
Diffstat (limited to 'lib_arm/Makefile')
-rw-r--r-- | lib_arm/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib_arm/Makefile b/lib_arm/Makefile index e56e06b1b3..3e0a5c7fe5 100644 --- a/lib_arm/Makefile +++ b/lib_arm/Makefile @@ -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,23 +23,24 @@ include $(TOPDIR)/config.mk -LIB = lib$(ARCH).a +LIB = $(obj)lib$(ARCH).a -AOBJS = _ashldi3.o _ashrdi3.o _divsi3.o _modsi3.o _udivsi3.o _umodsi3.o +SOBJS = _ashldi3.o _ashrdi3.o _divsi3.o _modsi3.o _udivsi3.o _umodsi3.o COBJS = armlinux.o board.o \ cache.o div0.o -OBJS = $(AOBJS) $(COBJS) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) -$(LIB): .depend $(OBJS) +$(LIB): $(obj).depend $(OBJS) $(AR) crv $@ $(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 ######################################################################### |