From b3b1385e7af85ba2cb1f92bc31706099f1b9d562 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sun, 28 Mar 2021 12:41:57 +0300
Subject: Move MemoryAllocator to libk

---
 makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 87f229f..6f49e6d 100644
--- a/makefile
+++ b/makefile
@@ -2,9 +2,8 @@ include .config
 OBJ_DIR != echo $(CONFIG_OBJ_DIR)
 include toolchain.makefile
 
-.PHONY: all libk clean test tidy todo run menuconfig
+.PHONY: all libk libd clean test tidy todo run menuconfig
 all: $(OBJ_DIR)/src/glitch.elf
-libk: $(OBJ_DIR)/libk.a
 
 LIBS := $(OBJ_DIR)/libk.a $(OBJ_DIR)/libd.a
 LD_FLAGS := $(LD_FLAGS) --library-path $(CURDIR)/$(OBJ_DIR)
@@ -14,13 +13,13 @@ export AR AR_FLAGS AS AS_FLAGS NM SED \
     TEST_CXX TEST_CXX_FLAGS \
     LD LD_FLAGS
 
-$(OBJ_DIR)/src/glitch.elf: $(LIBS)
+$(OBJ_DIR)/src/glitch.elf: libk libd
 	@make -C src OBJ_DIR=$(CURDIR)/$(OBJ_DIR)/src $(CURDIR)/$(OBJ_DIR)/src/glitch.elf
 
-$(OBJ_DIR)/libk.a:
+libk:
 	@make -C libk OBJ_DIR=$(CURDIR)/$(OBJ_DIR)/libk $(CURDIR)/$(OBJ_DIR)/libk.a
 
-$(OBJ_DIR)/libd.a:
+libd:
 	@make -C drivers OBJ_DIR=$(CURDIR)/$(OBJ_DIR)/drivers $(CURDIR)/$(OBJ_DIR)/libd.a
 
 compile_commands:
-- 
cgit v1.2.1