===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.177
retrieving revision 1.188
diff -u -p -r1.177 -r1.188
--- OpenXM/src/Makefile	2017/03/31 00:43:02	1.177
+++ OpenXM/src/Makefile	2020/03/05 00:29:44	1.188
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.176 2016/09/26 05:41:30 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.187 2020/01/08 17:29:26 ohara Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib2=../../OpenXM_contrib2
@@ -9,13 +9,16 @@ RCDIR=../rc
 SHAREDIR=../share
 COPYRIGHTDIR=../Copyright
 
-all: all-util all-gc all-gmp all-mpfr all-mpc all-asir all-gnuplot all-k097 all-kan96xx \
+all: all-util all-gc all-asirgc all-gmp all-mpfr all-mpc all-mpfi all-asir all-asir2000 all-gnuplot all-k097 all-kan96xx \
      all-kxx all-pari all-phc all-openmath all-oxmath all-tigers all-fep all-phcpack all-oxcdd \
 	all-oxmgraph all-pcc all-oxpari
 
 all-gc: install-util 
 	(cd gc; ${MAKE} all)
 
+all-asirgc: install-util 
+	(cd asir-gc; ${MAKE} all)
+
 all-gmp: configure-gmp
 	(cd gmp; ${MAKE} all)
 
@@ -25,13 +28,19 @@ all-mpfr: configure-mpfr
 all-mpc: configure-mpc
 	(cd mpc; ${MAKE} all)
 
+all-mpfi: configure-mpfi
+	(cd mpfi; ${MAKE} all)
+
 all-oxtoolkit: configure-oxtoolkit install-gmp install-mpfr install-mpc install-gc install-util install-oxtags
 	(cd ox_toolkit; ${MAKE} all)
 
 all-oxc: configure-oxc install-oxtoolkit 
 	-(cd oxc; ${MAKE} all)
 
-all-asir: configure-asir install-pari install-gmp install-mpfr install-mpc
+all-asir: configure-asir install-pari install-asirgc install-gmp install-mpfr install-mpc install-mpfi
+	(cd asir2018; ${MAKE} all)
+
+all-asir2000: configure-asir2000 install-pari install-gmp install-mpfr install-mpc install-mpfi
 	(cd asir2000; ${MAKE} all)
 
 all-gnuplot: configure-gnuplot
@@ -63,7 +72,7 @@ all-oxmath: configure-oxmath install-oxtoolkit install
 	fi
 
 all-pari: configure-pari
-	(cd pari; ${MAKE} all)
+	(cd pari; ${MAKE} PERL_USE_UNSAFE_INC=1 all)
 
 all-phc:
 	(cd phc; ${MAKE} all)
@@ -109,7 +118,7 @@ all-pcc: configure-pcc
 all-document-asir-contrib: configure-document-asir-contrib
 	(cd asir-contrib/packages/doc; ${MAKE} all)
 
-install: install-oxtags install-util install-asir install-gnuplot \
+install: install-oxtags install-util install-asir install-asir2000 install-gnuplot \
 	 install-k097 install-kan96xx \
 	 install-kxx install-openmath install-oxmath install-pari \
 	 install-phc install-tigers install-asir-doc install-asir-contrib \
@@ -131,6 +140,8 @@ install-util: install-util-bin install-util-lib
 install-gc: all-gc
 	(cd gc; ${MAKE} install)
 
+install-asirgc: all-asirgc
+	(cd asir-gc; ${MAKE} install)
 
 install-gmp: all-gmp
 	(cd gmp; ${MAKE} install)
@@ -141,7 +152,13 @@ install-mpfr: all-mpfr
 install-mpc: all-mpc
 	(cd mpc; ${MAKE} install)
 
+install-mpfi: all-mpfi
+	(cd mpfi; ${MAKE} install)
+
 install-asir: all-asir
+	-(cd asir2018; ${MAKE} install)
+
+install-asir2000: all-asir2000
 	-(cd asir2000; ${MAKE} install)
 
 install-gnuplot: all-gnuplot
@@ -234,17 +251,17 @@ install-asir-mode:
 
 clean:
 	-rm ./.configure-links-done
-	-@for i in OpenMath asir-contrib asir-doc asir2000 gc gmp gnuplot \
+	-@for i in OpenMath asir-contrib asir-doc asir2000 asir2018 asir-gc gc gmp gnuplot \
 	           k097 kan96xx kxx ox_math ox_toolkit oxc pari phc phcpack tigers \
-               oxmgraph pcc mpfr \
+               oxmgraph pcc mpfr mpfi ox_cdd ox_pari \
 	           util ${OpenXM_contrib2}/fep ; do \
 		(cd $$i; ${MAKE} clean); \
 	done
 
 distclean: clean
-	-@for i in OpenMath asir2000 gc gmp gnuplot kan96xx kxx ox_math \
+	-@for i in OpenMath asir2000 asir2018 asir-gc gc gmp gnuplot kan96xx kxx ox_math \
 	           ox_toolkit oxc pari phc phcpack tigers oxmgraph pcc \
-                   asir-doc k097 ox_cdd util; do \
+                   asir-doc k097 ox_cdd util mpc mpfr mpfi ox_pari ; do \
 		(cd $$i; ${MAKE} distclean); \
 	done
 	-(cd ${BINDIR} && rm -f  d0 k0 ox ox_sm1 oxlog oxweave sm1)
@@ -272,10 +289,17 @@ configure-mpfr: install-util install-gmp
 configure-mpc: install-util install-gmp install-mpfr
 	(cd mpc; ${MAKE} configure)
 
+configure-mpfi: install-util install-gmp install-mpfr
+	(cd mpfi; ${MAKE} configure)
+
 configure-asir: install-util 
+	(cd asir2018; ${MAKE} configure) 
+
+configure-asir2000: install-util 
 	(cd asir2000; ${MAKE} configure) 
+
 configure-asir-static: install-util 
-	(cd asir2000; rm -f .configure_done; ${MAKE} configure-static) 
+	(cd asir2018; rm -f .configure_done; ${MAKE} configure-static) 
 
 configure-asir-contrib: 
 	-(cd asir-contrib; ./make-configure) 
@@ -346,7 +370,7 @@ install-for-debug:
 	(cd kan96xx; ${MAKE} install-for-debug)
 	(cd kxx; ${MAKE} install-for-debug)
 	(cd k097; ${MAKE} install-for-debug)
-	(cd ${BINDIR}; rm -f asir; ln -s ../../OpenXM_contrib2/asir2000/asir .)
+	(cd ${BINDIR}; rm -f asir; ln -s ../../OpenXM_contrib2/asir2018/.libs/asir .)
 	(cd ${BINDIR}; rm -f ox_pari; ln -s ../../OpenXM/src/ox_pari/ox_pari .)
 
 fetch: