===================================================================
RCS file: /home/cvs/OpenXM/src/asir2000/Makefile,v
retrieving revision 1.19
retrieving revision 1.25
diff -u -p -r1.19 -r1.25
--- OpenXM/src/asir2000/Makefile	2003/03/07 07:40:33	1.19
+++ OpenXM/src/asir2000/Makefile	2007/08/20 05:47:34	1.25
@@ -1,11 +1,19 @@
-# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.18 2003/03/06 11:23:21 ohara Exp $
+# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.24 2005/07/14 02:56:52 takayama Exp $
 
+OpenXM_HOME=../..
+PREFIX=${OpenXM_HOME}
+DISTDIR=${OpenXM_HOME}/../OpenXM_dist
+MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
+# Original. http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
+DISTNAME=gc6.8
+DISTFILES=${DISTNAME}.tar.gz
+
 ASIR = ../../../OpenXM_contrib2/asir2000
 ASIR_PARI = ../../../OpenXM_contrib2/asir2000-pari
 ASIR_SMALL = ../../../OpenXM_contrib2/asir2000-small
 PARI = ../pari
 
-all: configure
+all: configure install-pari
 	@if [ ! -f ./.make_done ]; then \
 		(cd $(ASIR) ; make all) \
 	fi
@@ -27,7 +35,7 @@ install-xmkmf: all
 	(cd $(ASIR) ; make install-bin-lib ; make install-libasir ; make install-libgc ; make install-include )
 
 install: all
-	(cd $(ASIR) ; make install)
+	(cd $(ASIR) ; make install-openxm)
 
 install-lib-with-pari: with-pari
 	(cd $(ASIR_PARI) ; make install-libasir)
@@ -35,22 +43,30 @@ install-lib-with-pari: with-pari
 install-lib-small: small
 	(cd $(ASIR_SMALL) ; make install-libasir)
 
+install-libasir-gc: configure
+	(cd $(ASIR) ; make install-libasir-gc)
+
 clean:
 	(cd $(ASIR) ; make clean)
 	-@if [ -d $(ASIR_PARI) ]; then (cd $(ASIR_PARI) ; make clean)  fi
 	-@if [ -d $(ASIR_SMALL) ]; then (cd $(ASIR_SMALL) ; make clean)  fi
-	@rm -f ./.make_* ./.configure_* ./.install-*
+	@rm -f ./.make_* ./.configure_* ./.install-* ./.fetch*
 
 distclean: clean
 	@rm -rf $(ASIR_PARI)
 	@rm -rf $(ASIR_SMALL)
 	@cat BINARIES | xargs -t rm -rf
 
-configure: install-pari
+fetch:
+	@if [ ! -f .fetch_done ]; then \
+		${OpenXM_HOME}/bin/oxfetch.sh ${MASTER_SITE}${DISTFILES} ${DISTDIR}; \
+	fi
+	@touch .fetch_done
+
+configure: fetch
 	@if [ ! -f ./.configure_done ]; then \
 		(cd $(ASIR) ; \
-            CFLAGS="-O -g" ./configure --enable-plot --with-pari \
-                               --prefix="`cd ../../OpenXM; pwd`") \
+            ./configure --enable-plot --with-pari --prefix="`cd ../../OpenXM; pwd`") \
 	fi
 	@touch ./.configure_done
 
@@ -58,8 +74,8 @@ configure-with-pari: configure
 	-@if [ ! -f ./.configure_with_pari_done ]; then \
 		mkdir $(ASIR_PARI) ; \
 		(cd $(ASIR_PARI) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; \
-            CFLAGS="-O -g" ./configure --with-pari \
-                               --prefix="`cd ../../OpenXM; pwd`") \
+			rm -f config.status config.log ; \
+            ./configure --with-pari --prefix="`cd ../../OpenXM; pwd`") \
 	fi
 	@touch ./.configure_with_pari_done
 
@@ -67,12 +83,12 @@ configure-small: configure
 	-@if [ ! -f ./.configure_small_done ]; then \
 		mkdir $(ASIR_SMALL) ; \
 		(cd $(ASIR_SMALL) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; \
-            CFLAGS="-O -g" ./configure \
-                               --prefix="`cd ../../OpenXM; pwd`") \
+			rm -f config.status config.log ; \
+            ./configure --prefix="`cd ../../OpenXM; pwd`") \
 	fi
 	@touch ./.configure_small_done
 
-configure-xmkmf: install-pari
+configure-xmkmf: 
 	@if [ ! -f ./.configure_done ]; then \
 		(cd $(ASIR) ; ./configure-xmkmf -plot -pari ) \
 	fi