update.

[chise/chise-base.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b58f0bc..7644e8c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,6 @@
 VERSION = @PACKAGE_VERSION@
 
+CC     = @CC@
 TAR    = tar
 SUDO   = 
 
@@ -10,10 +11,14 @@ LIBDIR              = @libdir@
 OPTS           = @ac_configure_args@
 CONCORD_OPTS   = $(OPTS)
 LIBCHISE_OPTS  = $(OPTS)
-XEMACS_OPTS    = $(OPTS) --pdump @xemacs_opts@ --without-xim --with-database=berkdb
-
-CVS_ROOT = @cvs_root@
-LEMI_CVS_ROOT = @lemi_cvs_root@
+XEMACS_OPTS    = @xemacs_configure_args@ --pdump @xemacs_opts@ --without-xim --with-database=berkdb
+FONTS_OPTS     = $(OPTS)
+
+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://www.chise.org/dist/XEmacs/packages/
 XEMACS_PACKAGES_URL = http://ftp.xemacs.org/pub/xemacs/packages/
 
 all:   build-concord build-libchise
@@ -66,7 +71,7 @@ xemacs-chise/src/config.h:
        cd xemacs-chise && ./configure --with-chise $(XEMACS_OPTS)
 
 build-xemacs:  config-xemacs
-       cd xemacs-chise && LANG=C make
+       cd xemacs-chise && LC_ALL=C make
 
 install-xemacs:        install-libchise $(BINDIR)/xemacs
 
@@ -76,7 +81,7 @@ $(BINDIR)/xemacs:     build-xemacs xemacs-chise/src/xemacs
 
 install-apel:  install-xemacs apel $(LIBDIR)/xemacs/xemacs-packages
        -$(SUDO) mkdir $(LIBDIR)/xemacs/site-packages
-       cd apel && LANG=C $(SUDO) make install-package
+       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
@@ -84,8 +89,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
+
+
+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-base:  install-ids install-nabe install-fonts
 
 
 generate-db:   install-base
@@ -139,7 +159,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 +170,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 +206,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 \
@@ -184,13 +223,13 @@ apel:
 
 $(LIBDIR)/xemacs/xemacs-packages:
        cd $(LIBDIR)/xemacs && \
-       curl $(XEMACS_PACKAGES_URL)/xemacs-sumo.tar.gz \
-       | $(SUDO) $(TAR) xvzf -
+       curl $(XEMACS_PACKAGES_URL)/xemacs-sumo.tar.bz2 \
+       | $(SUDO) $(TAR) xvjf - --exclude=apel
 
 $(LIBDIR)/xemacs/mule-packages:
        cd $(LIBDIR)/xemacs && \
-       curl $(XEMACS_PACKAGES_URL)/xemacs-mule-sumo.tar.gz \
-       | $(SUDO) $(TAR) xvzf -
+       curl $(XEMACS_PACKAGES_URL)/xemacs-mule-sumo.tar.bz2 \
+       | $(SUDO) $(TAR) xvjf -
 
 
 distclean:
@@ -198,7 +237,17 @@ 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
@@ -209,4 +258,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