===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Generic/openxm/Makefile,v
retrieving revision 1.17
retrieving revision 1.24
diff -u -p -r1.17 -r1.24
--- OpenXM/misc/packages/Generic/openxm/Makefile	2000/08/29 04:08:52	1.17
+++ OpenXM/misc/packages/Generic/openxm/Makefile	2005/04/15 01:41:13	1.24
@@ -1,6 +1,7 @@
-# $OpenXM: OpenXM/misc/packages/Generic/openxm/Makefile,v 1.16 2000/03/16 10:07:04 takayama Exp $
-# This is a Makefile to generate source and binary distributions of
-# the OpenXM package on various plathomes.
+# $OpenXM: OpenXM/misc/packages/Generic/openxm/Makefile,v 1.23 2004/02/23 00:09:30 takayama Exp $
+# The FIRST part is a Makefile FOR COMMITTERS: it is used 
+# to generate source and binary distributions of
+# the OpenXM package on various operating systems.
 
 # If you add new directory under OpenXM/lib, edit SHARED_FILES.
 
@@ -18,10 +19,13 @@ RCVS=cvs-OpenXM -d kerberos.math.sci.kobe-u.ac.jp:/usr
 
 ## Configurations.
 ## OpenXM Version Number.
-VERSION=1.1.3
+PREFIX=/usr/local
+VERSION=head
 TAG=HEAD
 FTP_AREA=/export/home01/ftp/pub/OpenXM/${VERSION}
 
+OpenXM_contrib_files=OpenXM_contrib/uuencoded OpenXM_contrib/pari
+
 RELEASE=
 ## If you like to have a release name as a part of tar ball, then uncomment
 ## the next line.
@@ -54,8 +58,8 @@ MAN_PAGES    = openxm.1 sm1.1
 EXECUTABLES=gnuplot4ox gnuplot_x11 k0 ox ox_sm1 oxlog oxweave sm1 tigers ox_math
 
 usage : usage-of-real-make
-	@echo "    "
-	@echo "Usage for building tar balls for distribution:"
+	@echo "--------------------------------------------------"
+	@echo "Usage for building distributions (for COMMITTERS):"
 	@echo "Targets are "
 	@echo "  fetch  :   get the sources from the cvs server under $(WORK)"
 	@echo "  tar-ball : generate openxm-${VERSION}.tar.gz under $(TAR_WORK)"
@@ -65,6 +69,7 @@ usage : usage-of-real-make
 	@echo  "  install-tar-to-ftp-area : copy openxm-${VERSION}.tar.gz to ${FTP_AREA}"
 	@echo "  clean-work "
 	@echo "  clean-for-make "
+	@echo "--------------------------------------------------"
 	@echo -n "Type is "
 	@echo $(TYPE)
 	@echo -n "INSTALL_WORK is "
@@ -74,17 +79,20 @@ usage : usage-of-real-make
 	@echo -n "FTP_AREA is "
 	@echo  $(FTP_AREA)
 	@echo " "
+	@echo "A shell script cvs-OpenXM is necessary (write by yourself)"
+	@echo "under your search path."
 
+### The SECOND part is a Makefile to build binaries from source.
+### It only calls the Makefile at OpenXM/src.
 ### 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
 
 usage-of-real-make:
-	@echo "Usage for building OpenXM binaries:"
-	@echo "Targets are configure, all, install, clean, distclean"
-	@echo "You need to specify the PREFIX to install,"
-	@echo "e.g., make install PREFIX=/usr/local"
+	@echo "Usage for building OpenXM binaries (main Makefile is at OpenXM/src):"
+	@echo "Targets are "
+	@echo "   configure, all, install, clean, distclean"
+	@echo "You need to specify the PREFIX to install, e.g., make install PREFIX=/usr/local"
 
 configure :
 	@if [ ! -f .configure_done ] ; then \
@@ -149,7 +157,7 @@ clean-installed-openxm:
 fetch :
 	@if [ ! -f ./.fetch_done ]; then \
 		/bin/rm -rf work ; mkdir work ; mkdir ${WORK} ; \
-		( cd ${WORK} ; ${RCVS} export -r${TAG} OpenXM OpenXM_contrib OpenXM_contrib2) ; \
+		( cd ${WORK} ; ${RCVS} export -r${TAG} OpenXM ${OpenXM_contrib_files} OpenXM_contrib2) ; \
 		cp Makefile ${WORK}/Makefile ; \
 	fi
 	@touch ./.fetch_done
@@ -167,7 +175,6 @@ build-ftp-area:
 tar-ball: fetch build-tar-work
 	@if [ ! -f ./.tar-ball_done ]; then \
 		cp Makefile ${WORK}/Makefile ; \
-		(cd ${WORK}/OpenXM/src ; make generate-source-distribution) ; \
 		(cd work ; tar czvf ${TAR_WORK}/openxm-${VERSION}.tar.gz openxm-${VERSION}) ; \
 	fi
 	touch ./.tar-ball_done