From: tomo <tomo>
Date: Sun, 14 May 2006 13:09:27 +0000 (+0000)
Subject: (XEMACS_OPTS): Add --pdump, --without-xim and --with-database=berkdb.
X-Git-Tag: chise-base-0_23~14
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfd62624bb8a8c8b65e000d07a8b6d7fe66dc97f;p=chise%2Fchise-base.git

(XEMACS_OPTS): Add --pdump, --without-xim and --with-database=berkdb.
(xemacs-chise/src/config.h): Move --without-xim, --pdump and
--with-database=berkdb to `XEMACS_OPTS'.
(tar-core): Call `cvs-core-clean'; don't copy Makefile concord and
libchise.
(cvs-clean): Use `cvs-base-clean' and `cvs-core-clean'.
(cvs-core-clean): New target.
(cvs-base-clean): New target.
---

diff --git a/Makefile.in b/Makefile.in
index 113aa12..cdd0a82 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@ LIBDIR		= @libdir@
 OPTS		= @ac_configure_args@
 CONCORD_OPTS	= $(OPTS)
 LIBCHISE_OPTS	= $(OPTS)
-XEMACS_OPTS	= $(OPTS) @xemacs_opts@
+XEMACS_OPTS	= $(OPTS) --pdump @xemacs_opts@ --without-xim --with-database=berkdb
 
 CVS_ROOT = @cvs_root@
 
@@ -60,8 +60,7 @@ install-db:
 config-xemacs:	xemacs-chise xemacs-chise/src/config.h
 
 xemacs-chise/src/config.h:
-	cd xemacs-chise && ./configure --with-chise --without-xim --pdump \
-		$(XEMACS_OPTS) --with-database=berkdb
+	cd xemacs-chise && ./configure --with-chise $(XEMACS_OPTS)
 
 build-xemacs:	config-xemacs
 	cd xemacs-chise && make
@@ -93,7 +92,7 @@ chise-db:
 		| (cd chise-db/db-$(VERSION); tar xvf - )
 	-cd chise-db && ln -s db-$(VERSION) db
 
-tar-core:
+tar-core:	cvs-core-clean
 	cvs commit
 	sh -c 'cvs tag -R chise-core-`echo $(VERSION) | tr . _`; \
 	cd /tmp; \
@@ -104,8 +103,9 @@ tar-core:
 	#rsync -av Makefile libchise chise-db \
 	#	 xemacs-chise ids 
 	#	/tmp/chise-core-$(VERSION)
-	rsync -av Makefile concord libchise chise-db \
-		/tmp/chise-core-$(VERSION)
+	#rsync -av Makefile concord libchise chise-db \
+	#	/tmp/chise-core-$(VERSION)
+	rsync -av chise-db /tmp/chise-core-$(VERSION)
 	cd /tmp; tar cvzf chise-core-$(VERSION).tar.gz \
 		chise-core-$(VERSION)
 
@@ -137,8 +137,14 @@ 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 tomoyo-tools ids
+cvs-clean:	cvs-base-clean cvs-core-clean db-clean
+
+cvs-core-clean:
+	rm -rf concord libchise
+
+cvs-base-clean:
+	rm -rf xemacs-chise tomoyo-tools ids