summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-06-22 18:01:40 -0500
committerWolfgang Denk <wd@denx.de>2009-07-11 00:30:38 +0200
commit522f6f02adb93194e337016fe2e4e53c58d5d5ea (patch)
treecccb6824a345ad772d5f459ba596320c6f902170
parent117d0ab5e6f3b3dd48fc346df4919555a78afd39 (diff)
downloadu-boot-imx-522f6f02adb93194e337016fe2e4e53c58d5d5ea.zip
u-boot-imx-522f6f02adb93194e337016fe2e4e53c58d5d5ea.tar.gz
u-boot-imx-522f6f02adb93194e337016fe2e4e53c58d5d5ea.tar.bz2
api_examples/Makefile: Get rid of unnecessary intermediate LIB target
Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Acked-by: Rafal Jaworowski <raj@semihalf.com>
-rw-r--r--api_examples/Makefile15
1 files changed, 5 insertions, 10 deletions
diff --git a/api_examples/Makefile b/api_examples/Makefile
index 98506a0..a85fd9c 100644
--- a/api_examples/Makefile
+++ b/api_examples/Makefile
@@ -44,7 +44,6 @@ OUTPUT := $(OUTPUT-y)
COBJS := $(COBJS-y)
SOBJS := $(SOBJS-y)
-LIB = $(obj)libglue.a
LIBCOBJS-$(CONFIG_API) += glue.o
LIBCOBJS-$(CONFIG_API) += crc32.o
LIBCOBJS-$(CONFIG_API) += ctype.o
@@ -54,6 +53,7 @@ LIBCOBJS-$(CONFIG_API) += libgenwrap.o
LIBCOBJS := $(LIBCOBJS-y)
LIBOBJS += $(addprefix $(obj),$(SOBJS))
+LIBOBJS += $(addprefix $(obj),$(COBJS))
LIBOBJS += $(addprefix $(obj),$(LIBCOBJS))
SRCS += $(COBJS:.o=.c)
@@ -65,17 +65,12 @@ gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
CPPFLAGS += -I..
-all: $(obj).depend $(OBJS) $(LIB) $(OUTPUT)
+all: $(obj).depend $(OBJS) $(OUTPUT)
#########################################################################
-$(LIB): $(obj).depend $(LIBOBJS)
- $(AR) $(ARFLAGS) $@ $(LIBOBJS)
-
-$(OUTPUT):
-$(obj)%: $(obj)%.o $(LIB)
- $(LD) $(obj)crt0.o -Ttext $(LOAD_ADDR) \
- -o $@ $< $(LIB) \
- -L$(gcclibdir) -lgcc
+
+$(OUTPUT): $(LIBOBJS)
+ $(LD) -Ttext $(LOAD_ADDR) -o $@ $^ -L$(gcclibdir) -lgcc
$(OBJCOPY) -O binary $@ $(OUTPUT).bin 2>/dev/null
$(obj)crc32.c: