*.el -> lisp/*.el: Move lisp files into "lisp/" subdirectory.

47 files changed, 38 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index b8d6930..89eb807 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,10 @@
-EMACS=emacs
-SITEFLAG=--no-site-file
 GZIP=gzip
-ALLSOURCE=$(wildcard *.el)
-ALLCOMPILED=$(wildcard *.elc)
-SPECIAL=emms-auto.el emms-maint.el
-SOURCE=$(filter-out $(SPECIAL),$(ALLSOURCE))
-TARGET=$(patsubst %.el,%.elc,$(SOURCE))
 MAN1PAGES=emms-print-metadata.1
-
 DOCDIR=doc/
+LISPDIR=lisp
+
+ALLSOURCE=$(wildcard $(LISPDIR)/*.el)
+ALLCOMPILED=$(wildcard $(LISPDIR)/*.elc)
 
 DESTDIR=
 PREFIX=$(DESTDIR)/usr/local
@@ -18,27 +14,16 @@ SITELISP=$(PREFIX)/share/emacs/site-lisp/emms
 
 INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR)
 
-.PHONY: all install docs deb-install clean
+.PHONY: all install lisp docs deb-install clean
 .PRECIOUS: %.elc
-all: $(TARGET) emms-auto.el docs
+all: lisp docs
 
-emms-auto.el: emms-auto.in $(SOURCE)
-	cp emms-auto.in emms-auto.el
-	-rm -f emms-auto.elc
-	@$(EMACS) -q $(SITEFLAG) -batch \
-		-l emms-maint.el \
-		-l emms-auto.el \
-		-f generate-autoloads \
-		$(shell pwd)/emms-auto.el .
+lisp:
+	$(MAKE) -C $(LISPDIR)
 
 docs:
 	$(MAKE) -C $(DOCDIR)
 
-%.elc: %.el
-	@$(EMACS) -q $(SITEFLAG) -batch \
-		-l emms-maint.el \
-		-f batch-byte-compile $<
-
 emms-print-metadata: emms-print-metadata.c
 	$(CC) -o $@ $< -I/usr/include/taglib -L/usr/lib -ltag_c
 
@@ -61,4 +46,5 @@ ChangeLog:
 	darcs changes > $@
 
 clean:
-	-rm -f *~ *.elc emms-auto.el $(DOCDIR)emms.info $(DOCDIR)emms.html emms-print-metadata
+	-rm -f *~ $(DOCDIR)emms.info $(DOCDIR)emms.html emms-print-metadata
+	$(MAKE) -C $(LISPDIR) clean
diff --git a/lisp/Makefile b/lisp/Makefile
new file mode 100644
index 0000000..3153b9b
--- /dev/null
+++ b/lisp/Makefile
@@ -0,0 +1,28 @@
+EMACS=emacs
+SITEFLAG=--no-site-file
+ALLSOURCE=$(wildcard *.el)
+ALLCOMPILED=$(wildcard *.elc)
+SPECIAL=emms-auto.el emms-maint.el
+SOURCE=$(filter-out $(SPECIAL),$(ALLSOURCE))
+TARGET=$(patsubst %.el,%.elc,$(SOURCE))
+
+.PHONY: all clean
+.PRECIOUS: %.elc
+all: $(TARGET) emms-auto.el
+
+emms-auto.el: emms-auto.in $(SOURCE)
+	cp emms-auto.in emms-auto.el
+	-rm -f emms-auto.elc
+	@$(EMACS) -q $(SITEFLAG) -batch \
+		-l emms-maint.el \
+		-l emms-auto.el \
+		-f generate-autoloads \
+		$(shell pwd)/emms-auto.el .
+
+%.elc: %.el
+	@$(EMACS) -q $(SITEFLAG) -batch \
+		-l emms-maint.el \
+		-f batch-byte-compile $<
+
+clean:
+	-rm -f *~ *.elc emms-auto.el
diff --git a/emms-auto.in b/lisp/emms-auto.in
index 78c71ef..78c71ef 100644
--- a/emms-auto.in
+++ b/lisp/emms-auto.in
diff --git a/emms-bookmarks.el b/lisp/emms-bookmarks.el
index c470bc3..c470bc3 100644
--- a/emms-bookmarks.el
+++ b/lisp/emms-bookmarks.el
diff --git a/emms-browser.el b/lisp/emms-browser.el
index f8760f8..f8760f8 100644
--- a/emms-browser.el
+++ b/lisp/emms-browser.el
diff --git a/emms-cache.el b/lisp/emms-cache.el
index 9c6ae5f..9c6ae5f 100644
--- a/emms-cache.el
+++ b/lisp/emms-cache.el
diff --git a/emms-compat.el b/lisp/emms-compat.el
index 74ecb48..74ecb48 100644
--- a/emms-compat.el
+++ b/lisp/emms-compat.el
diff --git a/emms-history.el b/lisp/emms-history.el
index 47d2e73..47d2e73 100644
--- a/emms-history.el
+++ b/lisp/emms-history.el
diff --git a/emms-i18n.el b/lisp/emms-i18n.el
index ac54eff..ac54eff 100644
--- a/emms-i18n.el
+++ b/lisp/emms-i18n.el
diff --git a/emms-info-libtag.el b/lisp/emms-info-libtag.el
index 96c7613..96c7613 100644
--- a/emms-info-libtag.el
+++ b/lisp/emms-info-libtag.el
diff --git a/emms-info-metaflac.el b/lisp/emms-info-metaflac.el
index fe94db0..fe94db0 100644
--- a/emms-info-metaflac.el
+++ b/lisp/emms-info-metaflac.el
diff --git a/emms-info-mp3info.el b/lisp/emms-info-mp3info.el
index b1345cd..b1345cd 100644
--- a/emms-info-mp3info.el
+++ b/lisp/emms-info-mp3info.el
diff --git a/emms-info-ogg.el b/lisp/emms-info-ogg.el
index 035a8c6..035a8c6 100644
--- a/emms-info-ogg.el
+++ b/lisp/emms-info-ogg.el
diff --git a/emms-info-ogginfo.el b/lisp/emms-info-ogginfo.el
index e59b70a..e59b70a 100644
--- a/emms-info-ogginfo.el
+++ b/lisp/emms-info-ogginfo.el
diff --git a/emms-info.el b/lisp/emms-info.el
index d60edb9..d60edb9 100644
--- a/emms-info.el
+++ b/lisp/emms-info.el
diff --git a/emms-last-played.el b/lisp/emms-last-played.el
index 1446de6..1446de6 100644
--- a/emms-last-played.el
+++ b/lisp/emms-last-played.el
diff --git a/emms-lastfm.el b/lisp/emms-lastfm.el
index 1f597d7..1f597d7 100644
--- a/emms-lastfm.el
+++ b/lisp/emms-lastfm.el
diff --git a/emms-lyrics.el b/lisp/emms-lyrics.el
index dfcc7a8..dfcc7a8 100644
--- a/emms-lyrics.el
+++ b/lisp/emms-lyrics.el
diff --git a/emms-maint.el b/lisp/emms-maint.el
index f68f6bd..f68f6bd 100644
--- a/emms-maint.el
+++ b/lisp/emms-maint.el
diff --git a/emms-mark.el b/lisp/emms-mark.el
index d989078..d989078 100644
--- a/emms-mark.el
+++ b/lisp/emms-mark.el
diff --git a/emms-metaplaylist-mode.el b/lisp/emms-metaplaylist-mode.el
index 4b59421..4b59421 100644
--- a/emms-metaplaylist-mode.el
+++ b/lisp/emms-metaplaylist-mode.el
diff --git a/emms-mode-line-icon.el b/lisp/emms-mode-line-icon.el
index b6822f2..b6822f2 100644
--- a/emms-mode-line-icon.el
+++ b/lisp/emms-mode-line-icon.el
diff --git a/emms-mode-line.el b/lisp/emms-mode-line.el
index f8cfec4..f8cfec4 100644
--- a/emms-mode-line.el
+++ b/lisp/emms-mode-line.el
diff --git a/emms-player-mpd.el b/lisp/emms-player-mpd.el
index ba31df4..ba31df4 100644
--- a/emms-player-mpd.el
+++ b/lisp/emms-player-mpd.el
diff --git a/emms-player-mpg321-remote.el b/lisp/emms-player-mpg321-remote.el
index 6022093..6022093 100644
--- a/emms-player-mpg321-remote.el
+++ b/lisp/emms-player-mpg321-remote.el
diff --git a/emms-player-mplayer.el b/lisp/emms-player-mplayer.el
index c8bf466..c8bf466 100644
--- a/emms-player-mplayer.el
+++ b/lisp/emms-player-mplayer.el
diff --git a/emms-player-simple.el b/lisp/emms-player-simple.el
index 6286504..6286504 100644
--- a/emms-player-simple.el
+++ b/lisp/emms-player-simple.el
diff --git a/emms-player-xine.el b/lisp/emms-player-xine.el
index 715dec9..715dec9 100644
--- a/emms-player-xine.el
+++ b/lisp/emms-player-xine.el
diff --git a/emms-playing-time.el b/lisp/emms-playing-time.el
index 18da082..18da082 100644
--- a/emms-playing-time.el
+++ b/lisp/emms-playing-time.el
diff --git a/emms-playlist-limit.el b/lisp/emms-playlist-limit.el
index b79d45c..b79d45c 100644
--- a/emms-playlist-limit.el
+++ b/lisp/emms-playlist-limit.el
diff --git a/emms-playlist-mode.el b/lisp/emms-playlist-mode.el
index f451712..f451712 100644
--- a/emms-playlist-mode.el
+++ b/lisp/emms-playlist-mode.el
diff --git a/emms-playlist-sort.el b/lisp/emms-playlist-sort.el
index 3916c74..3916c74 100644
--- a/emms-playlist-sort.el
+++ b/lisp/emms-playlist-sort.el
diff --git a/emms-score.el b/lisp/emms-score.el
index 02e0d7e..02e0d7e 100644
--- a/emms-score.el
+++ b/lisp/emms-score.el
diff --git a/emms-setup.el b/lisp/emms-setup.el
index 877a768..877a768 100644
--- a/emms-setup.el
+++ b/lisp/emms-setup.el
diff --git a/emms-source-file.el b/lisp/emms-source-file.el
index 16a9461..16a9461 100644
--- a/emms-source-file.el
+++ b/lisp/emms-source-file.el
diff --git a/emms-source-playlist.el b/lisp/emms-source-playlist.el
index 08f62a3..08f62a3 100644
--- a/emms-source-playlist.el
+++ b/lisp/emms-source-playlist.el
diff --git a/emms-stream-info.el b/lisp/emms-stream-info.el
index 324a247..324a247 100644
--- a/emms-stream-info.el
+++ b/lisp/emms-stream-info.el
diff --git a/emms-streams.el b/lisp/emms-streams.el
index 711ad6f..711ad6f 100644
--- a/emms-streams.el
+++ b/lisp/emms-streams.el
diff --git a/emms-tag-editor.el b/lisp/emms-tag-editor.el
index 5f9d78e..5f9d78e 100644
--- a/emms-tag-editor.el
+++ b/lisp/emms-tag-editor.el
diff --git a/emms-url.el b/lisp/emms-url.el
index 99d7ad7..99d7ad7 100644
--- a/emms-url.el
+++ b/lisp/emms-url.el
diff --git a/emms-volume-amixer.el b/lisp/emms-volume-amixer.el
index 6bee5ab..6bee5ab 100644
--- a/emms-volume-amixer.el
+++ b/lisp/emms-volume-amixer.el
diff --git a/emms-volume.el b/lisp/emms-volume.el
index f894976..f894976 100644
--- a/emms-volume.el
+++ b/lisp/emms-volume.el
diff --git a/emms.el b/lisp/emms.el
index 4825cbd..4825cbd 100644
--- a/emms.el
+++ b/lisp/emms.el
diff --git a/jack.el b/lisp/jack.el
index e1e53fd..e1e53fd 100644
--- a/jack.el
+++ b/lisp/jack.el
diff --git a/later-do.el b/lisp/later-do.el
index ecc4197..ecc4197 100644
--- a/later-do.el
+++ b/lisp/later-do.el
diff --git a/ogg-comment.el b/lisp/ogg-comment.el
index 46dd50a..46dd50a 100644
--- a/ogg-comment.el
+++ b/lisp/ogg-comment.el
diff --git a/tq.el b/lisp/tq.el
index 8daa9a2..8daa9a2 100644
--- a/tq.el
+++ b/lisp/tq.el