commit 60feba36a1d0e388125056c37af2702e71ecd826
from: Benjamin Stürz <benni@stuerz.xyz>
date: Sun Nov 10 22:28:18 2024 UTC

sys: use in-house make

commit - 18c95f58993a1dde81a9221b99c08ed65c2ab0c7
commit + 60feba36a1d0e388125056c37af2702e71ecd826
blob - daa8059df01323b921d096cbfcc637204bbea231
blob + 864939f9f2c73d8a25fac00781c07fd75c6a1701
--- MyMakefile
+++ MyMakefile
@@ -21,4 +21,4 @@ distclean: clean
 
 .include make
 .include cc
-.include sys, GNU
+.include sys
blob - a5c4151e064dd41d86bbffd70d820f853a7e8e87 (mode 644)
blob + /dev/null
--- sys/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-.SUFFIXES: .asm .o
-LDFLAGS = -s --no-pie
-
-OBJ = loader.o kernel.o floppy.o
-IMG = sys.img
-
-
-all: ${IMG}
-
-xxd: ${IMG}
-	xxd ${IMG} | less
-
-clean:
-	rm -f *.o *.elf *.bin *.img
-
-run: ${IMG}
-	qemu-system-i386 -M pc -m 1M -fda ${IMG}
-
-floppy1440.img: sys.bin
-	cat sys.bin /dev/zero | dd of=floppy1440.img bs=512 count=2880
-
-sys.img: sys.bin
-	cat sys.bin /dev/zero | dd of=sys.img bs=512 count=128
-
-sys.bin: sys.elf
-	objcopy -O binary sys.elf sys.bin
-
-sys.elf: linker.ld ${OBJ}
-	ld -o $@ -T linker.ld ${OBJ} ${LDFLAGS}
-
-user.bin: user.asm
-	nasm -fbin -o $@ user.asm
-
-.asm.o:
-	nasm -felf32 -o $@ $<
-
-kernel.o: user.bin
-
blob - /dev/null
blob + 134dbe55ed5a7cf96a2a682989492bb2fcd0b049 (mode 644)
--- /dev/null
+++ sys/MyMakefile
@@ -0,0 +1,36 @@
+LDFLAGS = -s --no-pie
+
+OBJ = loader.o kernel.o floppy.o
+IMG = sys.img
+
+all: ${IMG}
+
+xxd: ${IMG}
+	xxd ${IMG} | less
+
+clean:
+	rm -f *.o *.elf *.bin *.img
+
+run: ${IMG}
+	qemu-system-i386 -M pc -m 1M -fda ${IMG}
+
+floppy1440.img: sys.bin
+	cat sys.bin /dev/zero | dd of=floppy1440.img bs=512 count=2880
+
+sys.img: sys.bin
+	cat sys.bin /dev/zero | dd of=sys.img bs=512 count=128
+
+sys.bin: sys.elf
+	objcopy -O binary sys.elf sys.bin
+
+sys.elf: linker.ld ${OBJ}
+	ld -o $@ -T linker.ld ${OBJ} ${LDFLAGS}
+
+user.bin: user.asm
+	nasm -fbin -o $@ user.asm
+
+.asm.o:
+	nasm -felf32 -o $@ $<
+
+kernel.o: user.bin
+