diff options
| author | Yoni Rabkin <yoni@rabkins.net> | 2008-06-16 18:45:37 +0300 |
|---|---|---|
| committer | Michael Olson <mwolson@gnu.org> | 2008-06-16 20:41:02 -0700 |
| commit | 0642030ce328850db198cc0134bdac6a5fdd041e (patch) | |
| tree | 0a527a738f423686e35510c9a1b6fd959adce44e | |
| parent | 8a45d190bfc5e4728f2bcab5674636c0779f7074 (diff) | |
Emms directory structure change/cleanup
I've been thinking about moving some parts of Emms to their own
directories in order to tidy up the distribution. Attached is a patch
which does this for the documentation. What do you people think?
>From 61459ce16456b31b119faefc6333007a023436d5 Mon Sep 17 00:00:00 2001
From: Yoni Rabkin <yonirabkin@member.fsf.org>
Date: Thu, 8 May 2008 23:58:07 +0300
Subject: [PATCH] Moved Emms documentation to a newly created doc directory.
As a first step in cleaning up the Emms distribution directory
structure, I've moved all the documentation to its own
directory. Makefiles have been created/updated accordingly.
Signed-off-by: Yoni Rabkin <yonirabkin@member.fsf.org>
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | doc/Makefile | 10 | ||||
| -rw-r--r-- | doc/emms.texinfo (renamed from emms.texinfo) | 0 | ||||
| -rw-r--r-- | doc/fdl.texi (renamed from fdl.texi) | 0 | ||||
| -rw-r--r-- | doc/gpl.texi (renamed from gpl.texi) | 0 |
5 files changed, 20 insertions, 11 deletions
@@ -8,6 +8,8 @@ SOURCE=$(filter-out $(SPECIAL),$(ALLSOURCE)) TARGET=$(patsubst %.el,%.elc,$(SOURCE)) MAN1PAGES=emms-print-metadata.1 +DOCDIR=doc/ + DESTDIR= PREFIX=$(DESTDIR)/usr/local INFODIR=$(PREFIX)/info @@ -16,9 +18,9 @@ SITELISP=$(PREFIX)/share/emacs/site-lisp/emms INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR) -.PHONY: all install deb-install clean -.PRECIOUS: %.elc %.info %.html -all: $(TARGET) emms-auto.el emms.info +.PHONY: all install docs deb-install clean +.PRECIOUS: %.elc +all: $(TARGET) emms-auto.el docs emms-auto.el: emms-auto.in $(SOURCE) cp emms-auto.in emms-auto.el @@ -29,17 +31,14 @@ emms-auto.el: emms-auto.in $(SOURCE) -f generate-autoloads \ $(shell pwd)/emms-auto.el . +docs: + $(MAKE) -C $(DOCDIR) + %.elc: %.el @$(EMACS) -q $(SITEFLAG) -batch \ -l emms-maint.el \ -f batch-byte-compile $< -%.info: %.texinfo - makeinfo --no-split $< - -%.html: %.texinfo - makeinfo --html --no-split $< - emms-print-metadata: emms-print-metadata.c $(CC) -o $@ $< -I/usr/include/taglib -L/usr/lib -ltag_c @@ -48,7 +47,7 @@ install: [ -d $(INFODIR) ] || install -d $(INFODIR) install -m 644 $(ALLSOURCE) $(SITELISP) install -m 644 $(ALLCOMPILED) $(SITELISP) - install -m 0644 emms.info $(INFODIR)/emms + install -m 0644 $(DOCDIR)emms.info $(INFODIR)/emms for p in $(MAN1PAGES) ; do $(GZIP) -9c $$p > $(MAN1DIR)/$$p.gz ; done $(INSTALLINFO) emms.info @@ -62,4 +61,4 @@ ChangeLog: darcs changes > $@ clean: - -rm -f *~ *.elc emms-auto.el emms.info emms.html emms-print-metadata + -rm -f *~ *.elc emms-auto.el $(DOCDIR)emms.info $(DOCDIR)emms.html emms-print-metadata diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000..cccdff3 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,10 @@ +# Don't delete if make is interrupted +.PRECIOUS: %.info %.html + +all: emms.info + +%.info: %.texinfo + makeinfo --no-split $< + +%.html: %.texinfo + makeinfo --html --no-split $< diff --git a/emms.texinfo b/doc/emms.texinfo index 5c9b5b0..5c9b5b0 100644 --- a/emms.texinfo +++ b/doc/emms.texinfo |