diff options
| author | aqua <aqua@iserlohn-fortress.net> | 2023-06-11 23:11:25 +0300 |
|---|---|---|
| committer | aqua <aqua@iserlohn-fortress.net> | 2023-06-11 23:11:25 +0300 |
| commit | cb6aa7dd9703eb3dba275905f98de682b57d3a78 (patch) | |
| tree | 4b2b6ff65c148c5e9fe035e621496fcb2302dfb8 /src | |
| parent | Make code ANSI C compatible (diff) | |
| download | kernel-cb6aa7dd9703eb3dba275905f98de682b57d3a78.tar.xz | |
Rework leaf makefiles to be included from top-level
- remove Makefile.all
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/build.mk (renamed from src/Makefile) | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile b/src/build.mk index 0d02c5d..bdc1e3b 100644..100755 --- a/src/Makefile +++ b/src/build.mk @@ -1,8 +1,12 @@ -include ../Makefile.config +#!../mach -INCLUDES := -isystem../grub -I../${ARCH} -I../devices +INCLUDES := -isystem${ROOTDIR}grub -I${ROOTDIR}${ARCH} -I${ROOTDIR}devices ${ARCH}_CFLAGS += ${INCLUDES} ${ARCH}_CXXFLAGS += ${INCLUDES} +${ARCH}_LDFLAGS += -T ${ROOTDIR}${ARCH}/linker.ld + +TARGETBIN += glitch +glitch.OBJS += ${ROOTDIR}${ARCH}/arch.a kernel.a ${ROOTDIR}devices/devs.a ${ROOTDIR}lib/libk.a TARGETLIB += kernel kernel.SRCS := multiboot2.c mmap.c kernel.cpp mem/vmm.c @@ -16,8 +20,6 @@ sched/test_roundrobin.SRCS = sched/test_roundrobin.cc TESTS += \ sched/test_taskqueue sched/test_roundrobin -include ../rules.mk - kernel.c: conf.h conf.h: conf.h.in @echo ' GEN $@' |