From da3b5b2131d2b4ff5cb127e92090fca568376835 Mon Sep 17 00:00:00 2001
From: BossCode45 <human.cyborg42@gmail.com>
Date: Wed, 24 May 2023 10:28:49 +1200
Subject: in-progress: Config refactor started, changed all existing keybind
 command args and added in the new files, still many errors

---
 makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 5d15556..01e6b5d 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 .PHONY: clean
 CXX := g++
-CXXFLAGS := -std=c++17 -Iinclude `pkg-config --cflags --libs libnotify`# -g -fsanitize=address -fno-omit-frame-pointer
+CXXFLAGS := -std=c++17 `pkg-config --cflags --libs libnotify`# -g -fsanitize=address -fno-omit-frame-pointer
 LINKFLAGS := -lX11 -lXrandr
 OBJS_DIR := .
 OUT_DIR := .
@@ -32,7 +32,9 @@ remove: r
 $(OBJS_DIR)/main.o: $(SOURCE_FILES) $(SOURCE_HEADERS)
 $(OBJS_DIR)/ewmh.o: $(SOURCE_DIR)/ewmh.cpp $(SOURCE_DIR)/ewmh.h
 $(OBJS_DIR)/util.o: $(SOURCE_DIR)/util.cpp $(SOURCE_DIR)/util.h
-$(OBJS_DIR)/config.o: $(SOURCE_DIR)/config.cpp $(SOURCE_DIR)/config.h $(OBJS_DIR)/util.o
+$(OBJS_DIR)/commands.o: $(SOURCE_DIR)/commands.cpp $(SOURCE_DIR)/commands.h
+$(OBJS_DIR)/config.o: $(SOURCE_DIR)/config.cpp $(SOURCE_DIR)/config.h
+$(OBJS_DIR)/keybinds.o: $(SOURCE_DIR)/keybinds.cpp $(SOURCE_DIR)/keybinds.h $(SOURCE_DIR)/commands.h
 
 clean:
 	rm $(OBJS_DIR)/*.o 
-- 
cgit v1.2.3


From 5f54adae7bc4edaf2c18383efe13ded233255509 Mon Sep 17 00:00:00 2001
From: BossCode45 <human.cyborg42@gmail.com>
Date: Fri, 16 Jun 2023 00:05:28 +1200
Subject: feat: Uses a backup config file and respects XDG

Uses config files in the order of `$XDG_CONFIG_HOME/YATwm/config`,
`$HOME/.config/YATwm/config`, then `/etc/YATwm/config`
---
 makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 01e6b5d..df4304a 100644
--- a/makefile
+++ b/makefile
@@ -18,9 +18,9 @@ $(OBJS_DIR)/%.o : $(SOURCE_DIR)/%.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 i: $(EXEC)
-	sudo install -D $(EXEC) $(INSTALL_DIR)usr/bin/$(EXEC)
+	sudo install -D -m 755 $(EXEC) $(INSTALL_DIR)usr/bin/$(EXEC)
 	sudo install -D -m 644 yat.desktop $(INSTALL_DIR)usr/share/xsessions/yat.desktop
-	sudo install -D -m 644 config.toml $(INSTALL_DIR)etc/YATwm/config.toml
+	sudo install -D -m 644 config $(INSTALL_DIR)etc/YATwm/config
 install: i
 r:
 	sudo rm $(INSTALL_DIR)usr/bin/$(EXEC)
-- 
cgit v1.2.3