aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarvin Borner2020-07-25 17:41:54 +0200
committerMarvin Borner2020-07-25 17:41:54 +0200
commit6e8fd8c61a77e4eb08d859f8e0fc42226cc4c7f3 (patch)
treeb0b23183affa278eff2c7c142e89e47dc40d9dd9 /Makefile
parentbe9ade5ac65209277dc18f8eb9b03a55e2b9e6ad (diff)
Added very basic PSF parser
Version 1 works; Version 2 not so much
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index b0326a0..d1576dc 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ COBJS = src/main.o \
src/drivers/keyboard.o \
src/drivers/ide.o \
src/features/fs.o \
+ src/features/psf.o \
src/lib/str.o \
src/lib/mem.o \
src/lib/math.o \
@@ -26,17 +27,17 @@ ASFLAGS = -f elf32
all: compile clean
%.o: %.c
- $(CC) $(CFLAGS) $< -o $@
+ @$(CC) $(CFLAGS) $< -o $@
%_asm.o: %.asm
- $(AS) $(ASFLAGS) $< -o $@
+ @$(AS) $(ASFLAGS) $< -o $@
kernel: $(COBJS)
compile: kernel
- mkdir -p build/
- $(AS) -f bin src/entry.asm -o build/boot.bin
- $(LD) -N -emain -Ttext 0x00050000 -o build/kernel.bin $(COBJS) --oformat binary
+ @mkdir -p build/
+ @$(AS) -f bin src/entry.asm -o build/boot.bin
+ @$(LD) -N -emain -Ttext 0x00050000 -o build/kernel.bin $(COBJS) --oformat binary
clean:
- find src/ -name "*.o" -type f -delete
+ @find src/ -name "*.o" -type f -delete