From 522f6f02adb93194e337016fe2e4e53c58d5d5ea Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 22 Jun 2009 18:01:40 -0500 Subject: [PATCH] api_examples/Makefile: Get rid of unnecessary intermediate LIB target Signed-off-by: Peter Tyser Acked-by: Rafal Jaworowski --- api_examples/Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/api_examples/Makefile b/api_examples/Makefile index 98506a07d0..a85fd9cf64 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: -- 2.25.1