aboutsummaryrefslogtreecommitdiffstats
path: root/xmonad/Makefile
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2023-11-18 23:23:40 +0100
committerMattias Andrée <maandree@kth.se>2023-11-18 23:23:40 +0100
commit0f1df0db903ba576fd17b08197d3066af7a61e5f (patch)
treea59c04307b1382257afa3c3512ec3abadf7e0e47 /xmonad/Makefile
parentUse losetup -d instead of --detach and add clean up (diff)
downloaddotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.gz
dotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.bz2
dotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.xz
A lot of changes
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-rw-r--r--xmonad/Makefile35
1 files changed, 20 insertions, 15 deletions
diff --git a/xmonad/Makefile b/xmonad/Makefile
index 2265823..527b602 100644
--- a/xmonad/Makefile
+++ b/xmonad/Makefile
@@ -1,25 +1,31 @@
.POSIX:
-include ../common.mk
XINITRC_ORDER = 80
+CC = gcc
+
install: xmonad-autofocus-output
- $(CHECK_INSTALLED) xwallpaper
- $(CHECK_INSTALLED) xcman
- $(CHECK_INSTALLED) pdeath
- $(CHECK_INSTALLED) mate-panel
- -$(CHECK_INSTALLED) mate-settings-daemon
+ ../check-in-path xwallpaper
+ ../check-in-path xcman
+ ../check-in-path pdeath
+ ../check-in-path mate-panel
+ -../check-installed mate-settings-daemon
mkdir -p -- ~/.config/X11/xinit/xinitrc.d
- test ! -d ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xmonad
+ test ! -e ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xmonad || \
+ test -L ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xmonad
ln -sf -- ~/.dotfiles/xmonad/xinit ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xmonad
- $(CHECK_INSTALLED) general-preprocessor
- $(CHECK_INSTALLED) xpybar
+ ../check-installed general-preprocessor
+ ../check-in-path xpybar
mkdir -p -- ~/.xmonad
- test ! -d ~/.xmonad/xmonad.hs
+ test ! -e ~/.xmonad/xmonad.hs || test -L ~/.xmonad/xmonad.hs
ln -sf -- ~/.dotfiles/xmonad/xmonad.hs ~/.xmonad/xmonad.hs
- make xmonad.hs
+ $(MAKE) xmonad.hs
mkdir -p ~/.local/bin
- ln -sf -- ~/.dotfiles/xmonad/xmonad-autofocus-output ~/.local/bin
+ test ! -e ~/.local/bin/xmonad-autofocus-output || \
+ test -L ~/.local/bin/xmonad-autofocus-output
+ ln -sf -- ~/.dotfiles/xmonad/xmonad-autofocus-output ~/.local/bin/xmonad-autofocus-output
+ test ! -e ~/.xmonad/xmonad-session-rc || test -L ~/.xmonad/xmonad-session-rc
+ ln -sf -- ~/.dotfiles/xmonad/xmonad-session-rc ~/.xmonad/xmonad-session-rc
xmonad-autofocus-output: xmonad-autofocus-output.c
$(CC) -o $@ $@.c -Wall -s -lX11 -lXtst
@@ -27,14 +33,13 @@ xmonad-autofocus-output: xmonad-autofocus-output.c
include xmonad.mk
uninstall:
+ +! ../check-installed xmonad
-unlink -- ~/.config/X11/xinit/xinitrc.d/$(XINITRC_ORDER)-xmonad
-rmdir -- ~/.config/X11/xinit/xinitrc.d
-rmdir -- ~/.config/X11/xinit
-rmdir -- ~/.config/X11
-rm -rf -- ~/.xmonad
- -make clean
+ -+$(MAKE) clean
clean:
-rm -f xmonad.hs xmonad-autofocus-output
-
-.PHONY: install uninstall clean