From ccc1dd7b4ba8ad5efe51aac32b26f0859d93fbe5 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Mon, 5 Apr 2021 19:37:28 +0200
Subject: Restructured make layout and cleaned some apps

---
 libs/libgui/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'libs/libgui')

diff --git a/libs/libgui/Makefile b/libs/libgui/Makefile
index 47e2556..2f76e61 100644
--- a/libs/libgui/Makefile
+++ b/libs/libgui/Makefile
@@ -6,11 +6,8 @@ COBJS = psf.o \
 	gfx.o \
 	gui.o \
 	msg.o
-CC = ccache ../../cross/opt/bin/i686-elf-gcc
-LD = ccache ../../cross/opt/bin/i686-elf-ld
-AR = ccache ../../cross/opt/bin/i686-elf-ar
 
-CFLAGS = $(CFLAGS_DEFAULT) -I../ -I../libc/inc/ -pie -fPIE -fPIC -DUSER
+CFLAGS = $(CFLAGS_DEFAULT) -I$(LIBS) -I$(LIBS)/libc/inc/ -pie -fPIE -fPIC -DUSER
 
 all: libgui
 
@@ -18,8 +15,8 @@ all: libgui
 	@$(CC) -c $(CFLAGS) $< -o $@
 
 libgui: $(COBJS)
-	@mkdir -p ../../build/
-	@$(AR) rcs ../../build/libgui.a $+
+	@mkdir -p $(BUILD)
+	@$(AR) rcs $(BUILD)/libgui.a $+
 
 clean:
 	@find . -name "*.o" -type f -delete
-- 
cgit v1.2.3