[Commit-womb] addressbook ChangeLog Makefile

[Xavier Maillard]

CVSROOT:        /sources/womb
Module name:    addressbook
Changes by:     Xavier Maillard <zeDek> 07/05/08 09:37:19

Modified files:
        .              : ChangeLog Makefile 

Log message:
        Makefile update (new targets)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/ChangeLog?cvsroot=womb&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/addressbook/Makefile?cvsroot=womb&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/womb/addressbook/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ChangeLog   8 May 2007 09:27:59 -0000       1.17
+++ ChangeLog   8 May 2007 09:37:19 -0000       1.18
@@ -1,3 +1,8 @@
+2007-05-08  Xavier Maillard  <address@hidden>
+
+       * Makefile: Completely rewritten to follow standards. Added
+       several new target to build and to install the manual.
+
 2007-05-08  Jose E. Marchesi  <address@hidden>
 
        * addressbook.el (addrbook-summary): Remove call to `addrbook-open'.

Index: Makefile
===================================================================
RCS file: /sources/womb/addressbook/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Makefile    7 May 2007 20:14:55 -0000       1.1
+++ Makefile    8 May 2007 09:37:19 -0000       1.2
@@ -1,18 +1,35 @@
 ## Build and install stuff
 
 EMACS = emacs
+SITEFLAG=--no-site-file
+GZIP=gzip
 
-ELC = vcard.elc addressbook.elc
-INSTALL ?= install
-INSTALL_ELC = $(INSTALL) -m 644
-prefix ?= $(HOME)
-emacsdir = $(prefix)/share/emacs/site-lisp
-
-all: $(ELC)
-
-install: all
-       $(INSTALL) -d $(DESTDIR)$(emacsdir)
-       $(INSTALL_ELC) $(ELC) $(DESTDIR)$(emacsdir)
+SOURCE=$(wildcard *.el)
+TARGET=$(patsubst %.el,%.elc,$(SOURCE))
+COMPILED=$(wildcard *.elc)
+
+DESTDIR=
+PREFIX=$(DESTDIR)/usr/local
+INFODIR=$(PREFIX)/info
+MAN1DIR=$(PREFIX)/share/man/man1
+SITELISP=$(PREFIX)/share/emacs/site-lisp/addressbook
+
+INFODIR=$(PREFIX)/info
+
+INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR)
+
+.PHONY: all install clean
+.PRECIOUS: %.elc %.info %.html
+
+all: $(TARGET) addressbook.info
+
+install:
+       test -d $(SITELISP) || mkdir -p $(SITELISP)
+       [ -d $(INFODIR) ] || install -d $(INFODIR)
+       install -m 644 $(SOURCE) $(SITELISP)
+       install -m 644 $(COMPILED) $(SITELISP)
+       install -m 0644 addressbook.info $(INFODIR)/addressbook
+       $(INSTALLINFO) addressbook.info
 
 %.elc: %.el
        @echo "Byte compiling the source file "$<
@@ -20,4 +37,14 @@
                --eval '(setq load-path (cons "." load-path))' \
                -f batch-byte-compile $<
 
-clean:; rm -f $(ELC)
+%.info: %.texi
+       makeinfo --no-split $<
+
+%.html: %.texi
+       makeinfo --html --no-split $<
+
+remove-info:
+       $(INSTALLINFO) --remove addressbook.info
+
+clean:
+       -rm -f *~ $(COMPILED) addressbook.info addressbook.html