diff --git a/.config/Makefile b/.config/Makefile new file mode 100644 index 0000000..0d9939f --- /dev/null +++ b/.config/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/.config +modules=awesome clfswm cower dunst fehlstart fish herbstluftwm \ + newsbeuter zathura + +include ../dotfiles.mk diff --git a/.config/awesome/Makefile b/.config/awesome/Makefile new file mode 100644 index 0000000..bec3818 --- /dev/null +++ b/.config/awesome/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/awesome +modules=themes +objects=bowl.lua ext.lua infoline.lua keychain.lua oni.lua rc.lua + +include ../../dotfiles.mk diff --git a/.config/awesome/themes/Makefile b/.config/awesome/themes/Makefile new file mode 100644 index 0000000..85298f3 --- /dev/null +++ b/.config/awesome/themes/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/themes +modules=custom + +include ../../../dotfiles.mk diff --git a/.config/awesome/themes/custom/Makefile b/.config/awesome/themes/custom/Makefile new file mode 100644 index 0000000..8cebe3d --- /dev/null +++ b/.config/awesome/themes/custom/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/custom +objects=theme.lua + +include ../../../../dotfiles.mk diff --git a/.config/clfswm/Makefile b/.config/clfswm/Makefile new file mode 100644 index 0000000..d79241a --- /dev/null +++ b/.config/clfswm/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/clfswm +objects=clfswmrc + +include ../../dotfiles.mk diff --git a/.config/cower/Makefile b/.config/cower/Makefile new file mode 100644 index 0000000..8828ad3 --- /dev/null +++ b/.config/cower/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/cower +objects=config + +include ../../dotfiles.mk diff --git a/.config/dunst/Makefile b/.config/dunst/Makefile new file mode 100644 index 0000000..4f8a4e5 --- /dev/null +++ b/.config/dunst/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/dunst +objects=dunstrc + +include ../../dotfiles.mk diff --git a/.config/fehlstart/Makefile b/.config/fehlstart/Makefile new file mode 100644 index 0000000..303a9ca --- /dev/null +++ b/.config/fehlstart/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/fehlstart +objects=fehlstart.rc + +include ../../dotfiles.mk diff --git a/.config/fish/Makefile b/.config/fish/Makefile new file mode 100644 index 0000000..2b32c1b --- /dev/null +++ b/.config/fish/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/fish +objects=config.fish + +include ../../dotfiles.mk diff --git a/.config/herbstluftwm/Makefile b/.config/herbstluftwm/Makefile new file mode 100644 index 0000000..f875c23 --- /dev/null +++ b/.config/herbstluftwm/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/herbstluftwm +objects=autostart panel.sh + +include ../../dotfiles.mk diff --git a/.config/newsbeuter/Makefile b/.config/newsbeuter/Makefile new file mode 100644 index 0000000..fbf22de --- /dev/null +++ b/.config/newsbeuter/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/newsbeuter +objects=config urls + +include ../../dotfiles.mk diff --git a/.config/zathura/Makefile b/.config/zathura/Makefile new file mode 100644 index 0000000..c6c93c1 --- /dev/null +++ b/.config/zathura/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/zathura +objects=zathurarc + +include ../../dotfiles.mk diff --git a/.conkerorrc/Makefile b/.conkerorrc/Makefile new file mode 100644 index 0000000..d2bc0db --- /dev/null +++ b/.conkerorrc/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/.conkerorrc +modules=themes +objects=gtk2rc init.js + +include ../dotfiles.mk diff --git a/.conkerorrc/themes/Makefile b/.conkerorrc/themes/Makefile new file mode 100644 index 0000000..a88d833 --- /dev/null +++ b/.conkerorrc/themes/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/themes +modules=naquadah + +include ../../dotfiles.mk diff --git a/.conkerorrc/themes/naquadah/Makefile b/.conkerorrc/themes/naquadah/Makefile new file mode 100644 index 0000000..0512339 --- /dev/null +++ b/.conkerorrc/themes/naquadah/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/naquadah +objects=conkeror--scrollbars.css hints--url-panel.css minibuffer.css \ + mode-line.css new-tabs.css tab-bar.css theme.json + +include ../../../dotfiles.mk 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/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 diff --git a/.moc/Makefile b/.moc/Makefile new file mode 100644 index 0000000..5eb4fa2 --- /dev/null +++ b/.moc/Makefile @@ -0,0 +1,5 @@ +DESTDIR:=$(DESTDIR)/.moc +modules=themes +objects=config + +include ../dotfiles.mk diff --git a/.moc/themes/Makefile b/.moc/themes/Makefile new file mode 100644 index 0000000..fd61c62 --- /dev/null +++ b/.moc/themes/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/themes +objects=custom + +include ../../dotfiles.mk diff --git a/.mutt/Makefile b/.mutt/Makefile new file mode 100644 index 0000000..d1e65d1 --- /dev/null +++ b/.mutt/Makefile @@ -0,0 +1,6 @@ +DESTDIR:=$(DESTDIR)/.mutt +objects=aethon.muttrc arch.muttrc colors.muttrc gmail.muttrc \ + iactor.muttrc macros mailcap muttrc ninthfloor.muttrc \ + ryuslash.org.muttrc sig + +include ../dotfiles.mk diff --git a/.ncmpcpp/Makefile b/.ncmpcpp/Makefile new file mode 100644 index 0000000..728f643 --- /dev/null +++ b/.ncmpcpp/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/.ncmpcpp +objects=config + +include ../dotfiles.mk diff --git a/.pentadactyl/Makefile b/.pentadactyl/Makefile new file mode 100644 index 0000000..e0640d2 --- /dev/null +++ b/.pentadactyl/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/.pentadactyl +modules=plugins + +include ../dotfiles.mk diff --git a/.pentadactyl/plugins/Makefile b/.pentadactyl/plugins/Makefile new file mode 100644 index 0000000..8ed9478 --- /dev/null +++ b/.pentadactyl/plugins/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/plugins +objects=emacs.penta + +include ../../dotfiles.mk diff --git a/.sawfish/Makefile b/.sawfish/Makefile new file mode 100644 index 0000000..b680366 --- /dev/null +++ b/.sawfish/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/.sawfish +objects=rc + +include ../dotfiles.mk diff --git a/.w3m/Makefile b/.w3m/Makefile new file mode 100644 index 0000000..85d09d5 --- /dev/null +++ b/.w3m/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/.w3m +objects=config + +include ../dotfiles.mk diff --git a/.zsh/Makefile b/.zsh/Makefile new file mode 100644 index 0000000..077367e --- /dev/null +++ b/.zsh/Makefile @@ -0,0 +1,4 @@ +DESTDIR:=$(DESTDIR)/.zsh +modules=functions + +include ../dotfiles.mk diff --git a/.zsh/functions/Makefile b/.zsh/functions/Makefile new file mode 100644 index 0000000..670c57c --- /dev/null +++ b/.zsh/functions/Makefile @@ -0,0 +1,7 @@ +DESTDIR:=$(DESTDIR)/functions +objects=chpwd_show_todo chpwd_update_git_vars env get_cnt line \ + precmd_maybe_festival precmd_update_git_vars precmd_update_updates \ + preexec_update_vars prompt prompt_git_info rprompt \ + update_current_git_vars welcome + +include ../../dotfiles.mk diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ec793cd --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +export DESTDIR:=$(HOME) +modules=.emacs.d .config .conkerorrc .local .moc .mutt .ncmpcpp \ + .pentadactyl .sawfish .ssh .w3m .weechat .zsh +objects=.bash_profile .beetsconfig .conky_box.lua .conkyrc .gitconfig \ + .guile .hgrc .offlineimap.py .offlineimaprc .screenrc .scwmrc \ + .slrnrc .stumpwmrc .tmux.conf .urlview .xbindkeysrc.scm .Xdefaults \ + .xinitrc .Xmodmap .xsession .zprofile .zshrc + +include dotfiles.mk diff --git a/.emacs.d/emacs.mk b/dotfiles.mk similarity index 87% rename from .emacs.d/emacs.mk rename to dotfiles.mk index 8ffba3e..6d33f72 100644 --- a/.emacs.d/emacs.mk +++ b/dotfiles.mk @@ -19,16 +19,16 @@ install-modules=$(addprefix install-,$(modules)) uninstall-modules=$(addprefix uninstall-,$(modules)) check-modules=$(addprefix check-,$(modules)) -.PHONY: install uninstall check uninstall $(modules) +.PHONY: all install uninstall check uninstall $(modules) \ + $(install-objects) $(uninstall-objects) $(check-objects) \ + $(install-modules) $(uninstall-modules) $(check-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): %: + @echo $(MAKEFILES) @$(MAKE) -C $* $(install-objects): install-%: % @@ -50,3 +50,6 @@ $(check-objects): check-%: $(check-modules): check-%: @$(MAKE) -C $* check + +$(filter %.elc,$(objects)): %.elc: %.el + $(call compile,$^)