===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.76
retrieving revision 1.82
diff -u -p -r1.76 -r1.82
--- OpenXM/src/Makefile	2000/02/01 05:11:09	1.76
+++ OpenXM/src/Makefile	2000/03/01 00:15:46	1.82
@@ -1,6 +1,7 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.75 2000/02/01 04:24:18 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.81 2000/02/28 08:03:08 takayama Exp $
 
 OPENXM_CONTRIB=../../OpenXM_contrib
+OPENXM_CONTRIB2=../../OpenXM_contrib2
 LIBDIR=../lib
 BINDIR=../bin
 RCDIR=../rc
@@ -10,7 +11,12 @@ all: configure all-asir all-gnuplot all-k097 all-kan96
      all-pari all-phc all-openmath all-oxmath all-tigers
 
 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)
@@ -59,7 +65,12 @@ install: install-asir install-gnuplot install-k097 ins
 	 install-phc install-tigers install-asir-doc install-asir-contrib
 
 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)
@@ -112,9 +123,9 @@ clean:
 	(cd gnuplot ; make clean)
 	(cd k097 ; make clean)
 	(cd kan96xx ; make clean)
-	(cd kxx ; make clean)
+	-(cd kxx ; make clean)
 	(cd OpenMath ; make clean)
-#	(cd ox_math ; make clean)
+	-(cd ox_math ; make clean)
 	(cd pari ; make clean)
 	(cd phc ; make clean)
 	(cd tigers ; make clean)
@@ -126,6 +137,7 @@ distclean: clean
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
+	-(cd kxx ; make distclean)
 	(cd OpenMath ; make distclean)
 	(cd pari ; make distclean)
 	(cd phc ; make distclean)
@@ -140,7 +152,12 @@ configure: configure-links configure-bin configure-asi
 	   configure-pari
 
 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)
@@ -154,7 +171,7 @@ configure-kan96xx:
 	(cd kan96xx ; make configure)
 
 configure-kxx: 
-	(cd kxx ; make configure)
+	( cd kxx ; ./make-configure) 
 
 configure-links:
 	rm -f -r $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
@@ -166,18 +183,28 @@ 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)
 
+generate-source-distribution : generate-source-distribution-kxx \
+                               generate-source-distribution-ox_toolkit
+
+generate-source-distribution-kxx :
+	(cd kxx ; rm -f .configure_done Makefile ; autoconf)
+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 )
 
-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)
+
+binary-dist : all-Copyright clean-rc all all-misc post-install-correction