aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2017-04-02 20:22:36 -0700
committerGravatar Tom Willemse2017-04-02 20:26:21 -0700
commit05fd4916c88a8b63cdcd1ca90ca0c610eb6aeb53 (patch)
tree563a10d40403b6e638094813753bb3991e797e0a
parent0658e1b2dc5817b42781caf8417e83e5e4ed4307 (diff)
downloadnew-dotfiles-05fd4916c88a8b63cdcd1ca90ca0c610eb6aeb53.tar.gz
new-dotfiles-05fd4916c88a8b63cdcd1ca90ca0c610eb6aeb53.zip
Build Xmodmap from top-level Makefile
-rw-r--r--GNUmakefile26
-rw-r--r--Xmodmap/GNUmakefile6
-rw-r--r--Xmodmap/Xmodmap.org (renamed from Xmodmap/.Xmodmap.org)0
3 files changed, 24 insertions, 8 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 50f836d..45fd82e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,28 @@
-.PHONY: all zsh
+include dotfiles.mk
-all: zsh
+MODULES=xmodmap
+
+.PHONY: all clean $(MODULES) zsh
+
+all: $(MODULES)
+
+clean: $(addsuffix -clean,$(MODULES))
+stow: $(addsuffix -stow,$(MODULES))
zsh:
$(MAKE) -C $@
+
+###########
+# Xmodmap #
+###########
+
+xmodmap: Xmodmap/.Xmodmap
+
+Xmodmap/.Xmodmap: Xmodmap/Xmodmap.org
+ $(call tangle,fundamental)
+
+xmodmap-clean:
+ rm -f Xmodmap/.Xmodmap
+
+xmodmap-stow:
+ stow/usr/bin/stow-home Xmodmap
diff --git a/Xmodmap/GNUmakefile b/Xmodmap/GNUmakefile
deleted file mode 100644
index 30c1d75..0000000
--- a/Xmodmap/GNUmakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-include ../dotfiles.mk
-
-all: .Xmodmap
-
-.Xmodmap: .Xmodmap.org
- $(call tangle,fundamental)
diff --git a/Xmodmap/.Xmodmap.org b/Xmodmap/Xmodmap.org
index 4c8b12e..4c8b12e 100644
--- a/Xmodmap/.Xmodmap.org
+++ b/Xmodmap/Xmodmap.org