===================================================================
RCS file: /home/cvs/OpenXM/src/uuencoded/Makefile,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- OpenXM/src/uuencoded/Makefile	2001/08/21 00:39:13	1.1
+++ OpenXM/src/uuencoded/Makefile	2005/08/30 12:25:02	1.7
@@ -1,4 +1,4 @@
-# $OpenXM$
+# $OpenXM: OpenXM/src/uuencoded/Makefile,v 1.6 2005/08/04 10:05:01 ohara Exp $
 
 OPENXM=../../../OpenXM
 OPENXM_CONTRIB=../../../OpenXM_contrib
@@ -12,43 +12,33 @@ PHCFBSD=fbsd_phcv2p
 PHCLINUX=lin_phcv2p
 RM=rm
 
-configure:
-	@if [ -f .configure_done ] ; then \
-		echo "OpenXM/bin is already configured." ; \
-	else \
-		rm -f $(OPENXM_BIN)/fep $(OPENXM_BIN)/phc ; \
-		if [ "`uname`" = "FreeBSD" ]; then \
-			make configure-freebsd ; \
+install:
+	@if [ ! -f .install_done ] ; then \
+		rm -f $(OPENXM_BIN)/phc ; \
+		if [ "`which gnatmake`" ]; then \
+			(cd ${OPENXM_CONTRIB}/PHC/Objects; ${MAKE} install); \
+		elif [ "`uname`" = "FreeBSD" ]; then \
+			make install-freebsd ; \
+		elif [ "`uname`" = "Linux" ]; then \
+			make install-linux ; \
 		fi ; \
-		if [ "`uname`" = "Linux" ]; then \
-			make configure-linux ; \
-		fi ; \
 		(cd $(OPENXM_BIN) ; rm -f ox_asir ; ln -f -s ./asir ox_asir) ; \
-		touch ./.configure_done ; \
+		touch ./.install_done ; \
 	fi
 
-
-configure-freebsd:
+install-freebsd:
 	if [ -f $(OPENXM_UU)/${PHCFBSD}.gz.uuencoded ]; then \
 		uudecode -p $(OPENXM_UU)/${PHCFBSD}.gz.uuencoded | zcat - > $(OPENXM_BIN)/phc ; \
 		chmod +x $(OPENXM_BIN)/phc ; \
 	fi
-	if [ -f ${FEPFBSD}.gz.uuencoded ]; then \
-		uudecode -p $(OPENXM_UU)/${FEPFBSD}.gz.uuencoded | zcat - > $(OPENXM_BIN)/fep ; \
-		chmod +x $(OPENXM_BIN)/fep ; \
-	fi
 
-configure-linux:
+install-linux:
 	if [ -f $(OPENXM_UU)/${PHCLINUX}.gz.uuencoded ]; then \
 		uudecode -o /dev/stdout $(OPENXM_UU)/${PHCLINUX}.gz.uuencoded | zcat - > $(OPENXM_BIN)/phc ; \
 		chmod +x $(OPENXM_BIN)/phc ; \
 	fi
-	if [ -f $(OPENXM_UU)/${FEPLINUX}.gz.uuencoded ]; then \
-		uudecode -o /dev/stdout $(OPENXM_UU)/${FEPLINUX}.gz.uuencoded | zcat - > $(OPENXM_BIN)/fep ; \
-		chmod +x $(OPENXM_BIN)/fep ; \
-	fi
 
-configure-linux-phc-on-freebsd:
+install-linux-phc-on-freebsd:
 	if [ -f $(OPENXM_UU)/${PHCLINUX}.gz.uuencoded ]; then \
 		uudecode -p $(OPENXM_UU)/${PHCLINUX}.gz.uuencoded | zcat - > $(OPENXM_BIN)/phc ; \
 		chmod +x $(OPENXM_BIN)/phc ; \
@@ -57,20 +47,10 @@ configure-linux-phc-on-freebsd:
 	fi
 
 distclean:
-	(cd $(OPENXM_BIN) ; rm -f asir ox_asir fep phc)
-	@rm -f .configure_done
+	(cd $(OPENXM_BIN) ; rm -f asir ox_asir phc)
+	@rm -f .install_done
 
 uuencode:
-	@if [ -f $(OPENXM_BIN)/$(FEPLINUX) ]; then \
-		echo -n '$Open' > $(OPENXM_UU)/$(FEPLINUX).gz.uuencoded ; \
-		echo -n 'XM$' >> $(OPENXM_UU)/$(FEPLINUX).gz.uuencoded ; \
-		gzip -c $(OPENXM_BIN)/$(FEPLINUX) | uuencode $(FEPLINUX).gz >> $(OPENXM_UU)/$(FEPLINUX).gz.uuencoded ; \
-	fi
-	@if [ -f $(OPENXM_BIN)/$(FEPFBSD) ]; then \
-		echo -n '$Open' > $(OPENXM_UU)/$(FEPFBSD).gz.uuencoded ; \
-		echo -n 'XM$' >> $(OPENXM_UU)/$(FEPFBSD).gz.uuencoded ; \
-		gzip -c $(OPENXM_BIN)/$(FEPFBSD) | uuencode $(FEPFBSD).gz >> $(OPENXM_UU)/$(FEPFBSD).gz.uuencoded ; \
-	fi
 	@if [ -f $(OPENXM_BIN)/$(PHC) ]; then \
 		echo -n '$Open' > $(OPENXM_UU)/$(PHC).gz.uuencoded ; \
 		echo -n 'XM$' >> $(OPENXM_UU)/$(PHC).gz.uuencoded ; \