zedhugh/zdwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(make): 简化 Makefile 中的冗余逻辑

Browse Source 
- 移除未使用的 PWD_DIR 变量及重复设置 TARGET 的 ifneq 块
- run / run_multiple_screen 直接调用 Xephyr,
  不再经过 $(shell ... &) 包装
This commit is contained in:
Zedhugh Chen
2026-07-28 21:14:14 +08:00
parent 80b091a806
commit 7b7b6d807f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -1,16 +1,11 @@
MAKEFILE_ABS_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) MAKEFILE_ABS_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
MAKEFILE_DIR := $(dir $(MAKEFILE_ABS_PATH)) MAKEFILE_DIR := $(dir $(MAKEFILE_ABS_PATH))
PWD_DIR := $(CURDIR)/
BUILD_DIR := $(addprefix $(MAKEFILE_DIR),build) BUILD_DIR := $(addprefix $(MAKEFILE_DIR),build)
SRC_DIR := $(addprefix $(MAKEFILE_DIR),/) SRC_DIR := $(addprefix $(MAKEFILE_DIR),/)
TARGET_NAME := zdwm TARGET_NAME := zdwm
TARGET := $(addprefix $(MAKEFILE_DIR),$(TARGET_NAME)) TARGET := $(addprefix $(MAKEFILE_DIR),$(TARGET_NAME))
ifneq ($(PWD_DIR),$(MAKEFILE_DIR))
TARGET := $(addprefix $(MAKEFILE_DIR),$(TARGET_NAME))
endif
$(TARGET_NAME): build $(TARGET_NAME): build
@@ -19,10 +14,10 @@ clean:
${RM} -r $(BUILD_DIR) ${RM} -r $(BUILD_DIR)
run: run:
-$(shell Xephyr :3 -screen 1920x1080 -dpi `xrdb -get Xft.dpi` &) Xephyr :3 -screen 1920x1080 -dpi `xrdb -get Xft.dpi`
run_multiple_screen: run_multiple_screen:
-$(shell Xephyr :3 -screen 1920x1080 -screen 1920x1080 +xinerama -dpi `xrdb -get Xft.dpi` &) Xephyr :3 -screen 1920x1080 -screen 1920x1080 +xinerama -dpi `xrdb -get Xft.dpi`
wm: $(TARGET_NAME) wm: $(TARGET_NAME)
DISPLAY=:3 $(TARGET) DISPLAY=:3 $(TARGET)