all: Export {C,LD,AS}FLAGS

[nameless-os.git] / boot / x86 / Makefile

diff --git a/boot/x86/Makefile b/boot/x86/Makefile
index 202d83993072d373a60b39d6f57d6b9805579be1..89891a8a8f4b2ef4e55c750a68111cd66a8c73af 100644 (file)
--- a/boot/x86/Makefile
+++ b/boot/x86/Makefile
@@ -1,27 +1,19 @@
-default: mbr vbr-fat32 stage3/LOADER.BIN stage3/loader.elf
+BOOTLOADER_OBJ = mbr vbr-fat32
+ASFLAGS_BASE = -w-zeroing
 
-CFLAGS=-g -ffreestanding
-LD=i686-elf-gcc
-LDFLAGS=-T stage3/stage3.ld -nostdlib -g
+default: $(BOOTLOADER_OBJ) stage3
 
-STAGE3_OBJ=stage3/loader.o stage3/paging.o
-
-mbr: mbr.s
-       $(AS) $(ASFLAGS) -w-zeroing -o $@ $<
+stage3:
+       $(MAKE) -C stage3
 
 vbr-fat32: vbr-fat32.s fat32/*.s
-       $(AS) $(ASFLAGS) -o $@ $<
-
-stage3/loader.elf: $(STAGE3_OBJ)
-       $(CC) $(LDFLAGS) -o $@ $^ -Wl,--oformat=elf32-i386
-
-stage3/LOADER.BIN: $(STAGE3_OBJ)
-       $(CC) $(LDFLAGS) -o $@ $^
-
-stage3/loader.o: stage3/loader.s stage3/*.s
-       $(AS) $(ASFLAGS) -f elf -g dwarf2 -DGIT_REVISION=\"$(GIT_REV)\" -o $@ $<
 
 clean:
-       -rm mbr vbr-fat32 stage3/LOADER.BIN $(STAGE3_OBJ) disk.img
+       -rm mbr vbr-fat32 disk.img
+       $(MAKE) -C stage3 clean
+
+# Implicit rules
+%: %.s
+       $(AS) $(ASFLAGS_BASE) $(ASFLAGS) -f bin $< -o $@
 
-.PHONY : default clean
+.PHONY : default clean stage3