From cb6aa7dd9703eb3dba275905f98de682b57d3a78 Mon Sep 17 00:00:00 2001
From: aqua <aqua@iserlohn-fortress.net>
Date: Sun, 11 Jun 2023 23:11:25 +0300
Subject: Rework leaf makefiles to be included from top-level

- remove Makefile.all
---
 src/Makefile | 27 ---------------------------
 src/build.mk | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 src/Makefile
 create mode 100755 src/build.mk

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 0d02c5d..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-include ../Makefile.config
-
-INCLUDES := -isystem../grub -I../${ARCH} -I../devices
-${ARCH}_CFLAGS   += ${INCLUDES}
-${ARCH}_CXXFLAGS += ${INCLUDES}
-
-TARGETLIB += kernel
-kernel.SRCS := multiboot2.c mmap.c kernel.cpp mem/vmm.c
-
-HOSTTARGETBIN += sched/test_taskqueue
-sched/test_taskqueue.SRCS = sched/test_taskqueue.cc
-
-HOSTTARGETBIN += sched/test_roundrobin
-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  $@'
-	@cp conf.h.in conf.h
-	@sed -i 's/@VERSION@/$(shell git describe)/' conf.h
-	@sed -i 's/@CC@/${${ARCH}_CCID}/' conf.h
-
diff --git a/src/build.mk b/src/build.mk
new file mode 100755
index 0000000..bdc1e3b
--- /dev/null
+++ b/src/build.mk
@@ -0,0 +1,29 @@
+#!../mach
+
+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
+
+HOSTTARGETBIN += sched/test_taskqueue
+sched/test_taskqueue.SRCS = sched/test_taskqueue.cc
+
+HOSTTARGETBIN += sched/test_roundrobin
+sched/test_roundrobin.SRCS = sched/test_roundrobin.cc
+
+TESTS += \
+	 sched/test_taskqueue sched/test_roundrobin
+
+kernel.c: conf.h
+conf.h: conf.h.in
+	@echo '  GEN  $@'
+	@cp conf.h.in conf.h
+	@sed -i 's/@VERSION@/$(shell git describe)/' conf.h
+	@sed -i 's/@CC@/${${ARCH}_CCID}/' conf.h
+
-- 
cgit v1.2.1