===================================================================
RCS file: /home/cvs/OpenXM/src/asir2000/Makefile,v
retrieving revision 1.18
retrieving revision 1.23
diff -u -p -r1.18 -r1.23
--- OpenXM/src/asir2000/Makefile	2003/03/06 11:23:21	1.18
+++ OpenXM/src/asir2000/Makefile	2003/09/02 14:26:07	1.23
@@ -1,11 +1,11 @@
-# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.17 2003/03/04 08:29:43 ohara Exp $
+# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.22 2003/03/25 06:25:58 takayama Exp $
 
 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
@@ -23,15 +23,21 @@ small: configure-small
 	fi
 	@touch ./.make_small_done
 
-install: all
+install-xmkmf: all
 	(cd $(ASIR) ; make install-bin-lib ; make install-libasir ; make install-libgc ; make install-include )
 
+install: all
+	(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)
 
+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
@@ -43,30 +49,32 @@ distclean: clean
 	@rm -rf $(ASIR_SMALL)
 	@cat BINARIES | xargs -t rm -rf
 
-configure: install-pari
+configure: 
 	@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) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; ./configure -pari ; \
-			xmkmf ; make Makefiles ; make clean; make depend) \
+		(cd $(ASIR_PARI) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; \
+			rm -f config.status config.log ; \
+            ./configure --with-pari --prefix="`cd ../../OpenXM; pwd`") \
 	fi
 	@touch ./.configure_with_pari_done
 
 configure-small: configure
 	-@if [ ! -f ./.configure_small_done ]; then \
 		mkdir $(ASIR_SMALL) ; \
-		(cd $(ASIR_SMALL) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; ./configure ; \
-			xmkmf ; make Makefiles ; make clean; make depend) \
+		(cd $(ASIR_SMALL) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; \
+			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