projects
/
chise
/
chise-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(CHISE_GIT_ROOT): New variable.
[chise/chise-base.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
a10f803
..
8821e50
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-13,8
+13,10
@@
LIBCHISE_OPTS = $(OPTS)
XEMACS_OPTS = @xemacs_configure_args@ --pdump @xemacs_opts@ --without-xim --with-database=berkdb
FONTS_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
XEMACS_PACKAGES_URL = http://ftp.xemacs.org/pub/xemacs/packages/
all: build-concord build-libchise
@@
-85,6
+87,9
@@
install-tomoyo-tools: install-apel tomoyo-tools $(LIBDIR)/xemacs/mule-packages
install-ids: install-tomoyo-tools ids
cd ids && $(SUDO) make install
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
config-fonts: chise-fonts-installer chise-fonts-installer/config.h
@@
-98,7
+103,7
@@
install-fonts: build-fonts
cd chise-fonts-installer && $(SUDO) make install
cd chise-fonts-installer && $(SUDO) make install
-install-base: install-ids install-fonts
+install-base: install-ids install-nabe install-fonts
generate-db: install-base
generate-db: install-base
@@
-152,7
+157,7
@@
tar-base:
tomoyo-tools; \
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'
+ ids; \
cvs -d $(CVS_ROOT) export \
-r chise-base-`echo $(VERSION) | tr . _` \
chise-fonts-installer'
cvs -d $(CVS_ROOT) export \
-r chise-base-`echo $(VERSION) | tr . _` \
chise-fonts-installer'
@@
-163,28
+168,34
@@
tar-base:
get-base: concord libchise xemacs-chise tomoyo-tools ids
concord:
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:
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:
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:
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:
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:
chise-fonts-installer:
- make .cvs-login
- cvs -z9 -d $(CVS_ROOT) co 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 \
.cvs-login:
if test "`echo $(CVS_ROOT)|grep '^:pserver:'`" != ""; then \
@@
-193,8
+204,14
@@
chise-fonts-installer:
touch .cvs-login
apel:
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 \
.lemi-cvs-login:
if test "`echo $(LEMI_CVS_ROOT)|grep '^:pserver:'`" != ""; then \
@@
-218,6
+235,8
@@
distclean:
cd libchise; make distclean
cd xemacs-chise; make distclean
cd ids; make clean
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:
db-clean:
@@
-229,4
+248,4
@@
cvs-core-clean:
rm -rf concord libchise
cvs-base-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