X-Git-Url: http://git.dujemihanovic.xyz/projects?a=blobdiff_plain;f=boot%2Fx86%2FMakefile;h=015780113b39cf299577587119689da30d821d1c;hb=750b9e3f093f34310a05ffbac7f6b1317ef786e7;hp=0349d2ae8b9d5d1cacb1786f5543b4fcd9544ec3;hpb=c4408dfedc5d7b3a4e6b584c37c58e064265ef2d;p=nameless-os.git

diff --git a/boot/x86/Makefile b/boot/x86/Makefile
index 0349d2a..0157801 100644
--- a/boot/x86/Makefile
+++ b/boot/x86/Makefile
@@ -1,25 +1,15 @@
-default: mbr vbr-fat32 LOADER.BIN
-
-all: mbr vbr-fat32 LOADER.BIN disk.img
+default: mbr vbr-fat32 stage3/LOADER.BIN
 
 mbr: mbr.s
 	$(AS) $(ASFLAGS) -w-zeroing -o $@ $<
 
-vbr-fat32: vbr-fat32.s fat32.s fat32-structs.s
+vbr-fat32: vbr-fat32.s fat32/*.s
 	$(AS) $(ASFLAGS) -o $@ $<
 
-LOADER.BIN: loader.s
+stage3/LOADER.BIN: stage3/loader.s stage3/*.s
 	$(AS) $(ASFLAGS) -o $@ $<
 
-disk.img: mbr vbr-fat32 LOADER.BIN disk.dump
-	truncate -s100M disk.img
-	sfdisk disk.img < disk.dump
-	mkfs.fat -F 32 --offset 2048 disk.img
-	dd if=mbr of=disk.img bs=440 count=1 conv=notrunc
-	dd if=vbr-fat32 of=disk.img bs=1 skip=90 seek=1048666 conv=notrunc
-	mcopy -i disk.img@@1M LOADER.BIN ::.
-
 clean:
-	-rm mbr vbr-fat32 LOADER.BIN disk.img
+	-rm mbr vbr-fat32 stage3/LOADER.BIN disk.img
 
-.PHONY : default all clean
+.PHONY : default clean