===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.126
retrieving revision 1.134
diff -u -p -r1.126 -r1.134
--- OpenXM/src/Makefile	2003/09/03 00:21:14	1.126
+++ OpenXM/src/Makefile	2004/02/22 06:39:09	1.134
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.125 2003/09/02 22:18:39 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.133 2003/11/27 12:10:18 takayama Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib=../../OpenXM_contrib
@@ -11,7 +11,7 @@ COPYRIGHTDIR=../Copyright
 all: all-util all-gc all-gmp all-asir all-gnuplot all-k097 all-kan96xx \
      all-kxx all-pari all-phc all-openmath all-oxmath all-tigers all-fep
 
-all-gc: 
+all-gc: install-util 
 	(cd gc; make all)
 
 all-gmp: configure-gmp
@@ -20,7 +20,7 @@ all-gmp: configure-gmp
 all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util
 	(cd ox_toolkit; make)
 
-all-oxc: configure-oxc install-oxtoolkit
+all-oxc: configure-oxc install-oxtoolkit 
 	(cd oxc; make)
 
 all-asir: configure-asir install-pari
@@ -46,7 +46,7 @@ all-openmath:
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
-all-oxmath: configure-oxmath install-oxtoolkit
+all-oxmath: configure-oxmath install-oxtoolkit install-gc
 	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make) ; \
 	else \
@@ -81,7 +81,7 @@ install: install-oxtags install-util install-asir inst
 	 install-k097 install-kan96xx \
 	 install-kxx install-openmath install-oxmath install-pari \
 	 install-phc install-tigers install-asir-doc install-asir-contrib \
-	 install-misc install-fep install-uuencoded 
+	 install-misc install-fep install-uuencoded  install-asir-port
 
 install-oxtags:
 	(cd ../doc/OpenXM-web ; make install-exec)
@@ -102,7 +102,7 @@ install-asir: all-asir
 install-gnuplot: all-gnuplot
 	-(cd gnuplot ; make install)
 
-install-k097:  install-kxx all-k097
+install-k097:  install-kxx all-k097 install-oxc
 	(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)
 
@@ -162,12 +168,15 @@ install-rc: all-rc
 install-uuencoded:
 	(cd uuencoded ; make install)
 
+install-asir-port:
+	(cd asir-port ; make install)
+
 clean:
 	-rm ./.configure-links-done
 	-rm ${OpenXM_contrib}/gmp/.gmp_*
 	-rm ${OpenXM_contrib}/gc/.gc_*
-	-(cd ${OpenXM_contrib}/gmp ; make clean)
-	-(cd ${OpenXM_contrib}/gc ; make clean ; /bin/rm -f *.a)
+	-(cd gmp ; make clean)
+	-(cd gc ; make clean ; /bin/rm -f *.a)
 	-(cd asir2000 ; make clean)
 	-(cd gnuplot ; make clean)
 	-(cd k097 ; make clean)
@@ -182,11 +191,14 @@ clean:
 	-(cd asir-contrib ; make clean)
 	-(cd ${OpenXM_contrib2}/fep ; make clean)
 	-(cd util ; make clean)
+	-(cd ox_toolkit ; make clean)
+	-(cd oxc ; make clean)
 
+
 distclean: clean
 	(cd uuencoded ; make distclean)
-	-(cd ${OpenXM_contrib}/gmp ; make distclean)
-	(cd ${OpenXM_contrib}/gc ; make clean ; /bin/rm -f *.a)
+	-(cd gmp ; make distclean)
+	-(cd gc ; make distclean ; /bin/rm -f *.a)
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
@@ -197,9 +209,10 @@ distclean: clean
 	(cd tigers ; make distclean)
 	-(cd ox_toolkit ; make distclean)
 	-(cd ox_math ; make distclean)
+	-(cd oxc ; make distclean)
 	rm -rf $(BINDIR)/d0 $(BINDIR)/k0 $(BINDIR)/ox $(BINDIR)/ox_sm1 \
 	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
-	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
+	       $(LIBDIR)/k097 $(LIBDIR)/sm1 
 
 configure: configure-asir \
 	   configure-gnuplot \
@@ -231,42 +244,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 +271,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)