emacs: Move emacs UI (currently just one file) to subdirectory.

Add emacs/Makefile.local and emacs/Makefile. Move emacs targets into
emacs/Makefile.local, but leave the byte compilation rule in the top
level Makefile.

diff --git a/Makefile b/Makefile
index 64b9d4aa3507c0a6ae30d3cd685703693d19c90f..bd8f50ad6e56b4f4b75ccf28dced0c89d022a3e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ include Makefile.config
 
 include lib/Makefile.local
 include compat/Makefile.local
+include emacs/Makefile.local
 include Makefile.local
 
 # The user has not set any verbosity, default to quiet mode and inform the

diff --git a/Makefile.local b/Makefile.local
index 034b20361307a12514107d3c6a6ada4dbdd9d9be..f59761ca6a909c6b01ed797cf95fc97f53eeb1b5 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,5 +1,3 @@
-emacs: notmuch.elc
-
 notmuch_client_srcs =          \
        $(notmuch_compat_srcs)  \
        debugger.c              \
@@ -36,14 +34,6 @@ install: all notmuch.1.gz
        install notmuch $(DESTDIR)$(prefix)/bin/
        install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
 
-install-emacs: install emacs
-       for d in $(DESTDIR)/$(emacs_lispdir) ; \
-       do \
-               install -d $$d ; \
-       done ;
-       install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
-       install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
-
 install-desktop:
        install -d $(DESTDIR)$(desktop_dir)
        desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop

diff --git a/emacs/Makefile b/emacs/Makefile
new file mode 100644 (file)
index 0000000..b6859ea
--- /dev/null
+++ b/emacs/Makefile
@@ -0,0 +1,7 @@
+# See Makfefile.local for the list of files to be compiled in this
+# directory.
+all:
+       $(MAKE) -C .. all
+
+.DEFAULT:
+       $(MAKE) -C .. $@

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
new file mode 100644 (file)
index 0000000..c6ca142
--- /dev/null
+++ b/emacs/Makefile.local
@@ -0,0 +1,19 @@
+dir=emacs
+emacs_sources=                 \
+       $(dir)/notmuch.el
+
+emacs_bytecode=$(subst .el,.elc,$(emacs_sources))
+
+emacs: $(emacs_bytecode)
+
+install-emacs: install emacs
+       for d in $(DESTDIR)/$(emacs_lispdir) ; \
+       do \
+               install -d $$d ; \
+       done ;
+       for f in $(emacs_sources) $(emacs_bytecode); \
+       do \
+               install -m0644 $$f $(DESTDIR)$(emacs_lispdir) ;\
+       done;
+
+CLEAN := $(CLEAN) $(emacs_bytecode)

diff --git a/notmuch.el b/emacs/notmuch.el
similarity index 100%
rename from notmuch.el
rename to emacs/notmuch.el