===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.105
retrieving revision 1.162
diff -u -p -r1.105 -r1.162
--- OpenXM/src/Makefile	2000/12/21 12:26:57	1.105
+++ OpenXM/src/Makefile	2013/11/06 00:32:59	1.162
@@ -1,338 +1,312 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.104 2000/12/21 09:25:23 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.161 2011/05/13 08:14:30 takayama Exp $
 
-OpenXM_HOME=../../OpenXM
-OPENXM_CONTRIB=../../OpenXM_contrib
-OPENXM_CONTRIB2=../../OpenXM_contrib2
+OpenXM_HOME=..
+OpenXM_contrib2=../../OpenXM_contrib2
 LIBDIR=../lib
 BINDIR=../bin
+DOCDIR=../doc
 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-phcpack all-oxcdd \
+	all-oxmgraph all-pcc
 
-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 .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; 
+	(cd gmp; ${MAKE} all)
 
-all-oxtoolkit: configure-oxtoolkit install-gmp install-kxx
-	(cd ox_toolkit; make)
+all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util install-kan96xx
+	(cd ox_toolkit; ${MAKE} all)
 
-all-oxc: configure-oxc install-oxtoolkit
-	(cd oxc; make)
+all-oxc: configure-oxc install-oxtoolkit 
+	(cd oxc; ${MAKE} all)
 
-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-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
-	(cd k097 ; make all)
+all-k097: configure-k097 all-kan96xx all-kxx install-oxtags
+	(cd k097; ${MAKE} all)
 
-all-kan96xx: configure-kan96xx install-gc install-gmp
-	(cd kan96xx ; make all)
+all-kan96xx: configure-kan96xx install-gc install-gmp install-util install-oxtags
+	(cd kan96xx; ${MAKE} all)
 
-all-kxx: configure-kxx all-kan96xx
-	(cd kxx ; make all)
+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 all) ; \
+	-@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." ; \
+		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 \
-		(cd ox_math ; make) ; \
+all-oxmath: configure-oxmath install-oxtoolkit install-gc
+	-@if test -d /usr/local/mathematica; then \
+		(cd ox_math; ${MAKE} all); \
 	else \
-		echo -n "Warning: Mathematica is not found. " ; \
-		echo "ox_math will not be compiled." ; \
+		echo -n "Warning: Mathematica is not found. "; \
+		echo "ox_math will not be compiled."; \
 	fi
 
 all-pari: configure-pari
-	(cd pari ; make all)
+	(cd pari; ${MAKE} all)
 
 all-phc:
-	(cd phc ; make all)
+	(cd phc; ${MAKE} all)
 
+all-phcpack:
+	-@if ../misc/which.pl -s gnatmake; then \
+		(cd phcpack; ${MAKE} all) ; \
+	fi
+
 all-tigers:
-	(cd tigers ; make all)
+	(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-misc: install-util
+	(cd ${RCDIR}; ${MAKE} repl)
+	(cd ../doc; ${MAKE} all-install all-spec)
+
 all-rc:
-	(cd ../rc ; make )
+	(cd ${RCDIR}; ${MAKE})
 
-install: install-asir install-gnuplot install-k097 install-kan96xx \
+all-util: all-util-bin all-util-lib
+
+all-util-bin: configure-util
+	(cd util; ${MAKE} all-bin)
+
+all-util-lib: configure-util
+	(cd util; ${MAKE} all-lib)
+
+all-oxcdd: install-oxtoolkit
+	-(cd ox_cdd; ${MAKE} all)
+all-oxmgraph: configure-oxmgraph
+	-(cd oxmgraph; ${MAKE} all)
+all-pcc: configure-pcc
+	-(cd pcc; ${MAKE} all)
+
+all-document-asir-contrib: configure-document-asir-contrib
+	(cd asir-contrib/packages/doc; ${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-phcpack install-oxcdd \
+     install-oxmgraph install-pcc
 
+install-oxtags:
+	(cd ../doc/OpenXM-web; ${MAKE} install-exec)
 
-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
+install-util-bin: all-util-bin
+	(cd util; ${MAKE} install-bin)
 
+install-util-lib: all-util-lib
+	(cd util; ${MAKE} install-lib)
 
-install-gmp : all-gmp
-	-@if test ! -f gmp/.gmp_installed ; \
-	then \
-		(cd gmp; make install) ; \
-	fi 
-	@touch gmp/.gmp_installed
+install-util: install-util-bin install-util-lib
 
+install-gc: all-gc
+	(cd gc; ${MAKE} install)
+
+
+install-gmp: all-gmp
+	(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
-	(cd k097 ; make install)
+install-k097:  install-kxx all-k097 install-oxc
+	(cd k097; ${MAKE} install)
 
 install-kan96xx: all-kan96xx
-	(cd kan96xx ; make install)
+	(cd kan96xx; ${MAKE} install)
 
 install-kxx: all-kxx
-	(cd kxx ; make install)
+	(cd kxx; ${MAKE} install)
 
 install-openmath: all-openmath
-	@if ../misc/which.pl -s javac ; then \
-		(cd OpenMath ; make install) ; \
+	-@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." ; \
+		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)
+	(cd ox_toolkit; ${MAKE} install)
 
 install-oxc: all-oxc
-	(cd oxc; make install)
+	(cd oxc; ${MAKE} install)
 
-install-oxmath: all-oxmath install-kxx
-	-@if test -x /usr/local/bin/math ; then \
-		(cd ox_math ; 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." ; \
+		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)
+	-(cd ox_math/documents; ${MAKE} install)
+	-(cd ox_math/lib; ${MAKE} install)
 
 install-pari: all-pari
-	(cd pari ; make install)
+	(cd pari; ${MAKE} install)
 
 install-phc: all-phc
-	(cd phc ; make install)
+	(cd phc; ${MAKE} install)
 
+install-phcpack: all-phcpack
+	-@if ../misc/which.pl gnatmake; then \
+		(cd phcpack; ${MAKE} install) ; \
+	fi
+
 install-tigers: all-tigers
-	(cd tigers ; make install)
+	(cd tigers; ${MAKE} install)
 
-install-asir-contrib: install-asir install-kxx
-	(cd asir-contrib ; make install)
+install-asir-contrib: configure-asir-contrib install-asir install-util \
+                      install-asir-contrib-oxservers
+	(cd asir-contrib; ${MAKE} install)
 
-install-asir-doc: install-asir
-	-(cd asir-doc ; make install)
+install-asir-contrib-oxservers: install-asir install-util \
+                install-k097 install-kxx install-openmath install-oxmath \
+                install-phc install-tigers install-gnuplot
 
+install-asir-doc: configure-asir-doc
+	-(cd asir-doc; ${MAKE} install)
+
 install-misc:
-	(cd ../rc ; make install.man)
+	(cd ${RCDIR}; ${MAKE} install-man)
 
+install-fep: all-fep
+	-(cd ${OpenXM_contrib2}/fep; ${MAKE} PREFIX=../../OpenXM install)
+
 install-rc: all-rc
-	(cd ../rc ; make install)
+	(cd ${RCDIR}; ${MAKE} install)
 
+install-asir-port:
+	(cd asir-port; ${MAKE} install)
+
+install-oxcdd: all-oxcdd
+	-(cd ox_cdd; ${MAKE} install)
+
+install-oxmgraph: all-oxmgraph
+	-(cd oxmgraph; ${MAKE} install)
+
+install-pcc: all-pcc
+	-(cd pcc; ${MAKE} install)
+
 clean:
 	-rm ./.configure-links-done
-	-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)
-	-(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)
+	-@for i in OpenMath asir-contrib asir-doc asir2000 gc gmp gnuplot \
+	           k097 kan96xx kxx ox_math ox_toolkit oxc pari phc phcpack tigers \
+               oxmgraph pcc \
+	           util ${OpenXM_contrib2}/fep ; do \
+		(cd $$i; ${MAKE} clean); \
+	done
 
 distclean: clean
-	(cd $(BINDIR) ; make distclean)
-	-(cd $(OPENXM_CONTRIB)/gmp ; make distclean)
-	(cd $(OPENXM_CONTRIB)/gc ; make clean ; /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)
-	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
+	-@for i in OpenMath asir2000 gc gmp gnuplot kan96xx kxx ox_math \
+	           ox_toolkit oxc pari phc phcpack tigers oxmgraph pcc \
+                   asir-doc k097 ox_cdd util; do \
+		(cd $$i; ${MAKE} distclean); \
+	done
+	-(cd ${BINDIR} && rm -f  d0 k0 ox ox_sm1 oxlog oxweave sm1)
+	-(cd ${LIBDIR} && rm -rf k097 sm1)
 
-configure: configure-links configure-include configure-bin configure-asir \
+configure: configure-util configure-asir \
 	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
-	   configure-pari configure-gmp
+	   configure-pari configure-gmp configure-asir-doc configure-asir-contrib \
+       configure-oxmgraph configure-pcc
 
-configure-include: configure-include-make-dir ../include/ox/cmotag.h ../include/ox/oxMessageTag.h ../include/ox/smCommand.h
+configure-util:
+	(cd util; ./make-configure)
 
-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: install-util
+	(cd gmp; ${MAKE} configure)
 
-configure-gmp: configure-links
-	@if test -f gmp/.gmp_configured ; \
-	then \
-	  echo "MESSAGE: gmp is already configured. (.gmp_configured) " ;  \
-	else \
-	  (cd gmp ; ./configure --prefix=`pwd`/../../OpenXM; touch .gmp_configured) ; \
-	fi 
+configure-asir: install-util 
+	(cd asir2000; ${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-contrib: 
+	-(cd asir-contrib; ./make-configure) 
 
-configure-bin:
-	(cd $(BINDIR) ; make configure)
+configure-asir-doc: 
+	-(cd asir-doc; ./make-configure) 
 
 configure-gnuplot:
-	-(cd gnuplot ; make configure)
+	-(cd gnuplot; ${MAKE} configure)
 
-configure-k097: configure-links
+configure-k097:
+	(cd k097; ./make-configure)	
 
-configure-kan96xx: configure-links
-	(cd kan96xx ; make configure)
+configure-kan96xx:
+	(cd kan96xx; ./make-configure)
 
 configure-kxx: 
-	( cd kxx ; ./make-configure) 
+	(cd kxx; ./make-configure) 
 
-configure-links:
-	-@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-include
+configure-oxtoolkit:
 	(cd ox_toolkit; ./make-configure)
 
-configure-oxc: configure-include
+configure-oxc: 
 	(cd oxc; ./make-configure)
 
-configure-oxmath: configure-include
-	(cd ox_math; ./make-configure)
+configure-oxmath:
+	-@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)
+configure-pari: install-util
+	(cd pari; ${MAKE} configure)
 
-generate-source-distribution : generate-source-distribution-kxx \
-                               generate-source-distribution-ox_toolkit
+configure-oxmgraph: 
+	-(cd oxmgraph; ./make-configure)
 
-generate-source-distribution-kxx :
-	(cd kxx ; rm -f .configure_done Makefile )
+configure-pcc:
+	-(cd pcc; ${MAKE} configure)
 
-generate-source-distribution-ox_toolkit :
-	(cd ox_toolkit ; rm -f Makefile ; autoconf)
+configure-document-asir-contrib: install-util-bin install-asir-doc
+	(cd asir-contrib/packages/doc; ./make-configure)
 
-clean-rc :
-	(cd $(RCDIR) ; make clean )
-all-Copyright :
-	(cd $(COPYRIGHTDIR) ; make copy-copyright )
+clean-rc:
+	(cd $(RCDIR); ${MAKE} clean)
 
-post-install-correction: install
-# I think that we no longer need post-install-correction-for-asir
-# post-install-corrections-other
-	(cd ../rc ; make install.man)
+all-Copyright:
+	(cd $(COPYRIGHTDIR); ${MAKE} all)
 
-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)
+install-document: install-document-kan96xx install-document-asir-contrib
 
-install-all-asir-lib:
-	(cd asir2000 ; make install-lib-small)
+install-document-kan96xx: install-kan96xx
+	(cd kan96xx; ${MAKE} install-document)
 
-binary-dist : all-Copyright clean-rc all all-misc post-install-correction install-all-asir-lib
+install-document-asir-contrib: all-document-asir-contrib
+	(cd asir-contrib/packages/doc; ${MAKE} install ; ${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 .)
+	(cd kan96xx; ${MAKE} install-for-debug)
+	(cd kxx; ${MAKE} install-for-debug)
+	(cd k097; ${MAKE} install-for-debug)
+	(cd ${BINDIR}; 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)
-
+fetch:
+	-@for i in gc gmp gnuplot pari tigers; do \
+		(cd $$i && ${MAKE} fetch); \
+	done