From 00caa72a1a2d10b96f62ae712d91552ca0b4eea5 Mon Sep 17 00:00:00 2001 From: tomo Date: Fri, 24 Jun 2005 15:39:37 +0000 Subject: [PATCH] (VERSION): Update to 0.23. (CONCORD_OPTS): New variable. (all): Call `build-concord'. (install): Call `install-core'. (force-config-concord): New target. (config-concord): Likewise. (concord/config.h): Likewise. (build-concord): Likewise. (install-concord): Likewise. ($(PREFIX)/lib/libconcord.a): Likewise. (config-libchise): Call `install-concord' and `libchise/config.h'. (libchise/config.h): New target. (build-libchise): Cqll `config-libchise'. (install-libchise): Call `build-libchise' and `$(PREFIX)/lib/libchise.a'. ($(PREFIX)/lib/libchise.a): New target. (install-core): New target. (install-db): Changed for new layout. (config-xemacs): Call `xemacs-chise/src/config.h'. (xemacs-chise/src/config.h): New target. (install-xemacs): Call `install-libchise' and `$(PREFIX)/bin/xemacs'. ($(PREFIX)/bin/xemacs): New target. (install-ids): Call `install-xemacs'. (install-base): New target. (generate-db): Call `install-base' instead of `install-xemacs' and `install-ids'. (chise-db): Change directory layout. (tar-core): Copy `concord'. (get-base): New target. (concord): New target. (libchise): Call `.cvs-login'. (xemacs-chise): Likewise. (ids): Likewise. (.cvs-login): New target. (distclean): Add cleaner for concord/. (db-clean): New target. (cvs-clean): New target. --- Makefile | 97 +++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 74 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 620131d..497df2d 100644 --- a/Makefile +++ b/Makefile @@ -1,52 +1,89 @@ -VERSION = 0.22 +VERSION = 0.23 TAR = tar PREFIX = /usr/local +CONCORD_OPTS = LIBCHISE_OPTS = XEMACS_OPTS = --site-includes=/sw/include:/sw/include/db4 \ --site-libraries=/sw/lib -all: config-libchise build-libchise +all: build-concord build-libchise -config-libchise: libchise +install: install-core + + +force-config-concord: concord + cd concord && ./configure $(CONCORD_OPTS) + +config-concord: concord concord/config.h + +concord/config.h: + cd concord && ./configure $(CONCORD_OPTS) + +build-concord: config-concord + cd concord && make + +install-concord: build-concord $(PREFIX)/lib/libconcord.a + +$(PREFIX)/lib/libconcord.a: concord/libconcord.la + cd concord && make install + + +config-libchise: install-concord libchise libchise/config.h + +libchise/config.h: cd libchise && ./configure $(LIBCHISE_OPTS) -build-libchise: +build-libchise: config-libchise cd libchise && make -install: install-libchise install-db +install-libchise: build-libchise $(PREFIX)/lib/libchise.a -install-libchise: +$(PREFIX)/lib/libchise.a: libchise/libchise.la cd libchise && make install + +install-core: install-concord install-libchise install-db + install-db: - (cd chise-db; tar cvf - lib share/chise) \ - | (cd $(PREFIX); tar xvf -) + -cd $(PREFIX)/share; mkdir chise + (cd chise-db; tar cvf - db* ) \ + | (cd $(PREFIX)/share/chise; tar xvf -) + +config-xemacs: xemacs-chise xemacs-chise/src/config.h -config-xemacs: xemacs-chise +xemacs-chise/src/config.h: cd xemacs-chise && ./configure --with-chise --without-xim --pdump \ $(XEMACS_OPTS) --with-database=berkdb -build-xemacs: config-xemacs +build-xemacs: config-xemacs cd xemacs-chise && make -install-xemacs: +install-xemacs: install-libchise $(PREFIX)/bin/xemacs + +$(PREFIX)/bin/xemacs: build-xemacs xemacs-chise/src/xemacs cd xemacs-chise && make install -install-ids: ids + +install-ids: install-xemacs ids cd ids && make install + + +install-base: install-ids -generate-db: install-xemacs install-ids +generate-db: install-base chise-db: -mkdir chise-db - (cd $(PREFIX); tar cvf - share/chise \ - lib/xemacs-21.4.15/etc/chise-db ) \ - | (cd chise-db; tar xvf - ) + -cd chise-db && mkdir db-$(VERSION) + (cd $(PREFIX)/lib/xemacs-21.4.15/etc/chise-db; \ + tar cvf - * ) \ + | (cd chise-db/db-$(VERSION); tar xvf - ) + -cd chise-db && ln -s db-$(VERSION) db tar-core: cvs commit @@ -60,25 +97,39 @@ tar-core: #rsync -av Makefile libchise chise-db \ # xemacs-chise ids # /tmp/chise-core-$(VERSION) - rsync -av Makefile libchise chise-db /tmp/chise-core-$(VERSION) + rsync -av Makefile concord libchise chise-db \ + /tmp/chise-core-$(VERSION) cd /tmp; tar cvzf chise-core-$(VERSION).tar.gz \ chise-core-$(VERSION) -libchise: - cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/chise login +get-base: concord libchise xemacs-chise ids + +concord: .cvs-login + cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/chise co concord + +libchise: .cvs-login cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/chise co libchise -xemacs-chise: - cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/chise login +xemacs-chise: .cvs-login cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/chise co \ -d xemacs-chise xemacs -ids: - cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/chise login +ids: .cvs-login cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/chise co ids +.cvs-login: + cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/chise login + touch .cvs-login + distclean: + cd concord; make distclean cd libchise; make distclean cd xemacs-chise; make distclean cd ids; make clean + +db-clean: + rm -rf chise-db + +cvs-clean: db-clean + rm -rf concord libchise xemacs-chise ids -- 1.7.10.4