From 7b7b6d807f758f5a1a7a24f26425a5cafda1b3ef Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Tue, 28 Jul 2026 21:14:14 +0800 Subject: [PATCH] =?UTF-8?q?chore(make):=20=E7=AE=80=E5=8C=96=20Makefile=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=86=97=E4=BD=99=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除未使用的 PWD_DIR 变量及重复设置 TARGET 的 ifneq 块 - run / run_multiple_screen 直接调用 Xephyr, 不再经过 $(shell ... &) 包装 --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e96934a..0580b6f 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,11 @@ MAKEFILE_ABS_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) MAKEFILE_DIR := $(dir $(MAKEFILE_ABS_PATH)) -PWD_DIR := $(CURDIR)/ BUILD_DIR := $(addprefix $(MAKEFILE_DIR),build) SRC_DIR := $(addprefix $(MAKEFILE_DIR),/) TARGET_NAME := zdwm TARGET := $(addprefix $(MAKEFILE_DIR),$(TARGET_NAME)) -ifneq ($(PWD_DIR),$(MAKEFILE_DIR)) - TARGET := $(addprefix $(MAKEFILE_DIR),$(TARGET_NAME)) -endif - $(TARGET_NAME): build @@ -19,10 +14,10 @@ clean: ${RM} -r $(BUILD_DIR) run: - -$(shell Xephyr :3 -screen 1920x1080 -dpi `xrdb -get Xft.dpi` &) + Xephyr :3 -screen 1920x1080 -dpi `xrdb -get Xft.dpi` 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) DISPLAY=:3 $(TARGET)