diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | apps/Makefile | 6 | ||||
| -rw-r--r-- | boot/Makefile | 8 | ||||
| -rw-r--r-- | kernel/Makefile | 8 | ||||
| -rw-r--r-- | libc/Makefile | 8 | ||||
| -rw-r--r-- | libgui/Makefile | 8 | ||||
| -rw-r--r-- | libtxt/Makefile | 10 | ||||
| -rwxr-xr-x | run | 6 |
8 files changed, 28 insertions, 28 deletions
@@ -21,4 +21,4 @@ compile: @echo "Compiled apps" clean: - @find kernel/ apps/ libc/ boot/ \( -name "*.o" -or -name "*.a" -or -name "*.elf" -or -name "*.bin" \) -type f -delete + @find kernel/ apps/ libc/ libtxt/ libgui/ boot/ \( -name "*.o" -or -name "*.a" -or -name "*.elf" -or -name "*.bin" \) -type f -delete diff --git a/apps/Makefile b/apps/Makefile index 9ac92b7..155e069 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -1,9 +1,9 @@ # MIT License, Copyright (c) 2020 Marvin Borner COBJS = init.o wm.o mandelbrot.o window.o test.o -CC = ../cross/opt/bin/i686-elf-gcc -LD = ../cross/opt/bin/i686-elf-ld -OC = ../cross/opt/bin/i686-elf-objcopy +CC = ccache ../cross/opt/bin/i686-elf-gcc +LD = ccache ../cross/opt/bin/i686-elf-ld +OC = ccache ../cross/opt/bin/i686-elf-objcopy CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -pedantic-errors -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -fPIE -Duserspace -Os diff --git a/boot/Makefile b/boot/Makefile index c789782..774eece 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -1,9 +1,9 @@ # MIT License, Copyright (c) 2020 Marvin Borner -CC = ../cross/opt/bin/i686-elf-gcc -LD = ../cross/opt/bin/i686-elf-ld -OC = ../cross/opt/bin/i686-elf-objcopy -AS = nasm +CC = ccache ../cross/opt/bin/i686-elf-gcc +LD = ccache ../cross/opt/bin/i686-elf-ld +OC = ccache ../cross/opt/bin/i686-elf-objcopy +AS = ccache nasm CFLAGS = -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -std=c99 -m32 -pedantic-errors -Ofast diff --git a/kernel/Makefile b/kernel/Makefile index 599412e..3fd5108 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -18,10 +18,10 @@ COBJS = main.o \ features/syscall.o \ features/net.o \ features/event.o -CC = ../cross/opt/bin/i686-elf-gcc -LD = ../cross/opt/bin/i686-elf-ld -OC = ../cross/opt/bin/i686-elf-objcopy -AS = nasm +CC = ccache ../cross/opt/bin/i686-elf-gcc +LD = ccache ../cross/opt/bin/i686-elf-ld +OC = ccache ../cross/opt/bin/i686-elf-objcopy +AS = ccache nasm # TODO: Fix -Ofast crash CFLAGS = -Wall -Wextra -Wno-address-of-packed-member -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel -O0 diff --git a/libc/Makefile b/libc/Makefile index f6cddbc..a290445 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -11,10 +11,10 @@ COBJS = str.o \ sys.o \ list.o \ random.o -CC = ../cross/opt/bin/i686-elf-gcc -LD = ../cross/opt/bin/i686-elf-ld -AR = ../cross/opt/bin/i686-elf-ar -AS = nasm +CC = ccache ../cross/opt/bin/i686-elf-gcc +LD = ccache ../cross/opt/bin/i686-elf-ld +AR = ccache ../cross/opt/bin/i686-elf-ar +AS = ccache nasm CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Iinc/ -Ofast diff --git a/libgui/Makefile b/libgui/Makefile index 67625e2..29c8db4 100644 --- a/libgui/Makefile +++ b/libgui/Makefile @@ -3,13 +3,13 @@ COBJS = psf.o \ bmp.o \ gui.o -CC = ../cross/opt/bin/i686-elf-gcc -LD = ../cross/opt/bin/i686-elf-ld -AR = ../cross/opt/bin/i686-elf-ar +CC = ccache ../cross/opt/bin/i686-elf-gcc +LD = ccache ../cross/opt/bin/i686-elf-ld +AR = ccache ../cross/opt/bin/i686-elf-ar CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Iinc/ -I../libc/inc/ -fPIE -Duserspace -Ofast -all: libgui clean +all: libgui %.o: %.c @$(CC) -c $(CFLAGS) $< -o $@ diff --git a/libtxt/Makefile b/libtxt/Makefile index 62a2afb..3731aa2 100644 --- a/libtxt/Makefile +++ b/libtxt/Makefile @@ -1,18 +1,18 @@ # MIT License, Copyright (c) 2020 Marvin Borner COBJS = keymap.o -CC = ../cross/opt/bin/i686-elf-gcc -LD = ../cross/opt/bin/i686-elf-ld -AR = ../cross/opt/bin/i686-elf-ar +CC = ccache ../cross/opt/bin/i686-elf-gcc +LD = ccache ../cross/opt/bin/i686-elf-ld +AR = ccache ../cross/opt/bin/i686-elf-ar CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Iinc/ -I../libc/inc/ -fPIE -Duserspace -Ofast -all: libgui clean +all: libtxt %.o: %.c @$(CC) -c $(CFLAGS) $< -o $@ -libgui: $(COBJS) +libtxt: $(COBJS) @mkdir -p ../build/ @$(AR) rcs ../build/libtxt.a $+ @@ -180,8 +180,8 @@ make_test() { if [ "$mode" = "test" ]; then qemu_with_flags -serial file:test.log -nographic -drive file=build/disk.img,format=raw,index=1,media=disk & - sleep 2 - killall -9 qemu-system-i386 + sleep 1 + pkill qemu-system-i386 || true echo grep -E 'PASS|FAIL' test.log if grep -q "All tests passed" test.log; then exit 0; else exit 1; fi @@ -231,7 +231,7 @@ make_sync() { make_clean() { rm -rf build/ - make clean + $MAKE clean } if [ "${mode}" = "cross" ]; then |