===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.91
retrieving revision 1.119
diff -u -p -r1.91 -r1.119
--- OpenXM/src/Makefile	2000/03/10 02:35:53	1.91
+++ OpenXM/src/Makefile	2003/06/26 08:59:12	1.119
@@ -1,5 +1,6 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.90 2000/03/08 06:30:29 ohara Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.118 2003/06/02 20:26:58 ohara Exp $
 
+OpenXM_HOME=../../OpenXM
 OPENXM_CONTRIB=../../OpenXM_contrib
 OPENXM_CONTRIB2=../../OpenXM_contrib2
 LIBDIR=../lib
@@ -8,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 ; \
@@ -18,18 +19,14 @@ all-gc: 
 	@touch gc/.gc_make_done
 
 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
+	(if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; 
 
-all-oxtoolkit: configure-oxtoolkit install-gmp install-kxx
+all-oxtoolkit: configure-oxtoolkit install-gmp install-gc configure-util
 	(cd ox_toolkit; make)
 
+all-oxc: configure-oxc install-oxtoolkit
+	(cd oxc; make)
+
 all-asir: configure-asir
 	@if test -d $(OPENXM_CONTRIB2) ; then \
 		(cd asir2000 ; make all) ; \
@@ -39,9 +36,9 @@ all-asir: configure-asir
 	fi
 
 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
 	(cd k097 ; make all)
 
 all-kan96xx: configure-kan96xx install-gc install-gmp
@@ -51,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 " ; \
@@ -59,7 +56,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. " ; \
@@ -75,33 +72,50 @@ 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)
 	(cd ../doc ; make all-spec)
 
+all-rc:
+	(cd ../rc ; make )
+
 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 ; \
 	then \
-		mkdir ../lib ; \
-		cp gmp/libgmp.a ../lib ; \
-		mkdir ../include ; \
-		cp gmp/gmp.h ../include ; \
+		(cd gmp; make install) ; \
 	fi 
 	@touch gmp/.gmp_installed
 
@@ -114,7 +128,7 @@ install-asir: all-asir
 	fi
 
 install-gnuplot: all-gnuplot
-	(cd gnuplot ; make install)
+	-(cd gnuplot ; make install)
 
 install-k097: all-k097
 	(cd k097 ; make install)
@@ -126,7 +140,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 +150,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 configure-util
+	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make install) ; \
 	else \
 		echo -n "Warning: Mathematica is not found. " ; \
@@ -159,12 +176,19 @@ install-asir-contrib: install-asir install-kxx
 	(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)
+
 clean:
+	-rm ./.configure-links-done
 	-rm $(OPENXM_CONTRIB)/gmp/.gmp_*
 	-rm $(OPENXM_CONTRIB)/gc/.gc_*
 	-(cd $(OPENXM_CONTRIB)/gmp ; make clean)
@@ -181,9 +205,10 @@ clean:
 	(cd tigers ; make clean)
 	(cd asir-doc ; make clean)
 	(cd asir-contrib ; make clean)
+	-(cd ${OPENXM_CONTRIB2}/fep ; make clean)
 
 distclean: clean
-	(cd $(BINDIR) ; make distclean)
+	(cd uuencoded ; make distclean)
 	-(cd $(OPENXM_CONTRIB)/gmp ; make distclean)
 	(cd $(OPENXM_CONTRIB)/gc ; make clean ; /bin/rm -f *.a)
 	(cd asir2000 ; make distclean)
@@ -200,20 +225,42 @@ distclean: clean
 	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
 	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
 
-configure: configure-links 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:
+	@if test ! -d ../include ; \
+	then \
+	mkdir  ../include ; \
+	fi
+	@if test ! -d ../include/ox ; \
+	then \
+	mkdir  ../include/ox ; \
+	fi
+../include/ox/cmotag.h : ../doc/OpenXM-web/cmotag.h 
+	cp ../doc/OpenXM-web/cmotag.h ../include/ox 
+../include/ox/oxMessageTag.h : ../doc/OpenXM-web/oxMessageTag.h
+	cp ../doc/OpenXM-web/oxMessageTag.h ../include/ox 
+../include/ox/smCommand.h : ../doc/OpenXM-web/smCommand.h
+	cp ../doc/OpenXM-web/smCommand.h ../include/ox 
+
 configure-gmp: configure-links
 	@if test -f gmp/.gmp_configured ; \
 	then \
-	  echo "MESSAGE(kan96xx/Makefile): gmp is already configured. (.gmp_configured) " ;  \
+	  echo "MESSAGE: gmp is already configured. (.gmp_configured) " ;  \
 	else \
-	  (cd gmp ; ./configure ; touch .gmp_configured) ; \
+	  (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 \
@@ -222,32 +269,44 @@ configure-asir:
 	fi
 
 configure-bin:
-	(cd $(BINDIR) ; make configure)
+	(cd uuencoded ; make configure)
 
 configure-gnuplot:
-	(cd gnuplot ; make configure)
+	-(cd gnuplot ; make configure)
 
-configure-k097: 
+configure-k097: configure-links
 
-configure-kan96xx:
+configure-kan96xx: configure-links
 	(cd kan96xx ; make configure)
 
-configure-kxx: 
+configure-kxx: configure-util
 	( 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-links: configure-directory
+	-@if [ ! -f ./.configure-links-done ] ; then \
+	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 ; \
+	mkdir ${OpenXM_HOME}/libexec ; \
+	touch ./.configure-links-done ;\
+	fi
 
-configure-oxtoolkit:
+configure-directory:
+	-@if [ ! -d ../bin ] ; then \
+	mkdir ../bin ; \
+	fi
+
+configure-oxtoolkit: configure-include
 	(cd ox_toolkit; ./make-configure)
 
-configure-oxmath:
+configure-oxc: configure-include
+	(cd oxc; ./make-configure)
+
+configure-oxmath: configure-include configure-directory
 	(cd ox_math; ./make-configure)
 
 configure-pari:
@@ -257,7 +316,8 @@ generate-source-distribution : generate-source-distrib
                                generate-source-distribution-ox_toolkit
 
 generate-source-distribution-kxx :
-	(cd kxx ; rm -f .configure_done Makefile ; autoconf)
+	(cd kxx ; rm -f .configure_done Makefile )
+
 generate-source-distribution-ox_toolkit :
 	(cd ox_toolkit ; rm -f Makefile ; autoconf)
 
@@ -267,15 +327,42 @@ all-Copyright :
 	(cd $(COPYRIGHTDIR) ; make copy-copyright )
 
 post-install-correction: install
-#post-install-correction-for-asir:
+# I think that we no longer need post-install-correction-for-asir
+# post-install-corrections-other
+	(cd ../rc ; make install.man)
+
+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)
+	-(cd asir-doc ; make install-man-pages)
 
-binary-dist : all-Copyright clean-rc all all-misc post-install-correction
+install-all-asir-lib:
+	(cd asir2000 ; make install-lib-small)
 
+binary-dist : all-Copyright clean-rc all all-misc post-install-correction install-all-asir-lib
+
+## 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 .)
+
+
+##  Sub binary packages
+##  1: asir: asir only.   target:  all-asir install-asir install-asir-doc
+
+##  2: kan-ox: k0 and sm1 with ox_asir.  target: all-kan-ox install-kan-ox
+configure-all-kan-ox :  configure-links configure-include  configure-asir \
+                       configure-kan96xx configure-kxx configure-k097 \
+                       configure-oxc
+all-kan-ox:  configure-all-kan-ox all-asir all-kan96xx all-kxx all-k097 all-oxc
+install-kan-ox: all-kan-ox  install-asir install-kan96xx install-kxx \
+               install-k097 install-oxc install-asir-doc \
+               post-install-kan-ox
+post-install-kan-ox:
+	(cd ../bin ; /bin/rm -f ox_asir; ln -s ./asir ox_asir)