X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=8821e50c17bc8bc52a536e2e766e6c01313616f2;hb=cedc90daaf162e81ff97c8d27e47ae60e33c8bc0;hp=053a4193fb923c5853c714a20e341df8bc7aa665;hpb=bb5820332704cb282f1ebc84576eb0df1cda9e2f;p=chise%2Fchise-base.git

diff --git a/Makefile.in b/Makefile.in
index 053a419..8821e50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,9 +11,12 @@ OPTS		= @ac_configure_args@
 CONCORD_OPTS	= $(OPTS)
 LIBCHISE_OPTS	= $(OPTS)
 XEMACS_OPTS	= @xemacs_configure_args@ --pdump @xemacs_opts@ --without-xim --with-database=berkdb
+FONTS_OPTS	= $(OPTS)
 
-CVS_ROOT = @cvs_root@
-LEMI_CVS_ROOT = @lemi_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
@@ -84,8 +87,23 @@ install-tomoyo-tools:	install-apel tomoyo-tools $(LIBDIR)/xemacs/mule-packages
 install-ids:	install-tomoyo-tools ids
 	cd ids && $(SUDO) make install
 
+install-nabe:	install-apel nabe
+	cd nabe && $(SUDO) make install-package
 
-install-base:	install-ids
+
+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-fonts:	build-fonts
+	cd chise-fonts-installer && $(SUDO) make install
+
+
+install-base:	install-ids install-nabe install-fonts
 
 
 generate-db:	install-base
@@ -139,7 +157,10 @@ tar-base:
 		tomoyo-tools; \
 	cvs -d $(CVS_ROOT) export \
 		-r chise-base-`echo $(VERSION) | tr . _` \
-		ids'
+		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)
@@ -147,24 +168,34 @@ tar-base:
 get-base:	concord libchise xemacs-chise tomoyo-tools ids
 
 concord:
-	make .cvs-login
-	cvs -z9 -d $(CVS_ROOT) co 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
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co libchise
+	git clone $(CHISE_GIT_ROOT)/libchise.git
 
 xemacs-chise:
-	make .cvs-login
-	cvs -z9 -d $(CVS_ROOT) co -d xemacs-chise xemacs
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co -d xemacs-chise xemacs
+	git clone $(CHISE_GIT_ROOT)/xemacs-chise.git
 
 tomoyo-tools:
-	make .cvs-login
-	cvs -z9 -d $(CVS_ROOT) co tomoyo-tools
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co tomoyo-tools
+	git clone $(CHISE_GIT_ROOT)/tomoyo-tools.git
 
 ids:
-	make .cvs-login
-	cvs -z9 -d $(CVS_ROOT) co ids
+	#make .cvs-login
+	#cvs -z9 -d $(CVS_ROOT) co ids
+	git clone $(CHISE_GIT_ROOT)/ids.git
+
+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:
 	if test "`echo $(CVS_ROOT)|grep '^:pserver:'`" != ""; then \
@@ -173,8 +204,14 @@ ids:
 	touch .cvs-login
 
 apel:
-	make .lemi-cvs-login
-	cvs -z9 -d $(LEMI_CVS_ROOT) co 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 \
@@ -198,6 +235,8 @@ distclean:
 	cd libchise; make distclean
 	cd xemacs-chise; make distclean
 	cd ids; make clean
+	cd nabe; make clean
+	cd chise-fonts-installer; make distclean
 
 
 db-clean:
@@ -209,4 +248,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