===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.124
retrieving revision 1.129
diff -u -p -r1.124 -r1.129
--- OpenXM/src/Makefile	2003/09/02 15:15:58	1.124
+++ OpenXM/src/Makefile	2003/09/08 13:11:41	1.129
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.123 2003/09/02 03:35:56 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.128 2003/09/06 11:43:52 takayama Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib=../../OpenXM_contrib
@@ -102,7 +102,7 @@ install-asir: all-asir
 install-gnuplot: all-gnuplot
 	-(cd gnuplot ; make install)
 
-install-k097: all-k097
+install-k097:  install-kxx all-k097
 	(cd k097 ; make install)
 
 install-kan96xx: all-kan96xx
@@ -144,9 +144,15 @@ install-phc: all-phc
 install-tigers: all-tigers
 	(cd tigers ; make install)
 
-install-asir-contrib: install-asir install-kxx install-util
+install-asir-contrib: install-asir-contrib-asir-progs \
+                      install-asir-contrib-oxservers
+install-asir-contrib-oxservers: install-asir install-util \
+                install-k097 install-kxx install-openmath install-oxmath \
+                install-phc install-tigers install-uuencoded install-gnuplot
+install-asir-contrib-asir-progs: install-asir install-util
 	(cd asir-contrib ; make install)
 
+
 install-asir-doc: install-asir
 	-(cd asir-doc ; make install)
 
@@ -216,7 +222,7 @@ configure-gnuplot:
 	-(cd gnuplot ; make configure)
 
 configure-k097:
-	(cd k097 ; ./configure)	
+	(cd k097 ; ./make-configure)	
 
 configure-kan96xx:
 	(cd kan96xx ; make configure)
@@ -231,42 +237,25 @@ configure-oxc: 
 	(cd oxc; ./make-configure)
 
 configure-oxmath:
-	(cd ox_math; ./make-configure)
+	-@if test -d /usr/local/mathematica ; then \
+		(cd ox_math; ./make-configure) ; \
+	else \
+		echo -n "Warning: Mathematica is not found. " ; \
+		echo "ox_math will not be compiled." ; \
+	fi
 
 configure-pari:
 	(cd pari ; make configure)
 
-generate-source-distribution : generate-source-distribution-kxx \
-                               generate-source-distribution-ox_toolkit
 
-generate-source-distribution-kxx :
-	(cd kxx ; rm -f .configure_done Makefile )
-
-generate-source-distribution-ox_toolkit :
-	(cd ox_toolkit ; rm -f Makefile ; autoconf)
-
 clean-rc :
 	(cd $(RCDIR) ; make clean )
 all-Copyright :
 	(cd $(COPYRIGHTDIR) ; make copy-copyright )
 
-post-install-correction: install
-# I think that we no longer need post-install-correction-for-asir
-# post-install-corrections-other
-	(cd ../rc ; make install.man)
-
-post-install-correction-for-asir:
-	(cd ../bin ; rm -f asir ox_asir ) 
-	cp ../lib/asir/asir ../bin/asir
-	(cd ../bin ; ln -s ./asir ox_asir)
-	(cd ../lib/asir ; rm -f asir ; ln -s ../../bin/asir asir)
-	(cd ../lib/asir ; rm -f ox_asir ox_launch ox_plot help ; ln -s ./asir ox_asir ; ln -s ./asir ox_launch ; ln -s ./asir ox_plot ; ln -s ./help-eg help)
-	-(cd asir-doc ; make install-man-pages)
-
 install-all-asir-lib:
 	(cd asir2000 ; make install-lib-small)
 
-binary-dist : all-Copyright clean-rc all all-misc post-install-correction install-all-asir-lib
 
 ## Targets for debugging
 install-for-debug:
@@ -275,18 +264,4 @@ install-for-debug:
 	(cd k097 ; make install-for-debug)
 	(cd ../bin ; rm -f asir ; ln -s ../../OpenXM_contrib2/asir2000/asir .)
 
-
-##  Sub binary packages
-##  1: asir: asir only.   target:  all-asir install-asir install-asir-doc
-
-##  2: kan-ox: k0 and sm1 with ox_asir.  target: all-kan-ox install-kan-ox
-configure-all-kan-ox :  configure-links configure-include  configure-asir \
-                       configure-kan96xx configure-kxx configure-k097 \
-                       configure-oxc
-all-kan-ox:  configure-all-kan-ox all-asir all-kan96xx all-kxx all-k097 all-oxc
-install-kan-ox: all-kan-ox  install-asir install-kan96xx install-kxx \
-               install-k097 install-oxc install-asir-doc \
-               post-install-kan-ox
-post-install-kan-ox:
-	(cd ../bin ; /bin/rm -f ox_asir; ln -s ./asir ox_asir)