From nobody Mon Sep 17 00:00:00 2001 From: Martin Hicks Date: Wed Apr 5 18:01:50 2006 -0400 Subject: [PATCH] Switch order of ELF and BIN objects for make 3.81 make 3.81 evaluates things a little differently. Without this patch the build fails as follows with make 3.81 make[1]: *** No rule to make target `hello_world.srec', needed by `all'. Stop. make[1]: Leaving directory `/home/mort/src/targa/u-boot/u-boot-TOT/examples' make: *** [examples] Error 2 Compile tested with make 3.80 and 3.81 Signed-off-by: Martin Hicks --- examples/Makefile | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) fee8cad056b09b76425e027b49144d4e9664662e diff --git a/examples/Makefile b/examples/Makefile index fee2674..5386339 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -60,44 +60,44 @@ endif include $(TOPDIR)/config.mk SREC = hello_world.srec -BIN = hello_world.bin hello_world +BIN = hello_world hello_world.bin ifeq ($(CPU),mpc8xx) SREC = test_burst.srec -BIN = test_burst.bin test_burst +BIN = test_burst test_burst.bin endif ifeq ($(ARCH),i386) SREC += 82559_eeprom.srec -BIN += 82559_eeprom.bin 82559_eeprom +BIN += 82559_eeprom 82559_eeprom.bin endif ifeq ($(ARCH),ppc) SREC += sched.srec -BIN += sched.bin sched +BIN += sched sched.bin endif ifeq ($(ARCH),blackfin) SREC += smc91111_eeprom.srec -BIN += smc91111_eeprom.bin smc91111_eeprom +BIN += smc91111_eeprom smc91111_eeprom.bin endif # The following example is pretty 8xx specific... ifeq ($(CPU),mpc8xx) SREC += timer.srec -BIN += timer.bin timer +BIN += timer timer.bin endif # The following example is 8260 specific... ifeq ($(CPU),mpc8260) SREC += mem_to_mem_idma2intr.srec -BIN += mem_to_mem_idma2intr.bin mem_to_mem_idma2intr +BIN += mem_to_mem_idma2intr mem_to_mem_idma2intr.bin endif # Utility for resetting i82559 EEPROM ifeq ($(BOARD),oxc) SREC += eepro100_eeprom.srec -BIN += eepro100_eeprom.bin eepro100_eeprom +BIN += eepro100_eeprom eepro100_eeprom.bin endif ifeq ($(BIG_ENDIAN),y) @@ -122,7 +122,7 @@ clibdir := $(shell dirname `$(CC) $(CFLA CPPFLAGS += -I.. -all: .depend $(OBJS) $(LIB) $(SREC) $(BIN) +all: .depend $(OBJS) $(LIB) $(BIN) $(SREC) ######################################################################### $(LIB): .depend $(LIBOBJS) -- 1.2.4