===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.52
retrieving revision 1.142
diff -u -p -r1.52 -r1.142
--- OpenXM/src/Makefile	2000/01/09 18:44:55	1.52
+++ OpenXM/src/Makefile	2004/06/30 22:14:06	1.142
@@ -1,34 +1,53 @@
-## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.51 2000/01/09 18:20:14 maekawa Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.141 2004/06/30 12:13:05 takayama Exp $
 
-all: configure all-kan96xx all-kxx all-tigers all-phc all-k097 \
-     all-pari all-asir all-gnuplot all-openmath all-oxmath
+OpenXM_HOME=..
+OpenXM_contrib=../../OpenXM_contrib
+OpenXM_contrib2=../../OpenXM_contrib2
+LIBDIR=../lib
+BINDIR=../bin
+RCDIR=../rc
+COPYRIGHTDIR=../Copyright
 
-all-asir: configure-asir
+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: install-util 
+	(cd gc; make all)
+
+all-gmp: configure-gmp
+	(cd gmp; make all)
+
+all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util
+	(cd ox_toolkit; make)
+
+all-oxc: configure-oxc install-oxtoolkit 
+	(cd oxc; make)
+
+all-asir: configure-asir install-pari
 	(cd asir2000 ; make all)
 
 all-gnuplot: configure-gnuplot
-	(cd gnuplot ; make all)
+	-(cd gnuplot ; make all)
 
-all-k097: configure-k097
+all-k097: configure-k097 all-kan96xx all-kxx install-oxtags
 	(cd k097 ; make all)
 
-all-kan96xx: configure-kan96xx
+all-kan96xx: configure-kan96xx install-gc install-gmp install-util install-oxtags
 	(cd kan96xx ; make all)
 
-all-kxx: configure-kxx
+all-kxx: configure-kxx all-kan96xx install-util install-oxtags
 	(cd kxx ; make all)
 
 all-openmath:
-	@if ../misc/which.pl -s javac ; then \
-		(cd OpenMath ; make) ; \
+	-@if ../misc/which.pl -s javac ; then \
+		(cd OpenMath ; make all) ; \
 	else \
 		echo -n "Warning: javac (java compiler) is not found " ; \
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
-all-oxmath: configure-oxmath
-	@if test -d /usr/local/mathematica ; then \
+all-oxmath: configure-oxmath install-oxtoolkit install-gc
+	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make) ; \
 	else \
 		echo -n "Warning: Mathematica is not found. " ; \
@@ -44,24 +63,78 @@ all-phc:
 all-tigers:
 	(cd tigers ; make all)
 
-install: install-asir install-gnuplot install-k097 install-kan96xx \
-	 install-kxx install-pari install-phc install-tigers
+all-fep:
+	-(cd ${OpenXM_contrib2}/fep ; make all)
 
+
+all-misc : install-util
+	(cd ../rc ; make repl)
+	(cd ../doc ; make all-install)
+	(cd ../doc ; make all-spec)
+
+all-rc:
+	(cd ../rc ; make )
+all-util: configure-util
+	(cd util ; make all)
+
+install: install-oxtags install-util 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-misc install-fep install-uuencoded  
+
+install-oxtags:
+	(cd ../doc/OpenXM-web ; make install-exec)
+
+install-util: all-util
+	(cd util; make install)
+
+install-gc : all-gc
+	(cd gc; make install)
+
+
+install-gmp : all-gmp
+	(cd gmp; make install)
+
 install-asir: all-asir
-	(cd asir2000 ; make install)
+	(cd asir2000 ; make install) ; \
 
 install-gnuplot: all-gnuplot
-	(cd gnuplot ; make install)
+	-(cd gnuplot ; make install)
 
-install-k097: all-k097
+install-k097:  install-kxx all-k097 install-oxc
 	(cd k097 ; make install)
 
 install-kan96xx: all-kan96xx
-	(cd kan96xx ; make install2)
+	(cd kan96xx ; make install)
 
 install-kxx: all-kxx
-	(cd kxx ; make install2)
+	(cd kxx ; make install)
 
+install-openmath: all-openmath
+	-@if ../misc/which.pl -s javac ; then \
+		(cd OpenMath ; make install) ; \
+	else \
+		echo -n "Warning: javac (java compiler) is not found " ; \
+		echo "in your search path. OpenMath will not be installed." ; \
+	fi
+
+install-oxtoolkit: all-oxtoolkit
+	(cd ox_toolkit; make install)
+
+install-oxc: all-oxc
+	(cd oxc; make install)
+
+install-oxmath: all-oxmath 
+	-@if test -d /usr/local/mathematica ; then \
+		(cd ox_math ; make install) ; \
+	else \
+		echo -n "Warning: Mathematica is not found. " ; \
+		echo "ox_math will not be installed." ; \
+	fi
+	-(cd ox_math/documents ; make install)
+	-(cd ox_math/lib ; make install)
+
 install-pari: all-pari
 	(cd pari ; make install)
 
@@ -71,52 +144,143 @@ install-phc: all-phc
 install-tigers: all-tigers
 	(cd tigers ; make install)
 
+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: configure-asir-doc install-asir
+	-(cd asir-doc ; make install)
+
+install-misc:
+	(cd ../rc ; make install-man)
+
+install-fep: all-fep
+	-(cd ${OpenXM_contrib2}/fep ; make PREFIX=../../OpenXM install)
+
+install-rc: all-rc
+	(cd ../rc ; make install)
+
+install-uuencoded:
+	(cd uuencoded ; make install)
+
+install-asir-port:
+	(cd asir-port ; make install)
+
 clean:
-	(cd asir2000 ; make clean)
-	(cd gnuplot ; make clean)
-	(cd k097 ; make clean)
-	(cd kan96xx ; make clean)
-	(cd kxx ; make clean)
-#	(cd ox_math ; make clean)
-	(cd pari ; make clean)
-	(cd phc ; make clean)
-	(cd tigers ; make clean)
-	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/k0 bin/oxweave bin/fep.linux bin/lin_phcv2p
+	-rm ./.configure-links-done
+	-rm ${OpenXM_contrib}/gmp/.gmp_*
+	-rm ${OpenXM_contrib}/gc/.gc_*
+	-(cd gmp ; make clean)
+	-(cd gc ; make clean ; /bin/rm -f *.a)
+	-(cd asir2000 ; make clean)
+	-(cd gnuplot ; make clean)
+	-(cd k097 ; make clean)
+	-(cd kan96xx ; make clean)
+	-(cd kxx ; make clean)
+	-(cd OpenMath ; make clean)
+	-(cd ox_math ; make clean)
+	-(cd pari ; make clean)
+	-(cd phc ; make clean)
+	-(cd tigers ; make clean)
+	-(cd asir-doc ; make 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 gmp ; make distclean)
+	-(cd gc ; make distclean ; /bin/rm -f *.a)
 	(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)
 	(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 
 
-configure: configure-links configure-asir configure-bin configure-gnuplot \
+configure: configure-util configure-asir \
+	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
-	   configure-pari
+	   configure-pari configure-gmp configure-asir-doc
 
-configure-asir:
-	(cd asir2000; make configure)
+configure-util:
+	(cd util; ./make-configure)
 
-configure-bin:
-	(cd ../bin ; ./configure2)
+configure-gmp: install-util
+	(cd gmp; make configure)
 
+configure-asir: 
+	(cd asir2000 ; make configure) 
+
+configure-asir-doc: 
+	-(cd asir-doc ; ./make-configure) 
+
 configure-gnuplot:
-	(cd gnuplot ; make configure)
+	-(cd gnuplot ; make configure)
 
-configure-k097: install-kan96xx
+configure-k097:
+	(cd k097 ; ./make-configure)	
 
 configure-kan96xx:
-	(cd kan96xx ; make configure)
+	(cd kan96xx ; ./make-configure)
 
-configure-kxx: install-kan96xx
-	(cd kxx ; make configure)
+configure-kxx: 
+	( cd kxx ; ./make-configure) 
 
-configure-links:
-	./make-links
+configure-oxtoolkit:
+	(cd ox_toolkit; ./make-configure)
 
+configure-oxc: 
+	(cd oxc; ./make-configure)
+
 configure-oxmath:
-	(cd ox_math; ./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)
+
+
+clean-rc :
+	(cd $(RCDIR) ; make clean )
+all-Copyright :
+	(cd $(COPYRIGHTDIR) ; make copy-copyright )
+
+install-all-asir-lib:
+	(cd asir2000 ; make install-lib-small)
+
+install-document: install-document-kan96xx install-document-asir-contrib
+
+install-document-kan96xx: install-kan96xx
+	(cd kan96xx ; make install-document)
+install-document-asir-contrib: install-asir-contrib
+	(cd asir-contrib; 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 ../bin ; rm -f asir ; ln -s ../../OpenXM_contrib2/asir2000/asir .)
+
+