TheOnePath/hyprsolus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Makefile

Browse Source 
Fixed bug typos on targets. Changed global variable name.
This commit is contained in:
Ethan Smith-Coss 2024-06-18 21:41:09 +01:00
parent 1e25a6ddc0
commit 4a9a75d352
Signed by: TheOnePath
GPG Key ID: 1D351CCC6D01F32B
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -2,8 +2,7 @@
CMAKE=/usr/bin/cmake CMAKE=/usr/bin/cmake
MESON=/usr/bin/meson MESON=/usr/bin/meson
# Paths for installed apps # Paths for installed apps
BIN_SYSTEM_PATH=/usr/local/bin INCLUDE_SYS_PATH=/usr/include
INC_SYSTEM_PATH=/usr/include
# Set the default target to build # Set the default target to build
.DEFAULT_GOAL := build .DEFAULT_GOAL := build
@ -13,7 +12,7 @@ INC_SYSTEM_PATH=/usr/include
# Build and install tomlplusplus if it's not on the system # Build and install tomlplusplus if it's not on the system
tomlplusplus: tomlplusplus:
git clone https://github.com/marzer/tomlplusplus.git git clone https://github.com/marzer/tomlplusplus.git
__Tomlplusplus = $(INC_SYSTEM_PATH)/toml++ __Tomlplusplus = $(INCLUDE_SYS_PATH)/toml++
$(__Tomlplusplus): tomlplusplus $(__Tomlplusplus): tomlplusplus
@echo "Building and installing tomlplusplus..." @echo "Building and installing tomlplusplus..."
cd tomlplusplus && $(MESON) setup build --buildtype=release --prefix=/usr cd tomlplusplus && $(MESON) setup build --buildtype=release --prefix=/usr
@ -26,8 +25,8 @@ $(__Tomlplusplus): tomlplusplus
hyprcursor: hyprcursor:
git submodule init git submodule init
git submodule update --remote hyprcursor git submodule update --remote hyprcursor
__Hypercursor = $(INC_SYSTEM_PATH)/hyprcursor.hpp __Hyprcursor = $(INCLUDE_SYS_PATH)/hyprcursor.hpp
$(__Hypercursor): $(__Hyperlang) $(__Hyprcursor): $(__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
@ -42,7 +41,7 @@ $(__Hypercursor): $(__Hyperlang)
hyprutils: hyprutils:
git submodule init git submodule init
git submodule update --remote hyprutils git submodule update --remote hyprutils
__Hyprutils = $(INC_SYSTEM_PATH)/hyprutils __Hyprutils = $(INCLUDE_SYS_PATH)/hyprutils
$(__Hyprutils): $(__Hyprutils):
@[[ -z "$(ls -A hyprutils)" ]] && $(MAKE) hyprutils @[[ -z "$(ls -A hyprutils)" ]] && $(MAKE) hyprutils
$(CMAKE) --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \ $(CMAKE) --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release \
@ -57,7 +56,7 @@ $(__Hyprutils):
hyprlang: hyprlang:
git submodule init git submodule init
git submodule update --remote hyprlang git submodule update --remote hyprlang
__Hyprlang = $(INC_SYSTEM_PATH)/hyprlang.hpp __Hyprlang = $(INCLUDE_SYS_PATH)/hyprlang.hpp
$(__Hyprlang): $(__Hyprutils) $(__Hyprlang): $(__Hyprutils)
@[[ -z "$(ls -A hyprlang)" ]] && $(MAKE) hyprlang @[[ -z "$(ls -A hyprlang)" ]] && $(MAKE) hyprlang
# built using cmake # built using cmake
@ -76,8 +75,8 @@ $(__Hyprlang): $(__Hyprutils)
Hyprland: Hyprland:
git submodule init git submodule init
git submodule update --remote Hyprland git submodule update --remote Hyprland
__Hyperland = Hyprland/build __Hyprland = Hyprland/build
$(__Hyperland): $(__Hyperlang) $(__Hypercursor) $(__Hyprland): $(__Hyperlang) $(__Hypercursor)
@[[ -z "$(ls -A Hyprland)" ]] && $(MAKE) Hyprland @[[ -z "$(ls -A Hyprland)" ]] && $(MAKE) Hyprland
$(MAKE) -C Hyprland all $(MAKE) -C Hyprland all