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
---
 i686/Makefile | 18 ------------------
 i686/build.mk | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 i686/Makefile
 create mode 100755 i686/build.mk

(limited to 'i686')

diff --git a/i686/Makefile b/i686/Makefile
deleted file mode 100644
index 3702bef..0000000
--- a/i686/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-include ../Makefile.config
-
-INCLUDES := -isystem../grub
-${ARCH}_CFLAGS   += ${INCLUDES}
-${ARCH}_CXXFLAGS += ${INCLUDES}
-
-TARGETLIB += arch
-arch.SRCS = boot.s init.s \
-	    gdt.c lgdt.c \
-	    lidt.c isr.c
-
-HOSTTARGETBIN += test_gdt
-test_gdt.SRCS = test_gdt.cc
-
-TESTS += test_gdt
-
-include ../rules.mk
-
diff --git a/i686/build.mk b/i686/build.mk
new file mode 100755
index 0000000..312e553
--- /dev/null
+++ b/i686/build.mk
@@ -0,0 +1,16 @@
+#!../mach
+
+INCLUDES := -isystem../grub
+${ARCH}_CFLAGS   += ${INCLUDES}
+${ARCH}_CXXFLAGS += ${INCLUDES}
+
+TARGETLIB += arch
+arch.SRCS = boot.s init.s \
+	    gdt.c lgdt.c \
+	    lidt.c isr.c
+
+HOSTTARGETBIN += test_gdt
+test_gdt.SRCS = test_gdt.cc
+
+TESTS += test_gdt
+
-- 
cgit v1.2.1