Changed target dependencies and order
This commit is contained in:
parent
13e8733cc7
commit
503d0686a6
9
Makefile
9
Makefile
|
|
@ -46,7 +46,7 @@ $(__Hyprutils): hyprutils
|
||||||
# Build hyprlang if the .hpp file is not installed
|
# Build hyprlang if the .hpp file is not installed
|
||||||
# Library for hyprwm
|
# Library for hyprwm
|
||||||
__Hyprlang = $(INCLUDE_SYS_PATH)/hyprlang.hpp
|
__Hyprlang = $(INCLUDE_SYS_PATH)/hyprlang.hpp
|
||||||
$(__Hyprlang): $(__Hyprutils) $(__Hyprwayland-scanner) hyprlang
|
$(__Hyprlang): hyprlang
|
||||||
$(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 ./hyprlang -B ./hyprlang/build
|
-DCMAKE_INSTALL_PREFIX:PATH=/usr -S ./hyprlang -B ./hyprlang/build
|
||||||
$(CMAKE) --build ./hyprlang/build --config Release --target hyprlang \
|
$(CMAKE) --build ./hyprlang/build --config Release --target hyprlang \
|
||||||
|
|
@ -76,7 +76,7 @@ $(__Libxcb-errors): libxcb-errors
|
||||||
make && sudo make install ; }
|
make && sudo make install ; }
|
||||||
|
|
||||||
__Aquamarine = $(INCLUDE_SYS_PATH)/aquamarine
|
__Aquamarine = $(INCLUDE_SYS_PATH)/aquamarine
|
||||||
$(__Aquamarine): $(__Hyprwayland-scanner) aquamarine
|
$(__Aquamarine): $(__Hyprwayland-scanner) $(__Hyprutils) aquamarine
|
||||||
$(CMAKE) -DCMAKE_INSTALL_PREFIX=/usr -S ./aquamarine \
|
$(CMAKE) -DCMAKE_INSTALL_PREFIX=/usr -S ./aquamarine \
|
||||||
-B aquamarine/build
|
-B aquamarine/build
|
||||||
$(CMAKE) --build ./aquamarine/build -j \
|
$(CMAKE) --build ./aquamarine/build -j \
|
||||||
|
|
@ -88,8 +88,7 @@ $(__Aquamarine): $(__Hyprwayland-scanner) aquamarine
|
||||||
|
|
||||||
# Build Hyprland if it's not installed on the system
|
# Build Hyprland if it's not installed on the system
|
||||||
__Hyprland = Hyprland/build/Hyprland
|
__Hyprland = Hyprland/build/Hyprland
|
||||||
$(__Hyprland): $(__Hyprlang) $(__Hyprcursor) $(__Hyprwayland-scanner) \
|
$(__Hyprland): $(__Hyprcursor) $(__Libxcb-errors) $(__Aquamarine)
|
||||||
$(__Libxcb-errors) $(__Aquamarine)
|
|
||||||
@echo "Building Hyprland..."
|
@echo "Building Hyprland..."
|
||||||
sudo $(MAKE) -C Hyprland all
|
sudo $(MAKE) -C Hyprland all
|
||||||
|
|
||||||
|
|
@ -126,7 +125,7 @@ submodule update --init --recursive" ; exit 1 ;\
|
||||||
@cd Hyprland/subprojects && git submodule update --init
|
@cd Hyprland/subprojects && git submodule update --init
|
||||||
$(MAKE) build
|
$(MAKE) build
|
||||||
|
|
||||||
build: $(__Hyprpaper) $(__Wl_clipboard)/wl-copy $(__Hyprland) $(__Hyprlock)
|
build: $(__Hyprland) $(__Wl_clipboard)/wl-copy $(__Hyprlock) $(__Hyprpaper)
|
||||||
|
|
||||||
install: build
|
install: build
|
||||||
@echo "Installing hyprlock..."
|
@echo "Installing hyprlock..."
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user