From 83a8ca56e60a4d62d2bfcb17b2fb92f249d487cc Mon Sep 17 00:00:00 2001
From: igor <igor@kolokolnikov.dev>
Date: Thu, 8 Jan 2026 00:55:50 -0800
Subject: [PATCH] Update Makefiles.

---
 Makefile     | 24 +++++++++++++-----------
 src/Makefile |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index be38e3e..d28ff42 100644
--- a/Makefile
+++ b/Makefile
@@ -2,35 +2,37 @@ APPLE_ID := $(shell cat ./ids/APPLE_ID)
 TEAM_ID := $(shell cat ./ids/TEAM_ID)
 APP_SPECIFIC_PASSWORD := $(shell cat ./ids/APP_SPECIFIC_PASSWORD)
 
-CmdBar.app:
+exe = CmdBar
+
+$(exe).app:
 	$(MAKE) -C src FLAGS=-O CFLAGS=-O3 default
 
 container:
-	ditto -c -k --keepParent ./src/CmdBar.app ./build/CmdBar.zip
+	ditto -c -k --keepParent ./src/$(exe).app ./build/$(exe).zip
 
 notarize:
-	xcrun notarytool submit ./build/CmdBar.zip \
+	xcrun notarytool submit ./build/$(exe).zip \
 		--apple-id "$(APPLE_ID)" --team-id "$(TEAM_ID)" \
 		--password "$(APP_SPECIFIC_PASSWORD)" --wait
 
 staple:
 	cd build && \
-	ditto -xk CmdBar.zip . && \
-	rm CmdBar.zip && \
-	xcrun stapler staple CmdBar.app
+	ditto -xk $(exe).zip . && \
+	rm $(exe).zip && \
+	xcrun stapler staple $(exe).app
 
 zip:
 	cd build && \
-	ditto -c -k --keepParent CmdBar.app CmdBar.zip
+	ditto -c -k --keepParent $(exe).app $(exe).zip
 
 dmg:
 	cp background.png build && cd build && \
-	create-dmg --volname "CmdBar Installer" --window-size 600 400 \
-		--background "background.png" --icon "CmdBar.app" 200 170 \
-		--app-drop-link 400 170 --icon-size 100 "CmdBar.dmg" "CmdBar"
+	create-dmg --volname "$(exe) Installer" --window-size 600 400 \
+		--background "background.png" --icon "$(exe).app" 200 170 \
+		--app-drop-link 400 170 --icon-size 100 "$(exe).dmg" "$(exe)"
 	rm build/background.png
 
-all: CmdBar.app container notarize staple zip dmg
+all: $(exe).app container notarize staple zip dmg
 
 status:
 	@echo 'xcrun notarytool log "" --apple-id "$(APPLE_ID)" --team-id "$(TEAM_ID)" --password "$(APP_SPECIFIC_PASSWORD)" developer_log.json'
diff --git a/src/Makefile b/src/Makefile
index 0b45213..d373e67 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -77,7 +77,7 @@ $(EXEC).app: $(EXEC)
 	mkdir -p $@/Contents/Resources/ && \
 	cp Info.plist $@/Contents/ && \
 	cp resources/AppIcon.icns $@/Contents/Resources/ && \
-	cp $(EXEC) $@/Contents/MacOS/
+	cp $(EXEC) $@/Contents/MacOS/ && \
 	$(if $(DEBUG), codesign --entitlements $(EXEC).entitlements \
 		-s ${APPLE_DEVELOPMENT} -f --timestamp -o runtime $(EXEC).app, \
 		    codesign -s ${APPLE_DEVELOPER_ID_APPLICATION} -f --timestamp \