===================================================================
RCS file: /home/cvs/OpenXM/src/asir2000/Makefile,v
retrieving revision 1.16
retrieving revision 1.28
diff -u -p -r1.16 -r1.28
--- OpenXM/src/asir2000/Makefile	2000/03/16 07:25:06	1.16
+++ OpenXM/src/asir2000/Makefile	2012/05/09 06:18:06	1.28
@@ -1,73 +1,49 @@
-# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.15 2000/03/10 02:59:50 noro Exp $
+# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.27 2012/05/07 13:35:51 ohara 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=gc-7.2alpha6
+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) \
+		(cd ${ASIR} ; ${MAKE} all) \
 	fi
 	@touch ./.make_done
 
-with-pari: configure-with-pari
-	@if [ ! -f ./.make_with_pari_done ]; then \
-		(cd $(ASIR_PARI) ; make all) \
-	fi
-	@touch ./.make_with_pari_done
-
-small: configure-small
-	@if [ ! -f ./.make_small_done ]; then \
-		(cd $(ASIR_SMALL) ; make all) \
-	fi
-	@touch ./.make_small_done
-
 install: all
-	(cd $(ASIR) ; make install-bin-lib ; make install-libasir ; make install-libgc ; make install-include )
+	(cd ${ASIR} ; ${MAKE} install-openxm)
 
-install-lib-with-pari: with-pari
-	(cd $(ASIR_PARI) ; make install-libasir)
-
-install-lib-small: small
-	(cd $(ASIR_SMALL) ; make install-libasir)
-
 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-*
+	(cd ${ASIR} ; ${MAKE} clean)
+	@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 \
+		for i in ${DISTFILES}; do \
+			${OpenXM_HOME}/bin/oxfetch.sh ${MASTER_SITE}${DISTFILES} ${DISTDIR}; \
+		done \
+	fi
+	@touch .fetch_done
+
+configure: fetch
 	@if [ ! -f ./.configure_done ]; then \
-		(cd $(ASIR) ; ./configure -plot -pari; \
-			xmkmf ; make Makefiles ; make depend) \
+		(cd $(ASIR) ; \
+            ./configure --enable-plot --with-pari --prefix="`cd ../../OpenXM; pwd`") \
 	fi
 	@touch ./.configure_done
 
-configure-with-pari: configure
-	-@if [ ! -f ./.configure_with_pari_done ]; then \
-		mkdir $(ASIR_PARI) ; \
-		(cd $(ASIR_PARI) ; lndir ../asir2000 ; ./configure -pari ; \
-			xmkmf ; make Makefiles ; make clean; make depend) \
-	fi
-	@touch ./.configure_with_pari_done
-
-configure-small: configure
-	-@if [ ! -f ./.configure_small_done ]; then \
-		mkdir $(ASIR_SMALL) ; \
-		(cd $(ASIR_SMALL) ; lndir ../asir2000 ; ./configure ; \
-			xmkmf ; make Makefiles ; make clean; make depend) \
-	fi
-	@touch ./.configure_small_done
-
 install-pari:
 	@if [ ! -f ./.install-pari_done ]; then \
-		(cd $(PARI) ; make install) \
+		(cd ${PARI} ; ${MAKE} install) \
 	fi
 	@touch ./.install-pari_done