X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=5077c32e1838ab1a17381734f88d1077ad17b6a5;hb=aa4c3c946369afeb6f71fc02c52ced313ac52839;hp=cdd0a82dbdfee617b535b7da5617ea7f6a9acb5c;hpb=dfd62624bb8a8c8b65e000d07a8b6d7fe66dc97f;p=chise%2Fchise-base.git

diff --git a/Makefile.in b/Makefile.in
index cdd0a82..5077c32 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,7 @@
 VERSION = @PACKAGE_VERSION@
 
 TAR	= tar
+SUDO	= 
 
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
@@ -9,9 +10,14 @@ LIBDIR		= @libdir@
 OPTS		= @ac_configure_args@
 CONCORD_OPTS	= $(OPTS)
 LIBCHISE_OPTS	= $(OPTS)
-XEMACS_OPTS	= $(OPTS) --pdump @xemacs_opts@ --without-xim --with-database=berkdb
+XEMACS_OPTS	= @xemacs_configure_args@ --pdump @xemacs_opts@ --without-xim --with-database=berkdb
+FONTS_OPTS	= $(OPTS)
 
-CVS_ROOT = @cvs_root@
+CHISE_GIT_ROOT	= http://git.chise.org/git/chise
+ELISP_GIT_ROOT	= http://git.chise.org/git/elisp
+CVS_ROOT = "@cvs_root@"
+LEMI_CVS_ROOT = "@lemi_cvs_root@"
+XEMACS_PACKAGES_URL = http://ftp.xemacs.org/pub/xemacs/packages/
 
 all:	build-concord build-libchise
 
@@ -32,7 +38,7 @@ build-concord:	config-concord
 install-concord:	build-concord $(LIBDIR)/libconcord.a
 
 $(LIBDIR)/libconcord.a:	concord/libconcord.la
-	cd concord && make install
+	cd concord && $(SUDO) make install
 
 
 config-libchise:	install-concord libchise libchise/config.h
@@ -46,15 +52,15 @@ build-libchise:	config-libchise
 install-libchise:	build-libchise $(LIBDIR)/libchise.a
 
 $(LIBDIR)/libchise.a:	libchise/libchise.la
-	cd libchise && make install
+	cd libchise && $(SUDO) make install
 
 
 install-core:	install-concord install-libchise install-db
 
 install-db:
-	-cd $(prefix)/share; mkdir chise
-	(cd chise-db; tar cvf - db* ) \
-		| (cd $(prefix)/share/chise; tar xvf -)
+	-cd $(prefix)/share; $(SUDO) mkdir chise
+	(cd chise-db; $(TAR) cvf - db* ) \
+		| (cd $(prefix)/share/chise; $(SUDO) $(TAR) xvf -)
 
 
 config-xemacs:	xemacs-chise xemacs-chise/src/config.h
@@ -63,22 +69,41 @@ xemacs-chise/src/config.h:
 	cd xemacs-chise && ./configure --with-chise $(XEMACS_OPTS)
 
 build-xemacs:	config-xemacs
-	cd xemacs-chise && make
+	cd xemacs-chise && LC_ALL=C make
 
 install-xemacs:	install-libchise $(BINDIR)/xemacs
 
 $(BINDIR)/xemacs:	build-xemacs xemacs-chise/src/xemacs
-	cd xemacs-chise && make install
+	cd xemacs-chise && $(SUDO) make install
 
 
-install-tomoyo-tools:	install-xemacs tomoyo-tools
-	cd tomoyo-tools && make install
+install-apel:	install-xemacs apel $(LIBDIR)/xemacs/xemacs-packages
+	-$(SUDO) mkdir $(LIBDIR)/xemacs/site-packages
+	cd apel && LC_ALL=C $(SUDO) make install-package
+
+install-tomoyo-tools:	install-apel tomoyo-tools $(LIBDIR)/xemacs/mule-packages
+	cd tomoyo-tools && $(SUDO) make install
 
 install-ids:	install-tomoyo-tools ids
-	cd ids && make install
+	cd ids && $(SUDO) make install
+
+install-nabe:	install-apel nabe
+	cd nabe && $(SUDO) make install-package
+
+
+config-fonts:	chise-fonts-installer chise-fonts-installer/config.h
+
+chise-fonts-installer/config.h:
+	cd chise-fonts-installer && ./configure $(FONTS_OPTS)
 
+build-fonts:	config-fonts
+	cd chise-fonts-installer && make
 
-install-base:	install-ids
+install-fonts:	build-fonts
+	cd chise-fonts-installer && $(SUDO) make install
+
+
+install-base:	install-ids install-nabe install-fonts
 
 
 generate-db:	install-base
@@ -88,55 +113,139 @@ chise-db:
 	-cd chise-db && mkdir db-$(VERSION)
 	(cd `xemacs -batch -vanilla -eval \
 	'(princ (file-name-as-directory data-directory))'`chise-db; \
-		tar cvf - * ) \
-		| (cd chise-db/db-$(VERSION); tar xvf - )
+		$(TAR) cvf - * ) \
+		| (cd chise-db/db-$(VERSION); $(TAR) xvf - )
 	-cd chise-db && ln -s db-$(VERSION) db
 
-tar-core:	cvs-core-clean
+tar-core:	cvs-base-clean
 	cvs commit
 	sh -c 'cvs tag -R chise-core-`echo $(VERSION) | tr . _`; \
 	cd /tmp; \
 	cvs -d $(CVS_ROOT) export -d chise-core-$(VERSION) \
 		-r chise-core-`echo $(VERSION) | tr . _` \
-		chise-base'
-	#cd /tmp; mkdir chise-core-$(VERSION)
-	#rsync -av Makefile libchise chise-db \
-	#	 xemacs-chise ids 
-	#	/tmp/chise-core-$(VERSION)
-	#rsync -av Makefile concord libchise chise-db \
-	#	/tmp/chise-core-$(VERSION)
+		chise-base; \
+	cd chise-core-$(VERSION); \
+	cvs -d $(CVS_ROOT) export \
+		-r chise-core-`echo $(VERSION) | tr . _` \
+		concord; \
+	cvs -d $(CVS_ROOT) export \
+		-r chise-core-`echo $(VERSION) | tr . _` \
+		libchise'
 	rsync -av chise-db /tmp/chise-core-$(VERSION)
-	cd /tmp; tar cvzf chise-core-$(VERSION).tar.gz \
+	cd /tmp; $(TAR) cvzf chise-core-$(VERSION).tar.gz \
 		chise-core-$(VERSION)
 
+tar-base:
+	cvs commit
+	sh -c 'cvs tag -R chise-base-`echo $(VERSION) | tr . _`; \
+	cd /tmp; \
+	cvs -d $(CVS_ROOT) export -d chise-base-$(VERSION) \
+		-r chise-base-`echo $(VERSION) | tr . _` \
+		chise-base; \
+	cd chise-base-$(VERSION); \
+	cvs -d $(CVS_ROOT) export \
+		-r chise-base-`echo $(VERSION) | tr . _` \
+		concord; \
+	cvs -d $(CVS_ROOT) export \
+		-r chise-base-`echo $(VERSION) | tr . _` \
+		libchise; \
+	cvs -d $(CVS_ROOT) export \
+		-r chise-base-`echo $(VERSION) | tr . _` \
+		-d xemacs-chise xemacs; \
+	cvs -d $(CVS_ROOT) export \
+		-r chise-base-`echo $(VERSION) | tr . _` \
+		tomoyo-tools; \
+	cvs -d $(CVS_ROOT) export \
+		-r chise-base-`echo $(VERSION) | tr . _` \
+		ids; \
+	cvs -d $(CVS_ROOT) export \
+		-r chise-base-`echo $(VERSION) | tr . _` \
+		chise-fonts-installer'
+	rsync -av chise-db /tmp/chise-base-$(VERSION)
+	cd /tmp; $(TAR) cvzf chise-base-$(VERSION).tar.gz \
+		chise-base-$(VERSION)
+
 get-base:	concord libchise xemacs-chise tomoyo-tools ids
 
-concord:	.cvs-login
-	cvs -z9 -d $(CVS_ROOT) co concord
+concord:
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co concord
+	git clone $(CHISE_GIT_ROOT)/concord.git
+
+libchise:
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co libchise
+	git clone $(CHISE_GIT_ROOT)/libchise.git
 
-libchise:	.cvs-login
-	cvs -z9 -d $(CVS_ROOT) co libchise
+xemacs-chise:
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co -d xemacs-chise xemacs
+	git clone $(CHISE_GIT_ROOT)/xemacs-chise.git
 
-xemacs-chise:	.cvs-login
-	cvs -z9 -d $(CVS_ROOT) co -d xemacs-chise xemacs
+tomoyo-tools:
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co tomoyo-tools
+	git clone $(CHISE_GIT_ROOT)/tomoyo-tools.git
 
-tomoyo-tools:	.cvs-login
-	cvs -z9 -d $(CVS_ROOT) co tomoyo-tools
+ids:
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co ids
+	git clone $(CHISE_GIT_ROOT)/ids.git
 
-ids:	.cvs-login
-	cvs -z9 -d $(CVS_ROOT) co ids
+chise-fonts-installer:
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co chise-fonts-installer
+	git clone $(CHISE_GIT_ROOT)/chise-fonts-installer.git
 
 .cvs-login:
-	cvs -d $(CVS_ROOT) login
+	if test "`echo $(CVS_ROOT)|grep '^:pserver:'`" != ""; then \
+		cvs -d $(CVS_ROOT) login;\
+	fi
 	touch .cvs-login
 
+apel:
+	#make .lemi-cvs-login
+	#cvs -z9 -d $(LEMI_CVS_ROOT) co apel
+	git clone $(ELISP_GIT_ROOT)/apel.git
+
+nabe:
+	#make .lemi-cvs-login
+	#cvs -z9 -d $(LEMI_CVS_ROOT) co nabe
+	git clone $(ELISP_GIT_ROOT)/nabe.git
+
+.lemi-cvs-login:
+	if test "`echo $(LEMI_CVS_ROOT)|grep '^:pserver:'`" != ""; then \
+		cvs -d $(LEMI_CVS_ROOT) login;\
+	fi
+	touch .lemi-cvs-login
+
+$(LIBDIR)/xemacs/xemacs-packages:
+	cd $(LIBDIR)/xemacs && \
+	curl $(XEMACS_PACKAGES_URL)/xemacs-sumo.tar.gz \
+	| $(SUDO) $(TAR) xvzf - --exclude=apel
+
+$(LIBDIR)/xemacs/mule-packages:
+	cd $(LIBDIR)/xemacs && \
+	curl $(XEMACS_PACKAGES_URL)/xemacs-mule-sumo.tar.gz \
+	| $(SUDO) $(TAR) xvzf -
+
 
 distclean:
 	cd concord; make distclean
 	cd libchise; make distclean
 	cd xemacs-chise; make distclean
 	cd ids; make clean
-
+	cd nabe; make clean
+	cd chise-fonts-installer; make distclean
+
+update:	concord libchise xemacs-chise ids chise-fonts-installer apel nabe
+	cd concord; git pull
+	cd libchise; git pull
+	cd xemacs-chise; git pull
+	cd ids; git pull
+	cd chise-fonts-installer; git pull
+	cd apel; git pull
+	cd nabe; git pull
 
 db-clean:
 	rm -rf chise-db
@@ -147,4 +256,4 @@ cvs-core-clean:
 	rm -rf concord libchise
 
 cvs-base-clean:
-	rm -rf xemacs-chise tomoyo-tools ids
+	rm -rf xemacs-chise apel tomoyo-tools ids nabe chise-fonts-installer