===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.79
retrieving revision 1.85
diff -u -p -r1.79 -r1.85
--- OpenXM/src/Makefile	2000/02/08 12:03:39	1.79
+++ OpenXM/src/Makefile	2000/03/06 14:58:00	1.85
@@ -1,16 +1,39 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.78 2000/02/01 10:12:47 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.84 2000/03/06 04:30:39 takayama Exp $
 
 OPENXM_CONTRIB=../../OpenXM_contrib
+OPENXM_CONTRIB2=../../OpenXM_contrib2
 LIBDIR=../lib
 BINDIR=../bin
 RCDIR=../rc
 COPYRIGHTDIR=../Copyright
 
-all: configure all-asir all-gnuplot all-k097 all-kan96xx all-kxx \
-     all-pari all-phc all-openmath all-oxmath all-tigers
+all: configure 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-gc: 
+	@if test ! -f gc/.gc_make_done ; \
+	then \
+		(cd gc ; make all) ; \
+	fi 
+	@touch gc/.gc_make_done
+
+all-gmp: configure-gmp
+	if test -f /usr/lib/libgmp.a ; \
+	then \
+	  echo "Using /usr/lib/libgmp.a" ; \
+	  /bin/rm -rf gmp/libgmp.a ; \
+	  ln -s /usr/lib/libgmp.a gmp/libgmp.a ; \
+	else \
+	 (if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; \
+	fi
+
 all-asir: configure-asir
-	(cd asir2000 ; make all)
+	@if test -d $(OPENXM_CONTRIB2) ; then \
+		(cd asir2000 ; make all) ; \
+	else \
+		echo -n "Warning: Asir source is not found. " ; \
+		echo "asir will not be compiled." ; \
+	fi
 
 all-gnuplot: configure-gnuplot
 	(cd gnuplot ; make all)
@@ -18,7 +41,7 @@ all-gnuplot: configure-gnuplot
 all-k097: configure-k097 all-kan96xx
 	(cd k097 ; make all)
 
-all-kan96xx: configure-kan96xx
+all-kan96xx: configure-kan96xx install-gc install-gmp
 	(cd kan96xx ; make all)
 
 all-kxx: configure-kxx all-kan96xx
@@ -56,10 +79,36 @@ all-misc :
 
 install: install-asir install-gnuplot install-k097 install-kan96xx \
 	 install-kxx install-openmath install-oxmath install-pari \
-	 install-phc install-tigers install-asir-doc install-asir-contrib
+	 install-phc install-tigers install-asir-doc install-asir-contrib \
+	 install-misc
 
+
+install-gc : all-gc
+	-@if test ! -f gc/.gc_installed ; \
+	then \
+		mkdir ../lib ; \
+		cp gc/gc.a ../lib/libgc.a ; \
+	fi 
+	@touch gc/.gc_installed
+
+
+install-gmp : all-gmp
+	-@if test ! -f gmp/.gmp_installed ; \
+	then \
+		mkdir ../lib ; \
+		cp gmp/libgmp.a ../lib ; \
+		mkdir ../include ; \
+		cp gmp/gmp.h ../include ; \
+	fi 
+	@touch gmp/.gmp_installed
+
 install-asir: all-asir
-	(cd asir2000 ; make install)
+	@if test -d $(OPENXM_CONTRIB2) ; then \
+		(cd asir2000 ; make install) ; \
+	else \
+		echo -n "Warning: Asir source is not found. " ; \
+		echo "asir will not be installed." ; \
+	fi
 
 install-gnuplot: all-gnuplot
 	(cd gnuplot ; make install)
@@ -107,7 +156,14 @@ install-asir-contrib: install-asir install-kxx
 install-asir-doc: install-asir
 	(cd asir-doc ; make install)
 
+install-misc:
+	(cd ../rc ; make install.man)
+
 clean:
+	-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 asir2000 ; make clean)
 	(cd gnuplot ; make clean)
 	(cd k097 ; make clean)
@@ -123,6 +179,8 @@ clean:
 
 distclean: clean
 	(cd $(BINDIR) ; make distclean)
+	-(cd $(OPENXM_CONTRIB)/gmp ; make distclean)
+	(cd $(OPENXM_CONTRIB)/gc ; make clean ; /bin/rm -f *.a)
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
@@ -138,10 +196,23 @@ distclean: clean
 configure: configure-links configure-bin configure-asir \
 	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
-	   configure-pari
+	   configure-pari configure-gmp
 
+configure-gmp: configure-links
+	@if test -f gmp/.gmp_configured ; \
+	then \
+	  echo "MESSAGE(kan96xx/Makefile): gmp is already configured. (.gmp_configured) " ;  \
+	else \
+	  (cd gmp ; ./configure ; touch .gmp_configured) ; \
+	fi 
+
 configure-asir:
-	(cd asir2000; make configure)
+	@if test -d $(OPENXM_CONTRIB2) ; then \
+		(cd asir2000 ; make configure) ; \
+	else \
+		echo -n "Warning: Asir source is not found. " ; \
+		echo "asir will not be compiled." ; \
+	fi
 
 configure-bin:
 	(cd $(BINDIR) ; make configure)
@@ -167,7 +238,7 @@ configure-links:
 	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
 
 configure-oxmath:
-	(cd ox_math; ./configure)
+	(cd ox_math; ./make-configure)
 
 configure-pari:
 	(cd pari ; make configure)
@@ -185,8 +256,11 @@ clean-rc :
 all-Copyright :
 	(cd $(COPYRIGHTDIR) ; make copy-copyright )
 
-binary-dist : all-Copyright clean-rc all install all-misc 
+post-install-correction: install
 	(cd ../bin ; rm -f asir ; ln -s ./ox_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 ../rc ; make install.man)
+
+binary-dist : all-Copyright clean-rc all all-misc post-install-correction