From 3c440f91ea7f26f7c5ed10c18bd28348020d8ebe Mon Sep 17 00:00:00 2001
From: aqua <aqua@iserlohn-fortress.net>
Date: Sun, 30 Jul 2023 17:11:43 +0300
Subject: Added make wrapper

---
 src/build.mk | 29 -----------------------------
 src/mk       | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 29 deletions(-)
 delete mode 100755 src/build.mk
 create mode 100755 src/mk

(limited to 'src')

diff --git a/src/build.mk b/src/build.mk
deleted file mode 100755
index bdc1e3b..0000000
--- a/src/build.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#!../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
-
diff --git a/src/mk b/src/mk
new file mode 100755
index 0000000..84a735f
--- /dev/null
+++ b/src/mk
@@ -0,0 +1,25 @@
+#!../mach
+
+INCLUDES := -isystem${ROOTDIR}grub -I${ROOTDIR}${ARCH} -I${ROOTDIR}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
+
+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