Updated Makefile

Changed target prerequisits. Added hyprwayland-scanner library.
This commit is contained in:
Ethan Smith-Coss 2024-06-18 21:59:08 +01:00
parent 4a9a75d352
commit 1bd177d797
Signed by: TheOnePath
GPG Key ID: 1D351CCC6D01F32B

View File

@ -26,7 +26,7 @@ hyprcursor:
git submodule init git submodule init
git submodule update --remote hyprcursor git submodule update --remote hyprcursor
__Hyprcursor = $(INCLUDE_SYS_PATH)/hyprcursor.hpp __Hyprcursor = $(INCLUDE_SYS_PATH)/hyprcursor.hpp
$(__Hyprcursor): $(__Hyperlang) $(__Hyprcursor): $(__Tomlplusplus) $(__Hyperlang)
@[[ -z "$(ls -A hyprcursor)" ]] && $(MAKE) hyprcursor @[[ -z "$(ls -A hyprcursor)" ]] && $(MAKE) hyprcursor
$(CMAKE) --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \ $(CMAKE) --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_PREFIX:PATH=/usr -S ./hyprcursor -B ./hyprcursor/build -DCMAKE_INSTALL_PREFIX:PATH=/usr -S ./hyprcursor -B ./hyprcursor/build
@ -68,6 +68,21 @@ $(__Hyprlang): $(__Hyprutils)
@echo "Installing library hyprlang..." @echo "Installing library hyprlang..."
sudo $(CMAKE) --install ./hyprlang/build sudo $(CMAKE) --install ./hyprlang/build
.PHONY : hyprwayland-scanner
hyprwayland-scanner:
git submodule init
git submodule update --remote hyprwayland-scanner
__Hyprwayland-scanner = $(CMAKE_INSTALL_LIBDIR)/cmake/hyprwayland-scanner
$(__Hyprwayland-scanner):
@[[ -z "$(ls -A hyprwayland-scanner)" ]] && $(MAKE) hyprwayland-scanner
$(CMAKE) -DCMAKE_INSTALL_PREFIX=/usr -S ./hyprwayland-scanner \
-B hyprwayland-scanner/build
$(CMAKE) --build ./hyprwayland-scanner/build -j \
`nproc 2>/dev/null || getconf _NPROCESSORS_CONF`
@echo "Installing library hyprwayland-scanner..."
sudo $(CMAKE) --install ./hyprwayland-scanner/build
### Makefile targets for hyprwm apps ### ### Makefile targets for hyprwm apps ###
# Build Hyprland if it's not installed on the system # Build Hyprland if it's not installed on the system
@ -76,7 +91,7 @@ Hyprland:
git submodule init git submodule init
git submodule update --remote Hyprland git submodule update --remote Hyprland
__Hyprland = Hyprland/build __Hyprland = Hyprland/build
$(__Hyprland): $(__Hyperlang) $(__Hypercursor) $(__Hyprland): $(__Hyperlang) $(__Hypercursor) $(__Hyprwayland-scanner)
@[[ -z "$(ls -A Hyprland)" ]] && $(MAKE) Hyprland @[[ -z "$(ls -A Hyprland)" ]] && $(MAKE) Hyprland
$(MAKE) -C Hyprland all $(MAKE) -C Hyprland all
@ -119,8 +134,7 @@ $(__Wl_clipboard):
### PHONY targets that a user would run ### ### PHONY targets that a user would run ###
.PHONY : build .PHONY : build
build: $(__Tomlplusplus) $(__Hyprutils) $(__Hyprcursor) $(__Hyprlang) \ build: $(__Hyprlock) $(__Hyprpaper) $(__Wl-clipboard) $(__Hyprland)
$(__Hyprlock) $(__Hyprpaper) $(__Wl-clipboard) $(__Hyprland)
.PHONY : install .PHONY : install
install: build install: build