===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.111
retrieving revision 1.122
diff -u -p -r1.111 -r1.122
--- OpenXM/src/Makefile	2002/04/05 01:28:46	1.111
+++ OpenXM/src/Makefile	2003/08/26 05:04:40	1.122
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.110 2002/02/25 08:18:40 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.121 2003/08/25 14:24:45 ohara Exp $
 
 OpenXM_HOME=../../OpenXM
 OPENXM_CONTRIB=../../OpenXM_contrib
@@ -9,7 +9,7 @@ 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-kxx all-pari all-phc all-openmath all-oxmath all-tigers all-fep
 
 all-gc: 
 	@if test ! -f gc/.gc_make_done ; \
@@ -19,7 +19,10 @@ all-gc: 
 	@touch gc/.gc_make_done
 
 all-gmp: configure-gmp
-	(if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; 
+	-@if test ! -f gmp/.gmp_make_done ; then \
+		(cd gmp ; make) ; \
+	fi
+	@touch gmp/.gmp_make_done 
 
 all-oxtoolkit: configure-oxtoolkit install-gmp install-gc configure-util
 	(cd ox_toolkit; make)
@@ -38,7 +41,7 @@ all-asir: configure-asir
 all-gnuplot: configure-gnuplot
 	-(cd gnuplot ; make all)
 
-all-k097: configure-k097 all-kan96xx
+all-k097: configure-k097 all-kan96xx all-kxx
 	(cd k097 ; make all)
 
 all-kan96xx: configure-kan96xx install-gc install-gmp
@@ -56,7 +59,7 @@ all-openmath:
 	fi
 
 all-oxmath: configure-oxmath install-oxtoolkit
-	-@if test -x /usr/local/bin/math ; then \
+	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make) ; \
 	else \
 		echo -n "Warning: Mathematica is not found. " ; \
@@ -72,7 +75,10 @@ all-phc:
 all-tigers:
 	(cd tigers ; make all)
 
+all-fep:
+	-(cd ${OPENXM_CONTRIB2}/fep ; make all)
 
+
 all-misc :
 	(cd ../rc ; make repl)
 	(cd ../doc ; make all-install)
@@ -84,22 +90,36 @@ all-rc:
 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-misc
+	 install-misc install-fep
 
 
 install-gc : all-gc
 	-@if test ! -f gc/.gc_installed ; \
 	then \
-		mkdir ../lib ; \
+		if test ! -d ../lib ; then mkdir ../lib ; fi ; \
 		cp gc/gc.a ../lib/libgc.a ; \
+		if test ! -d ../include/gc ; then mkdir -p ../include/gc ; fi ; \
+		cp gc/include/gc.h gc/include/gc_cpp.h ../include/gc ; \
 	fi 
 	@touch gc/.gc_installed
 
+install-asir-gc : configure-asir
+	@if test ! -f gc/.asir-gc_installed ; \
+	then \
+		if test ! -d ../lib ; then mkdir ../lib ; fi ; \
+		(cd asir2000 ; make install-libasir-gc) ; \
+		rm -f ../lib/libgc.a ; \
+		ln -s ../lib/libasir-gc.a ../lib/libgc.a ; \
+		echo "libasir-gc.a (modifed for asir) is installed as libgc.a instead of libgc.a" ; \
+		touch gc/.asir-gc_installed ; \
+	fi
 
+
 install-gmp : all-gmp
-	-@if test ! -f gmp/.gmp_installed ; \
+	@if test ! -f gmp/.gmp_installed ; \
 	then \
-		(cd gmp; make install) ; \
+		(cd gmp; make install-exec) ; \
+		(cd gmp; cp gmp.h ../../OpenXM/include) ; \
 	fi 
 	@touch gmp/.gmp_installed
 
@@ -137,8 +157,8 @@ install-oxtoolkit: all-oxtoolkit
 install-oxc: all-oxc
 	(cd oxc; make install)
 
-install-oxmath: all-oxmath install-kxx
-	-@if test -x /usr/local/bin/math ; then \
+install-oxmath: all-oxmath configure-util
+	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make install) ; \
 	else \
 		echo -n "Warning: Mathematica is not found. " ; \
@@ -165,6 +185,9 @@ install-asir-doc: install-asir
 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)
 
@@ -186,6 +209,7 @@ clean:
 	(cd tigers ; make clean)
 	(cd asir-doc ; make clean)
 	(cd asir-contrib ; make clean)
+	-(cd ${OPENXM_CONTRIB2}/fep ; make clean)
 
 distclean: clean
 	(cd uuencoded ; make distclean)
@@ -240,7 +264,7 @@ configure-gmp: configure-links
 	  (cd gmp ; ./configure --prefix=`pwd`/../../OpenXM; touch .gmp_configured) ; \
 	fi 
 
-configure-asir:
+configure-asir: configure-directory configure-util
 	@if test -d $(OPENXM_CONTRIB2) ; then \
 		(cd asir2000 ; make configure) ; \
 	else \
@@ -254,12 +278,12 @@ configure-bin:
 configure-gnuplot:
 	-(cd gnuplot ; make configure)
 
-configure-k097: configure-links
+configure-k097: configure-links configure-util
 
-configure-kan96xx: configure-links
+configure-kan96xx: configure-links configure-util
 	(cd kan96xx ; make configure)
 
-configure-kxx: 
+configure-kxx: configure-util
 	( cd kxx ; ./make-configure) 
 
 configure-links: configure-directory
@@ -286,7 +310,7 @@ configure-oxtoolkit: configure-include
 configure-oxc: configure-include
 	(cd oxc; ./make-configure)
 
-configure-oxmath: configure-include
+configure-oxmath: configure-include configure-directory
 	(cd ox_math; ./make-configure)
 
 configure-pari: