diff options
| author | Marvin Borner | 2021-04-05 19:37:28 +0200 |
|---|---|---|
| committer | Marvin Borner | 2021-04-05 19:37:28 +0200 |
| commit | ccc1dd7b4ba8ad5efe51aac32b26f0859d93fbe5 (patch) | |
| tree | df0e8330b14cea9ed0dd6546f69be24996f52a80 /kernel | |
| parent | 1f957aafa4423c1579627a279d861d03d76f3dbb (diff) | |
Restructured make layout and cleaned some apps
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index e4b181c..1c37168 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -18,12 +18,8 @@ COBJS = main.o \ features/proc.o \ features/proc_asm.o \ features/syscall.o -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 = $(CFLAGS_DEFAULT) -Wno-address-of-packed-member -ffreestanding -Wl,-ekernel_main -I../libs/libc/inc/ -Iinc/ -DKERNEL +CFLAGS = $(CFLAGS_DEFAULT) -Wno-address-of-packed-member -ffreestanding -Wl,-ekernel_main -I$(LIBS)/libc/inc/ -Iinc/ -DKERNEL ASFLAGS = -f elf32 all: compile @@ -35,5 +31,5 @@ all: compile @$(AS) $(ASFLAGS) $< -o $@ compile: $(COBJS) - @mkdir -p ../build/apps/ - @$(LD) -N -z max-page-size=0x1000 -ekernel_main -Tlink.ld -o ../build/apps/kernel -L../build/ $+ -lk + @mkdir -p $(BUILD)/apps/ + @$(LD) -N -z max-page-size=0x1000 -ekernel_main -Tlink.ld -o $(BUILD)/apps/kernel -L$(BUILD) $+ -lk |