===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Generic/openxm/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- OpenXM/misc/packages/Generic/openxm/Makefile	2000/03/10 03:20:26	1.7
+++ OpenXM/misc/packages/Generic/openxm/Makefile	2000/03/10 10:25:21	1.8
@@ -1,7 +1,9 @@
-# $OpenXM: OpenXM/misc/packages/Generic/openxm/Makefile,v 1.6 2000/03/06 09:01:09 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Generic/openxm/Makefile,v 1.7 2000/03/10 03:20:26 takayama Exp $
 # This is a Makefile to generate source and binary distributions of
 # the OpenXM package on various plathomes.
 
+# If you add new directory under OpenXM/lib, edit SHARED_FILES.
+
 ## For committers: prepare cvs-OpenXM under your search path 
 ## to access to CVS servers.
 RCVS=cvs-OpenXM -d kerberos.math.sci.kobe-u.ac.jp:/usr/cvs
@@ -22,6 +24,19 @@ RELEASE=
 
 TYPE=`uname -s`-`uname -m`
 
+OpenXM_HOME=$(HOME)/OpenXM
+TAR_WORK=$(HOME)/tmp
+#TAR_WORK=${OpenXM_HOME}/misc/packages/Generic/openxm/work
+INSTALL_WORK=${OpenXM_HOME}/misc/packages/Generic/openxm/work/openxm-install-dir
+
+### Variables for the real Makefile
+### Variables should be set before the first target.
+srcdir = .
+prefix=${PREFIX}
+MAN_DIR=${prefix}/man/man1
+WORK=work/openxm-${VERSION}
+### End of variables for the real Makefile
+
 ### Common
 SHARED_FILES = OpenXM/Copyright OpenXM/doc OpenXM/include OpenXM/man \
                OpenXM/rc \
@@ -29,27 +44,29 @@ SHARED_FILES = OpenXM/Copyright OpenXM/doc OpenXM/incl
                OpenXM/lib/k097 OpenXM/lib/math OpenXM/lib/pari \
                OpenXM/lib/sm1 OpenXM/lib/asir 
 BINARY_FILES = OpenXM/bin OpenXM/lib/*.a OpenXM/lib/*.so*
-OpenXM_BINARIES=gnuplot4ox gnuplot_x11 k0 ox ox_sm1 oxlog oxweave sm1 tigers
+EXECUTABLES=gnuplot4ox gnuplot_x11 k0 ox ox_sm1 oxlog oxweave sm1 tigers ox_math
 
 usage :
 	@echo "Targets are "
-	@echo "  fetch  :   get the sources from the cvs server under work"
-	@echo "  tar-ball : generate OpenXM-source.tgz under work"
-	@echo "  tar-ball-01 : generate OpenXM-source-01.tgz under work"
-	@echo "  binary-tar-ball : generate OpenXM-binary-OS-CPU.tgz under work"
+	@echo "  fetch  :   get the sources from the cvs server under $(WORK)"
+	@echo "  tar-ball : generate OpenXM-source.tgz under $(TAR_WORK)"
+	@echo "  tar-ball-01 : generate OpenXM-source-01.tgz under $(TAR_WORK)"
+	@echo "  binary-tar-ball : generate OpenXM-binary-OS-CPU.tgz under $(TAR_WORK)"
+	@echo "  shared-tar-ball : generate OpenXM-shared.tgz under $(TAR_WORK)"
+	@echo "  clean-work "
+	@echo "  clean-for-make "
 	@echo -n "Type is "
 	@echo $(TYPE)
+	@echo -n "INSTALL_WORK is "
+	@echo  $(INSTALL_WORK)
+	@echo -n "TAR_WORK is "
+	@echo  $(TAR_WORK)
+	@echo " "
 
 ### Start of Makefile  to work in the directory work/openxm-$(VERSION)
 ### It does not work here.
 ### Original version is in misc/packages/FreeBSD/openxm-1.1.2
 ### Absolute path should be used for TAR_WORK
-TAR_WORK=$(HOME)/tmp
-#TAR_WORK=`pwd`/work
-INSTALL_WORK=`pwd`/work/openxm-install-dir
-srcdir = .
-prefix=${PREFIX}
-MAN_DIR=${prefix}/man/man1
 
 usage-of-real-make:
 	@echo "Targets are all, install, clean, distclean"
@@ -57,18 +74,23 @@ usage-of-real-make:
 	@echo "e.g., make install PREFIX=/usr/local"
 
 configure :
-	@if [ ! -f .configure_done ] ; then 
-		(cd $(srcdir)/OpenXM/src ;	make configure ) \
+	@if [ ! -f .configure_done ] ; then \
+		(cd $(srcdir)/OpenXM/src ;	make configure ) ; \
 	fi
 	@touch .configure_done
 
 all : configure
 	@if [ ! -f .all_done ] ; then \
-#	(cd $(srcdir)/OpenXM/src ;	make ;	make install) ; \
-	(cd $(srcdir)/OpenXM/src ;	make binary-dist) ; \
+		(cd $(srcdir)/OpenXM/src ;	make binary-dist) ; \
 	fi
 	@touch .all_done
 
+all-ideal : configure
+	@if [ ! -f .all_done ] ; then \
+		(cd $(srcdir)/OpenXM/src ;	make ;	make install) ; \
+	fi
+	@touch .all_done
+
 install : install-binary-files install-shared-files
 # Install shell scripts to ${prefix}/bin, which is typically /usr/local/bin
 	(cd ${prefix}/OpenXM/rc ; make ; make install PREFIX=${prefix})
@@ -77,7 +99,8 @@ install-binary-files:  all
 	@echo "install-binary-files with PREFIX= "
 	@echo ${prefix}
 	tar cf - ${BINARY_FILES} | (cd ${prefix} ; tar xf -)
-	-for i in $(OpenXM_BINARIES); do strip ${prefix}/OpenXM/bin/$$i ; done
+	(cd ${prefix}/OpenXM/bin ; make clean-for-install)
+	-for i in $(EXECUTABLES); do strip ${prefix}/OpenXM/bin/$$i ; done
 
 install-shared-files:  all
 	@echo "install-binary-files with PREFIX= "
@@ -103,41 +126,48 @@ clean-installed-openxm:
 
 
 
-WORK=work/openxm-${VERSION}
 fetch :
 	@if [ ! -f ./.fetch_done ]; then \
-		/bin/rm -rf work ; mkdir work ; mkdir $(WORK)\
-		( cd $(WORK) ; $(RCVS) export -rHEAD OpenXM OpenXM_contrib OpenXM_contrib2) ; \
-		cp Makefile $(WORK)/Makefile ; \
+		/bin/rm -rf work ; mkdir work ; mkdir ${WORK} ; \
+		( cd ${WORK} ; $(RCVS) export -rHEAD OpenXM OpenXM_contrib OpenXM_contrib2) ; \
+		cp Makefile ${WORK}/Makefile ; \
 	fi
 	@touch ./.fetch_done
 
 tar-ball: fetch
-	(cd $(WORK)/OpenXM/src ; make generate-source-distribution)
-	(cd work ; tar czvf $(TAR_WORK)/openxm-${VERSION}.tar.gz openxm-${VERSION})
+	cp Makefile ${WORK}/Makefile 
+	(cd ${WORK}/OpenXM/src ; make generate-source-distribution)
+	(cd work ; tar czvf ${TAR_WORK}/openxm-${VERSION}.tar.gz openxm-${VERSION})
 
 tar-ball-01: fetch
 	@if [ ! -f ./.tar-ball-01_done ]; then \
-		(cd $(WORK)/OpenXM/src ; make generate-source-distribution) ; \
-		(cd work ; tar czvf $(TAR_WORK)/openxm01-${VERSION}.tar.gz openxm-${VERSION}/OpenXM openxm-${VERSION}/OpenXM_contrib ) ; \
+		cp Makefile ${WORK}/Makefile  ; \
+		(cd ${WORK}/OpenXM/src ; make generate-source-distribution) ; \
+		(cd work ; tar czvf ${TAR_WORK}/openxm01-${VERSION}.tar.gz openxm-${VERSION}/OpenXM openxm-${VERSION}/OpenXM_contrib ) ; \
 	fi
 	@touch ./.tar-ball-01_done
 
 binary-tar-ball : tar-ball-01
-	rm -rf $(INSTALL_WORK)
-	mkdir $(INSTALL_WORK) $(INSTALL_WORK)/bin $(INSTALL_WORK)/man 
-	mkdir $(INSTALL_WORK)/man/man1
-	(cd $(WORK) ; make install-binary-files PREFIX=$(INSTALL_WORK))
-	(cd $(WORK) ; tar czf $(TAR_WORK)/OpenXM-binary-$(TYPE)$(RELEASE).tgz ${BINARY_FILES})
+	cp Makefile ${WORK}/Makefile 
+	rm -rf ${INSTALL_WORK}
+	mkdir ${INSTALL_WORK} ${INSTALL_WORK}/bin ${INSTALL_WORK}/man 
+	mkdir ${INSTALL_WORK}/man/man1
+	(cd ${WORK} ; make install-binary-files PREFIX=${INSTALL_WORK})
+	(cd ${INSTALL_WORK} ; tar czf ${TAR_WORK}/OpenXM-binary-$(TYPE)$(RELEASE).tgz ${BINARY_FILES})
 
-share-tar-ball : tar-ball-01
-	rm -rf $(INSTALL_WORK)
-	mkdir $(INSTALL_WORK) $(INSTALL_WORK)/bin $(INSTALL_WORK)/man 
-	mkdir $(INSTALL_WORK)/man/man1
-	(cd $(WORK) ; make install-shared-files PREFIX=$(INSTALL_WORK))
-	(cd $(WORK) ; tar czf $(TAR_WORK)/OpenXM-common-$(TYPE)$(RELEASE).tgz ${SHARED_FILES})
+shared-tar-ball : tar-ball-01
+	cp Makefile ${WORK}/Makefile 
+	rm -rf ${INSTALL_WORK}
+	mkdir ${INSTALL_WORK} ${INSTALL_WORK}/bin ${INSTALL_WORK}/man 
+	mkdir ${INSTALL_WORK}/man/man1
+	(cd ${WORK} ; make install-shared-files PREFIX=${INSTALL_WORK})
+	(cd ${INSTALL_WORK} ; tar czf ${TAR_WORK}/OpenXM-shared-$(TYPE)$(RELEASE).tgz ${SHARED_FILES})
 
 
-clean :
+clean-work :
 	/bin/rm -rf .*_done *~
 	/bin/rm -rf work
+
+clean-for-make:
+	(cd ${WORK} ; make distclean)
+	rm -f .configure_done .all_done