===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.91
retrieving revision 1.137
diff -u -p -r1.91 -r1.137
--- OpenXM/src/Makefile	2000/03/10 02:35:53	1.91
+++ OpenXM/src/Makefile	2004/03/25 01:52:18	1.137
@@ -1,65 +1,53 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.90 2000/03/08 06:30:29 ohara Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.136 2004/02/26 23:29:46 takayama Exp $
 
-OPENXM_CONTRIB=../../OpenXM_contrib
-OPENXM_CONTRIB2=../../OpenXM_contrib2
+OpenXM_HOME=..
+OpenXM_contrib=../../OpenXM_contrib
+OpenXM_contrib2=../../OpenXM_contrib2
 LIBDIR=../lib
 BINDIR=../bin
 RCDIR=../rc
 COPYRIGHTDIR=../Copyright
 
-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: 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: 
-	@if test ! -f gc/.gc_make_done ; \
-	then \
-		(cd gc ; make all) ; \
-	fi 
-	@touch gc/.gc_make_done
+all-gc: install-util 
+	(cd gc; make all)
 
 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
+	(cd gmp; make all)
 
-all-oxtoolkit: configure-oxtoolkit install-gmp install-kxx
+all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util
 	(cd ox_toolkit; make)
 
-all-asir: configure-asir
-	@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-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-kan96xx
+all-k097: configure-k097 all-kan96xx all-kxx install-oxtags
 	(cd k097 ; make all)
 
-all-kan96xx: configure-kan96xx install-gc install-gmp
+all-kan96xx: configure-kan96xx install-gc install-gmp install-util install-oxtags
 	(cd kan96xx ; make all)
 
-all-kxx: configure-kxx all-kan96xx
+all-kxx: configure-kxx all-kan96xx install-util install-oxtags
 	(cd kxx ; make all)
 
 all-openmath:
-	@if ../misc/which.pl -s javac ; then \
+	-@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 install-oxtoolkit
-	@if test -x /usr/local/bin/math ; 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. " ; \
@@ -75,48 +63,46 @@ all-phc:
 all-tigers:
 	(cd tigers ; make all)
 
-all-misc :
+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)
 
-install: install-asir install-gnuplot install-k097 install-kan96xx \
+all-rc:
+	(cd ../rc ; make )
+all-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-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
-	-@if test ! -f gc/.gc_installed ; \
-	then \
-		mkdir ../lib ; \
-		cp gc/gc.a ../lib/libgc.a ; \
-	fi 
-	@touch gc/.gc_installed
+	(cd gc; make install)
 
 
 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
+	(cd gmp; make install)
 
 install-asir: all-asir
-	@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
+	(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
@@ -126,7 +112,7 @@ install-kxx: all-kxx
 	(cd kxx ; make install)
 
 install-openmath: all-openmath
-	@if ../misc/which.pl -s javac ; then \
+	-@if ../misc/which.pl -s javac ; then \
 		(cd OpenMath ; make install) ; \
 	else \
 		echo -n "Warning: javac (java compiler) is not found " ; \
@@ -136,8 +122,11 @@ install-openmath: all-openmath
 install-oxtoolkit: all-oxtoolkit
 	(cd ox_toolkit; make install)
 
-install-oxmath: all-oxmath install-kxx
-	@if test -x /usr/local/bin/math ; then \
+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. " ; \
@@ -155,37 +144,61 @@ install-phc: all-phc
 install-tigers: all-tigers
 	(cd tigers ; make install)
 
-install-asir-contrib: install-asir install-kxx
+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)
+	-(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:
-	-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)
-	(cd kan96xx ; make clean)
+	-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 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 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 $(BINDIR) ; make distclean)
-	-(cd $(OPENXM_CONTRIB)/gmp ; make distclean)
-	(cd $(OPENXM_CONTRIB)/gc ; make clean ; /bin/rm -f *.a)
+	(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)
@@ -196,38 +209,27 @@ 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-links configure-bin configure-asir \
+configure: configure-asir \
 	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
 	   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-gmp: install-util
+	(cd gmp; make configure)
 
-configure-asir:
-	@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-asir: 
+	(cd asir2000 ; make configure) 
 
-configure-bin:
-	(cd $(BINDIR) ; make configure)
-
 configure-gnuplot:
-	(cd gnuplot ; make configure)
+	-(cd gnuplot ; make configure)
 
-configure-k097: 
+configure-k097:
+	(cd k097 ; ./make-configure)	
 
 configure-kan96xx:
 	(cd kan96xx ; make configure)
@@ -235,47 +237,44 @@ configure-kan96xx:
 configure-kxx: 
 	( cd kxx ; ./make-configure) 
 
-configure-links:
-	rm -f -r $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
-	(cd $(LIBDIR) ; ln -f -s ../src/k097 k097)
-	(cd $(LIBDIR) ; ln -f -s ../src/kan96xx/Doc sm1)
-	ln -f -s kan96xx SSkan
-	ln -f -s $(BINDIR) bin
-	ln -f -s $(OPENXM_CONTRIB)/gc gc
-	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
-
 configure-oxtoolkit:
 	(cd ox_toolkit; ./make-configure)
 
+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 ; 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 )
 
-post-install-correction: install
-#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)
-# post-install-corrections-other
-	(cd ../rc ; make install.man)
+install-all-asir-lib:
+	(cd asir2000 ; make install-lib-small)
 
-binary-dist : all-Copyright clean-rc all all-misc post-install-correction
+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 .)