Imported Upstream version 9.5.0upstream/9.5.0upstream

1 files changed, 20 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index 0fc9ce7..5e2ffd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
-#  Makefile for Version 9.4 of Icon
+#  Makefile for Version 9.5 of Icon
 #
 #  See doc/install.htm for instructions.
 
 
 #  configuration parameters
-VERSION=v943
+VERSION=v950
 name=unspecified
-csw=custom
 dest=/must/specify/dest/
 
 
@@ -39,11 +38,11 @@ config/$(name)/status src/h/define.h:
 
 Configure:	config/$(name)/status
 		$(MAKE) Pure >/dev/null
-		cd config; sh setup.sh $(name) NoGraphics $(csw)
+		cd config; sh setup.sh $(name) NoGraphics
 
 X-Configure:	config/$(name)/status
 		$(MAKE) Pure >/dev/null
-		cd config; sh setup.sh $(name) Graphics $(csw)
+		cd config; sh setup.sh $(name) Graphics
 
 
 # Get the status information for a specific system.
@@ -59,24 +58,13 @@ Status:
 
 # The interpreter: icont and iconx.
 
-Icont bin/icont: Common
-		cd src/icont;		$(MAKE)
-		cd src/runtime;		$(MAKE) 
-
-
-# The compiler: rtt, the run-time system, and iconc.
-# (NO LONGER SUPPORTED OR MAINTAINED.)
-
-Iconc bin/iconc: Common
-		cd src/runtime;		$(MAKE) comp_all
-		cd src/iconc;		$(MAKE)
-
-
-# Common components.
-
-Common:		src/h/define.h
+Icont bin/icont: src/h/define.h
+		uname -a
+		pwd
 		cd src/common;		$(MAKE)
 		cd src/rtt;		$(MAKE)
+		cd src/icont;		$(MAKE)
+		cd src/runtime;		$(MAKE) 
 
 
 # The Icon program library.
@@ -111,11 +99,11 @@ Install:
 
 # Bundle up for binary distribution.
 
-DIR=icon.$(VERSION)
+DIR=icon-$(VERSION)
 Package:
 		rm -rf $(DIR)
 		umask 002; $(MAKE) Install dest=$(DIR)
-		tar cf - icon.$(VERSION) | gzip -9 >icon.$(VERSION).tgz
+		tar cf - $(DIR) | gzip -9 >$(DIR).tgz
 		rm -rf $(DIR)
 
 
@@ -126,23 +114,17 @@ Package:
 Test    Test-icont:	; cd tests; $(MAKE) Test
 Samples Samples-icont:	; cd tests; $(MAKE) Samples
 
-Test-iconc:		; cd tests; $(MAKE) Test-iconc
-Samples-iconc:		; cd tests; $(MAKE) Samples-iconc
-
 
 #################################################################
 #
 # Run benchmarks.
 
-Benchmark:
-		$(MAKE) Benchmark-icont
-
-Benchmark-iconc:
-		cd tests/bench;		$(MAKE) benchmark-iconc
-
-Benchmark-icont:
+Benchmark Benchmark-icont:
 		cd tests/bench;		$(MAKE) benchmark-icont
 
+Micro Microbench Microbenchmark:
+		cd tests/bench;		$(MAKE) microbenchmark
+
 
 ##################################################################
 #
@@ -153,14 +135,14 @@ Benchmark-icont:
 
 Clean:
 		touch Makedefs
-		rm -rf icon.*
+		rm -rf icon-*
 		cd src;			$(MAKE) Clean
 		cd ipl;			$(MAKE) Clean
 		cd tests;		$(MAKE) Clean
 
 Pure:
 		touch Makedefs
-		rm -rf icon.*
+		rm -rf icon-*
 		rm -rf bin/[abcdefghijklmnopqrstuvwxyz]*
 		rm -rf lib/[abcdefghijklmnopqrstuvwxyz]*
 		cd ipl;			$(MAKE) Pure
@@ -175,3 +157,6 @@ Pure:
 Dist-Clean:
 		rm -rf xx `find * -type d -name CVS`
 		rm -f  xx `find * -type f | xargs grep -l '<<ARIZONA-[O]NLY>>'`
+		rm -f  xx `find . -type f -name '.??*' ! -name .placeholder`
+		find . -type d | xargs chmod u=rwx,g=rwsx,o=rx
+		find . -type f | xargs chmod ug=rw+X,o=r+X