===================================================================
RCS file: /home/cvs/OpenXM/src/asir2000/Makefile,v
retrieving revision 1.12
retrieving revision 1.19
diff -u -p -r1.12 -r1.19
--- OpenXM/src/asir2000/Makefile	2000/01/20 07:47:39	1.12
+++ OpenXM/src/asir2000/Makefile	2003/03/07 07:40:33	1.19
@@ -1,45 +1,96 @@
-# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.11 2000/01/20 02:33:46 noro Exp $
+# $OpenXM: OpenXM/src/asir2000/Makefile,v 1.18 2003/03/06 11:23:21 ohara Exp $
 
 ASIR = ../../../OpenXM_contrib2/asir2000
+ASIR_PARI = ../../../OpenXM_contrib2/asir2000-pari
+ASIR_SMALL = ../../../OpenXM_contrib2/asir2000-small
 PARI = ../pari
 
 all: configure
-	@if [ ! -d $(ASIR) ]; then \
-	  echo "You do not have the source of asir2000. Skip asir2000." ; \
-	  exit 0 ; \
-    fi
 	@if [ ! -f ./.make_done ]; then \
 		(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-xmkmf: all
+	(cd $(ASIR) ; make install-bin-lib ; make install-libasir ; make install-libgc ; make install-include )
+
 install: all
-	@if [ ! -d $(ASIR) ]; then \
-	  echo "You do not have the source of asir2000. Skip asir2000." ; \
-	  exit 0 ; \
-    fi
-	(cd $(ASIR) ; make install ; make install-lib)
+	(cd $(ASIR) ; make install)
 
+install-lib-with-pari: with-pari
+	(cd $(ASIR_PARI) ; make install-libasir)
+
+install-lib-small: small
+	(cd $(ASIR_SMALL) ; make install-libasir)
+
 clean:
-	@if [ ! -d $(ASIR) ]; then \
-	  echo "You do not have the source of asir2000. Skip asir2000." ; \
-	  exit 0 ; \
-    fi
 	(cd $(ASIR) ; make clean)
-	@rm -f ./.make_done ./.configure_done ./.install-pari_done
+	-@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-*
 
 distclean: clean
+	@rm -rf $(ASIR_PARI)
+	@rm -rf $(ASIR_SMALL)
 	@cat BINARIES | xargs -t rm -rf
 
 configure: install-pari
-	@if [ ! -d $(ASIR) ]; then \
-	  echo "You do not have the source of asir2000. Skip asir2000." ; \
-	  exit 0 ; \
-    fi
 	@if [ ! -f ./.configure_done ]; then \
-		(cd $(ASIR) ; ./configure ; xmkmf ; make Makefiles ; make depend) \
+		(cd $(ASIR) ; \
+            CFLAGS="-O -g" ./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 ; \
+            CFLAGS="-O -g" ./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 ; \
+            CFLAGS="-O -g" ./configure \
+                               --prefix="`cd ../../OpenXM; pwd`") \
+	fi
+	@touch ./.configure_small_done
+
+configure-xmkmf: install-pari
+	@if [ ! -f ./.configure_done ]; then \
+		(cd $(ASIR) ; ./configure-xmkmf -plot -pari ) \
+	fi
+	@touch ./.configure_done
+
+configure-xmkmf-with-pari: configure-xmkmf
+	-@if [ ! -f ./.configure_with_pari_done ]; then \
+		mkdir $(ASIR_PARI) ; \
+		(cd $(ASIR_PARI) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; ./configure-xmkmf -pari ) \
+	fi
+	@touch ./.configure_with_pari_done
+
+configure-xmkmf-small: configure-xmkmf
+	-@if [ ! -f ./.configure_small_done ]; then \
+		mkdir $(ASIR_SMALL) ; \
+		(cd $(ASIR_SMALL) ; ../../OpenXM/bin/lndir.sh ../asir2000 ; ./configure-xmkmf ) \
+	fi
+	@touch ./.configure_small_done
 
 install-pari:
 	@if [ ! -f ./.install-pari_done ]; then \