===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.169
retrieving revision 1.177
diff -u -p -r1.169 -r1.177
--- OpenXM/src/Makefile	2015/09/27 00:12:31	1.169
+++ OpenXM/src/Makefile	2017/03/31 00:43:02	1.177
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.168 2015/09/15 11:28:16 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.176 2016/09/26 05:41:30 takayama Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib2=../../OpenXM_contrib2
@@ -6,6 +6,7 @@ LIBDIR=../lib
 BINDIR=../bin
 DOCDIR=../doc
 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 \
@@ -24,11 +25,11 @@ all-mpfr: configure-mpfr
 all-mpc: configure-mpc
 	(cd mpc; ${MAKE} all)
 
-all-oxtoolkit: configure-oxtoolkit install-gmp install-mpfr install-mpc install-gc install-util install-kan96xx
+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)
+	-(cd oxc; ${MAKE} all)
 
 all-asir: configure-asir install-pari install-gmp install-mpfr install-mpc
 	(cd asir2000; ${MAKE} all)
@@ -97,7 +98,7 @@ all-util-lib: configure-util
 all-oxcdd: install-oxtoolkit
 	-(cd ox_cdd; ${MAKE} all)
 
-all-oxpari: install-oxtoolkit install-pari
+all-oxpari: configure-oxpari
 	-(cd ox_pari; ${MAKE} all)
 
 all-oxmgraph: configure-oxmgraph
@@ -113,7 +114,8 @@ install: install-oxtags install-util install-asir inst
 	 install-kxx install-openmath install-oxmath install-pari \
 	 install-phc install-tigers install-asir-doc install-asir-contrib \
 	 install-misc install-fep install-phcpack install-oxcdd \
-     install-oxmgraph install-pcc install-oxpari
+     install-oxmgraph install-pcc install-oxpari \
+	install-asir-mode
 
 install-oxtags:
 	(cd ../doc/OpenXM-web; ${MAKE} install-exec)
@@ -140,7 +142,7 @@ install-mpc: all-mpc
 	(cd mpc; ${MAKE} install)
 
 install-asir: all-asir
-	(cd asir2000; ${MAKE} install)
+	-(cd asir2000; ${MAKE} install)
 
 install-gnuplot: all-gnuplot
 	-(cd gnuplot; ${MAKE} install)
@@ -166,7 +168,7 @@ install-oxtoolkit: all-oxtoolkit
 	(cd ox_toolkit; ${MAKE} install)
 
 install-oxc: all-oxc
-	(cd oxc; ${MAKE} install)
+	-(cd oxc; ${MAKE} install)
 
 install-oxmath: all-oxmath 
 	-@if test -d /usr/local/mathematica; then \
@@ -227,11 +229,14 @@ install-oxmgraph: all-oxmgraph
 install-pcc: all-pcc
 	-(cd pcc; ${MAKE} install)
 
+install-asir-mode:
+	-(cd asir-mode; ${MAKE} install)
+
 clean:
 	-rm ./.configure-links-done
 	-@for i in OpenMath asir-contrib asir-doc asir2000 gc gmp gnuplot \
 	           k097 kan96xx kxx ox_math ox_toolkit oxc pari phc phcpack tigers \
-               oxmgraph pcc \
+               oxmgraph pcc mpfr \
 	           util ${OpenXM_contrib2}/fep ; do \
 		(cd $$i; ${MAKE} clean); \
 	done
@@ -250,6 +255,10 @@ configure: configure-util configure-asir \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
 	   configure-pari configure-gmp configure-asir-doc configure-asir-contrib \
        configure-oxmgraph configure-pcc
+configure-static: configure
+	make configure-asir-static
+	make configure-oxpari-static
+	make configure-oxc-static
 
 configure-util:
 	(cd util; ./make-configure)
@@ -265,6 +274,8 @@ configure-mpc: install-util install-gmp install-mpfr
 
 configure-asir: install-util 
 	(cd asir2000; ${MAKE} configure) 
+configure-asir-static: install-util 
+	(cd asir2000; rm -f .configure_done; ${MAKE} configure-static) 
 
 configure-asir-contrib: 
 	-(cd asir-contrib; ./make-configure) 
@@ -287,8 +298,15 @@ configure-kxx: 
 configure-oxtoolkit:
 	(cd ox_toolkit; ./make-configure)
 
+configure-oxpari: install-oxtoolkit install-pari
+	(cd ox_pari; ./make-configure)
+configure-oxpari-static: install-oxtoolkit install-pari
+	(cd ox_pari; rm -f .configure_done ; ./make-configure --disable-shared)
+
 configure-oxc: 
 	(cd oxc; ./make-configure)
+configure-oxc-static: 
+	(cd oxc; rm -f .configure_done ; ./make-configure --disable-shared)
 
 configure-oxmath:
 	-@if test -d /usr/local/mathematica; then \
@@ -323,13 +341,13 @@ install-document-kan96xx: install-kan96xx
 
 install-document-asir-contrib: all-document-asir-contrib
 	(cd asir-contrib/packages/doc; ${MAKE} install ; ${MAKE} install-document)
-
 ## Targets for debugging
 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 ox_pari; ln -s ../../OpenXM/src/ox_pari/ox_pari .)
 
 fetch:
 	-@for i in gc gmp gnuplot pari tigers; do \