From 05fd4916c88a8b63cdcd1ca90ca0c610eb6aeb53 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 2 Apr 2017 20:22:36 -0700
Subject: Build Xmodmap from top-level Makefile

---
 GNUmakefile          | 26 ++++++++++++++++++++++++--
 Xmodmap/.Xmodmap.org | 14 --------------
 Xmodmap/GNUmakefile  |  6 ------
 Xmodmap/Xmodmap.org  | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 22 deletions(-)
 delete mode 100644 Xmodmap/.Xmodmap.org
 delete mode 100644 Xmodmap/GNUmakefile
 create mode 100644 Xmodmap/Xmodmap.org

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/.Xmodmap.org b/Xmodmap/.Xmodmap.org
deleted file mode 100644
index 4c8b12e..0000000
--- a/Xmodmap/.Xmodmap.org
+++ /dev/null
@@ -1,14 +0,0 @@
-Turn the mouse into a left-handed one (switch the left and right
-buttons).
-
-#+BEGIN_SRC fundamental
-  pointer = 3 2 1
-#+END_SRC
-
-Turn the right Alt (AltGr) into a regular Alt.
-
-#+BEGIN_SRC fundamental
-  remove Mod5 = ISO_Level3_Shift
-  keycode 108 = Alt_L
-  add Mod1 = Alt_L
-#+END_SRC
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
new file mode 100644
index 0000000..4c8b12e
--- /dev/null
+++ b/Xmodmap/Xmodmap.org
@@ -0,0 +1,14 @@
+Turn the mouse into a left-handed one (switch the left and right
+buttons).
+
+#+BEGIN_SRC fundamental
+  pointer = 3 2 1
+#+END_SRC
+
+Turn the right Alt (AltGr) into a regular Alt.
+
+#+BEGIN_SRC fundamental
+  remove Mod5 = ISO_Level3_Shift
+  keycode 108 = Alt_L
+  add Mod1 = Alt_L
+#+END_SRC
-- 
cgit v1.2.3-54-g00ecf