===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.109
retrieving revision 1.113
diff -u -p -r1.109 -r1.113
--- OpenXM/src/Makefile	2001/12/18 04:24:04	1.109
+++ OpenXM/src/Makefile	2002/09/03 01:05:28	1.113
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.108 2001/08/21 00:47:17 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.112 2002/04/05 01:43:48 takayama 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 ; \
@@ -21,7 +21,7 @@ all-gc: 
 all-gmp: configure-gmp
 	(if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; 
 
-all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-kxx
+all-oxtoolkit: configure-oxtoolkit install-gmp install-gc configure-util
 	(cd ox_toolkit; make)
 
 all-oxc: configure-oxc install-oxtoolkit
@@ -48,7 +48,7 @@ all-kxx: configure-kxx all-kan96xx
 	(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 " ; \
@@ -72,7 +72,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,7 +87,7 @@ 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
@@ -124,7 +127,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 " ; \
@@ -137,7 +140,7 @@ install-oxtoolkit: all-oxtoolkit
 install-oxc: all-oxc
 	(cd oxc; make install)
 
-install-oxmath: all-oxmath install-kxx
+install-oxmath: all-oxmath configure-util
 	-@if test -x /usr/local/bin/math ; then \
 		(cd ox_math ; make install) ; \
 	else \
@@ -165,6 +168,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 +192,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)
@@ -205,11 +212,15 @@ distclean: clean
 	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
 	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
 
-configure: configure-links configure-include configure-bin configure-asir \
+configure: configure-links configure-include configure-bin configure-util \
+       configure-asir \
 	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
 	   configure-pari configure-gmp
 
+configure-util: configure-directory
+	(cd util; make install)
+
 configure-include: configure-include-make-dir ../include/ox/cmotag.h ../include/ox/oxMessageTag.h ../include/ox/smCommand.h
 
 configure-include-make-dir:
@@ -255,7 +266,7 @@ configure-k097: configure-links
 configure-kan96xx: configure-links
 	(cd kan96xx ; make configure)
 
-configure-kxx: 
+configure-kxx: configure-util
 	( cd kxx ; ./make-configure) 
 
 configure-links: configure-directory