From 4614429f5751e14e37ceedb7130b7a829c89476a Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Tue, 27 Feb 2018 23:55:46 -0500
Subject: cleaner main, random nums, perfect script run

---
 Makefile | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f874cf3..8b0d09b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,12 @@ OBJCOPY = objcopy
 
 MCUFLAGS = -mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16
 AFLAGS = $(MCUFLAGS) 
-CFLAGS = $(MCUFLAGS) -Iinclude -Iinclude/it -fno-builtin -fsigned-char -ffreestanding -Wall -Werror -Wextra -Wno-discarded-qualifiers -ggdb
-LFLAGS = 
-OFLAGS = -O ihex
+CFLAGS = $(MCUFLAGS) -ggdb \
+	-Iinclude -Iinclude/it \
+	-fno-builtin -fsigned-char -ffreestanding \
+	-Wall -Werror -Wextra -pedantic \
+	-Wno-overlength-strings -Wno-discarded-qualifiers
+LFLAGS = -T link.ld
 
 CFILES = $(wildcard src/*.c)
 AFILES = $(wildcard src/*.s) 
@@ -17,16 +20,15 @@ OUTDIR = out
 OFILES = $(patsubst src/%.c, $(OUTDIR)/%.o, $(CFILES)) \
 	 $(patsubst src/%.s, $(OUTDIR)/%.asm.o, $(AFILES))
 
-HEX = main.hex
+OUT = out/main.elf
 
-all: $(HEX)
+all: $(OUT)
 
-$(HEX): $(OFILES) initrd/init
-	@echo "  LINK   " $(HEX)
+$(OUT): $(OFILES) initrd/init libinterp.a
+	@echo "  LINK   " $(OUT)
 	@./mkinitrd.sh
 	@$(CROSS)$(OBJCOPY) -B arm -I binary -O elf32-littlearm initrd.img out/initrd.img.o
-	@$(CROSS)$(CC) $(CFLAGS) $(LFLAGS) -T link.ld out/*.o -o out/main.elf -L. -linterp
-	@$(CROSS)$(OBJCOPY) $(OFLAGS) out/main.elf $(HEX)
+	@$(CROSS)$(CC) $(CFLAGS) $(LFLAGS) out/*.o -o $(OUT) -L. -linterp
 
 $(OUTDIR)/%.o: src/%.c
 	@echo "  CC     " $<
-- 
cgit v1.2.3