From d8440368d9cbbe82a6f4ad393c4864a2a2d5c888 Mon Sep 17 00:00:00 2001 From: dhewg Date: Sat, 4 Apr 2009 18:59:31 +0200 Subject: [PATCH] Build system cleanup, less c&p ftw. --- Makefile | 53 ++++++++++++++++++----------------------------------- 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 7a29431..4ab302d 100644 --- a/Makefile +++ b/Makefile @@ -1,47 +1,30 @@ -include ../../toolchain.rules +include ../../starlet.mk -CFLAGS = -mbig-endian -fomit-frame-pointer -Os -Wall -I. -mcpu=arm926ej-s -ASFLAGS = -mbig-endian -mcpu=arm926ej-s -LDFLAGS = -nostartfiles -nodefaultlibs -mbig-endian -Wl,-T,mini.ld,-Map,mini.map -n +CFLAGS += -Os -Wall -I. +ASFLAGS += -D_LANGUAGE_ASSEMBLY +LDFLAGS += -nostartfiles -nodefaultlibs -Tmini.ld LIBS = -lgcc ELFLOADER = ../elfloader/elfloader.bin MAKEBIN = python ../makebin.py -TARGET = armboot.bin -ELF = armboot.elf -OBJECTS = start.o main.o ipc.o vsprintf.o string.o gecko.o memory.o memory_asm.o \ - utils_asm.o utils.o ff.o diskio.o sdhc.o powerpc_elf.o powerpc.o panic.o irq.o irq_asm.o \ - exception.o exception_asm.o seeprom.o crypto.o nand.o boot2.o ldhack.o +TARGET = armboot.elf +TARGET_BIN = armboot.bin +OBJS = start.o main.o ipc.o vsprintf.o string.o gecko.o memory.o memory_asm.o \ + utils_asm.o utils.o ff.o diskio.o sdhc.o powerpc_elf.o powerpc.o panic.o \ + irq.o irq_asm.o exception.o exception_asm.o seeprom.o crypto.o nand.o \ + boot2.o ldhack.o -$(TARGET) : $(ELF) $(ELFLOADER) +include ../../common.mk + +all: $(TARGET_BIN) + +$(TARGET_BIN): $(TARGET) $(ELFLOADER) @echo "MAKEBIN $@" @$(MAKEBIN) $(ELFLOADER) $< $@ -$(ELF) : mini.ld $(OBJECTS) - @echo "LD $@" - @$(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ +clean: myclean -%.o : %.S - @echo "AS $@" - @$(CC) $(CFLAGS) -D_LANGUAGE_ASSEMBLY -c -x assembler-with-cpp -o $@ $< - -%.o : %.c - @echo "CC $@" - @$(CC) $(CFLAGS) -c -o $@ $< - -%.d: %.c - @echo "DEP $@" - @set -e; $(CC) -M $(CFLAGS) $< \ - | sed 's?\($*\)\.o[ :]*?\1.o $@ : ?g' > $@; \ - [ -s $@ ] || rm -f $@ - -%.d: %.S - @echo "DEP $@" - @touch $@ - --include $(OBJECTS:.o=.d) - -clean: - -rm -f *.elf *.o *.bin *.d *.map +myclean: + -rm -f mini.bin