From 98fe643950084f91375ef29d40f5b3515baec932 Mon Sep 17 00:00:00 2001 From: TheOnePath Date: Mon, 1 Jul 2024 22:55:23 +0100 Subject: [PATCH] Updated Makefile Updated clean target to use Makefiles of other projects for cleaning. The rm for build directories still remains for other projects. --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3eeaab9..d95dce2 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ MESON=/usr/bin/meson # Paths for installed apps INCLUDE_SYS_PATH=/usr/include # Components and libraries -COMPONENTS=hyprcursor Hyprland hyprlang hyprlock hyprpaper hyprutils \ - hyprwayland-scanner wl-clipboard tomlplusplus libxcb-errors +COMPONENTS=hyprcursor hyprlang hyprlock hyprpaper hyprutils wl-clipboard \ + hyprwayland-scanner tomlplusplus libxcb-errors # Set the default target to build .DEFAULT_GOAL := all @@ -136,6 +136,9 @@ update: # In case these libraries haven't been pulled yet, ignore the exit code -cd tomlplusplus && git pull origin $$(git rev-parse --abbrev-ref HEAD) -cd libxcb-error && git pull origin $$(git rev-parse --abbrev-ref HEAD) + @echo "Please note that if tomlplusplus or libxcb-errors throw an error \ + for not being found, this is defined behaviour since these libraries \ + are cloned into the project later. You can safely ignore this." test: build @echo "Be real, you don't want to do this, so we'll abort." @@ -143,6 +146,8 @@ test: build clean: @echo "Cleaning up from build process..." + @echo "Cleaning Hyprland with Makefile." + $(MAKE) -C Hyprland clear rm -rf $(addsuffix /build, $(COMPONENTS)) >/dev/null 2>&1 .PHONY : all build install test clean update