From 3f78dd2cdcfc89b92d1da1ac31360ed9ae47e7bc Mon Sep 17 00:00:00 2001 From: TheOnePath Date: Tue, 8 Oct 2024 19:05:31 +0100 Subject: [PATCH] Updated Makefile --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 96c68bd..a448864 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ $(__Libxcb-errors): libxcb-errors git submodule update --init ; \ /bin/sh autogen.sh ; \ /bin/sh configure --prefix=/usr ; \ - make && sudo make install ; } + make && sudo make install ; } __Aquamarine = $(INCLUDE_SYS_PATH)/aquamarine $(__Aquamarine): $(__Hyprwayland-scanner) aquamarine @@ -113,7 +113,7 @@ $(__Hyprpaper): $(__Hyprlang) # Build wl-clipboard if it's not installed on the system __Wl_clipboard = wl-clipboard/build/src -$(__Wl_clipboard)/wl-copy $(__Wl_clipboard)/wl-paste &: +$(__Wl_clipboard)/wl-copy $(__Wl_clipboard)/wl-paste &: cd wl-clipboard && $(MESON) setup --prefix=/usr build ninja -C wl-clipboard/build @@ -126,11 +126,11 @@ submodule update --init --recursive" ; exit 1 ;\ @cd Hyprland/subprojects && git submodule update --init $(MAKE) build -build: $(__Hyprlock) $(__Hyprpaper) $(__Wl_clipboard)/wl-copy $(__Hyprland) +build: $(__Hyprpaper) $(__Wl_clipboard)/wl-copy $(__Hyprland) #$(__Hyprlock) install: build - @echo "Installing hyprlock..." - sudo $(CMAKE) --install hyprlock/build +# @echo "Installing hyprlock..." +# sudo $(CMAKE) --install hyprlock/build @echo "Installing hyprpaper" sudo $(CMAKE) --install hyprpaper/build @echo "Installing wl-clipboard" @@ -144,10 +144,12 @@ update: 'git pull origin $$(git rev-parse --abbrev-ref HEAD)' # 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) + -cd libxcb-errors && 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." + -cd Hyprland && git fetch origin --tags && git checkout $$(git tag --list \ + | sort -V | tail -n1) && git pull origin $$(git rev-parse --abbrev-ref HEAD) test: build @echo "Be real, you don't want to do this, so we'll abort."