From f5e88cf6091aebc48fa23ff0f15a8600eb11bf8d Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 5 Dec 2012 00:13:28 +0100
Subject: Add Makefiles for all files

---
 .emacs.d/Makefile                    |  4 +--
 .emacs.d/emacs.mk                    | 52 ------------------------------------
 .emacs.d/eshell/Makefile             |  4 +--
 .emacs.d/site-lisp/Makefile          |  4 +--
 .emacs.d/snippets/Makefile           |  4 +--
 .emacs.d/snippets/html-mode/Makefile |  4 +--
 .emacs.d/snippets/org-mode/Makefile  |  4 +--
 7 files changed, 12 insertions(+), 64 deletions(-)
 delete mode 100644 .emacs.d/emacs.mk

(limited to '.emacs.d')

diff --git a/.emacs.d/Makefile b/.emacs.d/Makefile
index 734d499..0c716a8 100644
--- a/.emacs.d/Makefile
+++ b/.emacs.d/Makefile
@@ -1,5 +1,5 @@
-DESTDIR=$(HOME)/.emacs.d
+DESTDIR:=$(DESTDIR)/.emacs.d
 objects=init.elc init.el gnus.elc gnus.el
 modules=eshell site-lisp snippets
 
-include emacs.mk
+include ../dotfiles.mk
diff --git a/.emacs.d/emacs.mk b/.emacs.d/emacs.mk
deleted file mode 100644
index 8ffba3e..0000000
--- a/.emacs.d/emacs.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-LOAD_PATH=. /usr/share/emacs/site-lisp $(HOME)/.emacs.d/site-lisp
-EMACS=emacs $(addprefix -L ,$(LOAD_PATH))
-
-FG_YEL=\033[0;33m
-FG_GRE=\033[0;32m
-FG_RED=\033[0;31m
-CLR_RE=\033[0;00m
-
-compile = $(EMACS) -Q -batch -eval "(byte-compile-file \"$(1)\")"
-define newer =
-$(shell if [ "$(1)" -nt "$(DESTDIR)/$(1)" ]; then echo "newer"; fi)
-endef
-
-install-objects=$(addprefix install-,$(objects))
-uninstall-objects=$(addprefix uninstall-,$(objects))
-check-objects=$(addprefix check-,$(objects))
-
-install-modules=$(addprefix install-,$(modules))
-uninstall-modules=$(addprefix uninstall-,$(modules))
-check-modules=$(addprefix check-,$(modules))
-
-.PHONY: install uninstall check uninstall $(modules)
-all: $(modules) $(objects)
-install: $(install-modules) $(install-objects)
-check: $(check-modules) $(check-objects)
-uninstall: $(uninstall-modules) $(uninstall-objects)
-
-$(filter %.elc,$(objects)): %.elc: %.el
-	$(call compile,$^)
-
-$(modules): %:
-	@$(MAKE) -C $*
-
-$(install-objects): install-%: %
-	$(if $(call newer,$*),install -pDm 644 "$*" "$(DESTDIR)/$*")
-
-$(install-modules): install-%:
-	@$(MAKE) -C $* install
-
-$(uninstall-objects): uninstall-%:
-	$(if $(call newer,$*),rm -f "$(DESTDIR)/$*")
-
-$(uninstall-modules): uninstall-%:
-	@$(MAKE) -C $* uninstall
-
-$(check-objects): check-%:
-	@$(if $(call newer,$*), \
-		echo -e "$(FG_YEL)$* $(FG_GRE)newer$(CLR_RE)!", \
-		echo -e "$(FG_YEL)$* $(FG_RED)not newer$(CLR_RE).")
-
-$(check-modules): check-%:
-	@$(MAKE) -C $* check
diff --git a/.emacs.d/eshell/Makefile b/.emacs.d/eshell/Makefile
index 58517d0..fd3b0f2 100644
--- a/.emacs.d/eshell/Makefile
+++ b/.emacs.d/eshell/Makefile
@@ -1,5 +1,5 @@
-DESTDIR=$(HOME)/.emacs.d/eshell
+DESTDIR:=$(DESTDIR)/eshell
 objects=alias
 modules=
 
-include ../emacs.mk
+include ../../dotfiles.mk
diff --git a/.emacs.d/site-lisp/Makefile b/.emacs.d/site-lisp/Makefile
index 918086c..bbccbb7 100644
--- a/.emacs.d/site-lisp/Makefile
+++ b/.emacs.d/site-lisp/Makefile
@@ -1,7 +1,7 @@
-DESTDIR=$(HOME)/.emacs.d/eshell
+DESTDIR:=$(DESTDIR)/site-lisp
 objects=dzen.elc dzen.el eltuki.elc eltuki.el ext.elc ext.el \
 	metalexpress.elc metalexpress.el mu4e-init.elc mu4e-init.el \
 	newsticker-init.elc newsticker-init.el oni.elc oni.el org-init.elc \
 	org-init.el quick-edit-mode.elc quick-edit-mode.el
 
-include ../emacs.mk
+include ../../dotfiles.mk
diff --git a/.emacs.d/snippets/Makefile b/.emacs.d/snippets/Makefile
index 6decdb1..20d79e0 100644
--- a/.emacs.d/snippets/Makefile
+++ b/.emacs.d/snippets/Makefile
@@ -1,4 +1,4 @@
-DESTDIR=$(HOME)/.emacs.d/snippets
+DESTDIR:=$(DESTDIR)/snippets
 modules=html-mode org-mode
 
-include ../emacs.mk
+include ../../dotfiles.mk
diff --git a/.emacs.d/snippets/html-mode/Makefile b/.emacs.d/snippets/html-mode/Makefile
index 78959a3..b2dff78 100644
--- a/.emacs.d/snippets/html-mode/Makefile
+++ b/.emacs.d/snippets/html-mode/Makefile
@@ -1,4 +1,4 @@
-DESTDIR=$(HOME)/.emacs.d/snippets/html-mode
+DESTDIR:=$(DESTDIR)/html-mode
 objects=for generic-block
 
-include ../../emacs.mk
+include ../../../dotfiles.mk
diff --git a/.emacs.d/snippets/org-mode/Makefile b/.emacs.d/snippets/org-mode/Makefile
index 155256c..e913708 100644
--- a/.emacs.d/snippets/org-mode/Makefile
+++ b/.emacs.d/snippets/org-mode/Makefile
@@ -1,4 +1,4 @@
-DESTDIR=$(HOME)/.emacs.d/snippets/org-mode
+DESTDIR:=$(DESTDIR)/org-mode
 objects=codeblock heading
 
-include ../../emacs.mk
+include ../../../dotfiles.mk
-- 
cgit v1.2.3-54-g00ecf