summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorBenji Dial <benji@benjidial.net>2024-05-20 17:40:47 -0400
committerBenji Dial <benji@benjidial.net>2024-05-20 17:40:47 -0400
commit9af5588c30c4126a2800aae1afcb0de2c373dc6c (patch)
treed2a48a97b1664f958b5f88a8b0c03ef8366b0f49 /makefile
parent5a54df93c4e9368c36e69d1e9c88cd2904e92308 (diff)
downloadhilbert-os-9af5588c30c4126a2800aae1afcb0de2c373dc6c.tar.gz
rewrite application stuff in the kernel to support multitasking
Diffstat (limited to 'makefile')
-rw-r--r--makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/makefile b/makefile
index 060ec5b..17747e3 100644
--- a/makefile
+++ b/makefile
@@ -37,6 +37,7 @@ clean:
make -C euler clean
make -C kernel clean
make -C applications/init clean
+ make -C applications/goldman clean
make -C libraries/daguerre clean
clean-dependencies: clean
@@ -57,7 +58,7 @@ ${MINTSUKI_HEADERS_DEP}:
${BINUTILS_DEP}:
mkdir -p dependencies toolchain/usr
- test -e dependencies/binutils || (git clone --depth 1 -b binutils-2_42 https://sourceware.org/git/binutils-gdb dependencies/binutils && cd dependencies/binutils && git apply ../../patches/binutils.txt)
+ test -e dependencies/binutils || git clone --depth 1 -b binutils-2_42 https://sourceware.org/git/binutils-gdb dependencies/binutils
mkdir -p dependencies/binutils/build
cd dependencies/binutils/build && ../configure --disable-gdb \
--target=x86_64-elf --prefix=${TOOLCHAIN_DIR}/usr
@@ -97,15 +98,19 @@ ${DAGUERRE_DEP}: ${LIBRARY_DEPS}
kernel/build/kernel.elf: ${GCC_DEP} ${MINTSUKI_HEADERS_DEP} ${LIMINE_DEP}
+make -C kernel build/kernel.elf
-applications/init/build/init.elf: ${APP_DEPS} ${DAGUERRE_DEP}
+applications/init/build/init.elf: ${APP_DEPS}
+make -C applications/init build/init.elf
-build/initfs.tgz: applications/init/build/init.elf
+applications/goldman/build/goldman.elf: ${APP_DEPS}
+ +make -C applications/goldman build/goldman.elf
+
+build/initfs.tgz: applications/init/build/init.elf \
+ applications/goldman/build/goldman.elf
@mkdir -p build
rm -rf build/initfs
cp -r skeleton build/initfs
- mkdir build/initfs/bin
cp applications/init/build/init.elf build/initfs/bin/init
+ cp applications/goldman/build/goldman.elf build/initfs/bin/goldman
cd build/initfs && tar czf ../initfs.tgz .
build/disk.iso: kernel/build/kernel.elf build/initfs.tgz ${LIMINE_DEP}