aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2014-11-03 02:41:37 +1300
committerTom Ryder <tom@sanctum.geek.nz>2014-11-03 02:41:37 +1300
commit6611b51b07fdd7412000da8f20341cebdfb95c76 (patch)
tree7486a51060b4b9c1b3a4f6189072f8fe34be6042 /Makefile
parentStart urxvtd(1) on X login (diff)
downloaddotfiles-6611b51b07fdd7412000da8f20341cebdfb95c76.tar.gz
dotfiles-6611b51b07fdd7412000da8f20341cebdfb95c76.zip
Use xbindkeys for keybinding, not i3
Also consolidate Makefile into just one target for X
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 3 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 61485573..4cc4b476 100644
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,6 @@
install-vim-plugins \
install-wyrd \
install-x \
- install-xinitrc \
- install-xmodmap \
- install-xresources \
test \
test-bash \
test-bin \
@@ -81,7 +78,7 @@ install-gnupg :
install -m 0700 -d -- "$(HOME)"/.gnupg
install -m 0600 -- gnupg/*.conf "$(HOME)"/.gnupg
-install-i3 :
+install-i3 : install-x
install -m 0755 -d -- "$(HOME)"/.i3
install -m 0644 -- i3/* "$(HOME)"/.i3
@@ -185,17 +182,10 @@ install-vim-pathogen : install-vim-plugins
install-wyrd :
install -m 0644 -- wyrd/wyrdrc "$(HOME)"/.wyrdrc
-install-x : install-xmodmap \
- install-xresources \
- install-xinitrc
-
-install-xmodmap :
+install-x :
install -m 0644 -- X/Xresources "$(HOME)"/.Xresources
-
-install-xresources :
install -m 0644 -- X/Xmodmap "$(HOME)"/.Xmodmap
-
-install-xinitrc :
+ install -m 0644 -- X/xbindkeysrc "$(HOME)"/.xbindkeysrc
install -m 0644 -- X/xinitrc "$(HOME)"/.xinitrc
test : test-sh test-bash test-bin test-urxvt