summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorBossCode45 <human.cyborg42@gmail.com>2023-06-19 12:49:19 +1200
committerBossCode45 <human.cyborg42@gmail.com>2023-06-19 12:49:19 +1200
commit8b4b487e685c72a478baf74aea2bf756988fe550 (patch)
tree9a5ac8ffbd65942f4ce0117a5316f7db7f4eb918 /makefile
parent6655d5dfb24ca3fd36b02550c526bca1f5d924e9 (diff)
parent185015b39b8db953b8034f29724ef03de09e7ea1 (diff)
downloadYATwm-8b4b487e685c72a478baf74aea2bf756988fe550.tar.gz
YATwm-8b4b487e685c72a478baf74aea2bf756988fe550.zip
Merge branch 'config-refactor'
Merging in the new config system with commands
Diffstat (limited to 'makefile')
-rw-r--r--makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/makefile b/makefile
index 5d15556..df4304a 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 := .
@@ -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)
@@ -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