Merge branch 'Iced_cake' of github.com:CakeML/cakeml into Iced_cake

Author: HeikoBecker

icing/Holmakefile

@@ -9,9 +9,7 @@ INCLUDES = $(HOLDIR)/examples/formal-languages/context-free\
 all: $(DEFAULT_TARGETS) README.md
 .PHONY: all
 
-README_SOURCES = $(wildcard *Script.sml) $(wildcard *Lib.sml) $(wildcard *Syntax.sml)
-DIRS = $(patsubst bootstrap/,,$(patsubst encoders/,,$(wildcard */)))
 README_SOURCES = $(wildcard *Script.sml) $(wildcard *Lib.sml) $(wildcard *Syntax.sml)
 DIRS = $(wildcard */)
 README.md: $(CAKEMLDIR)/developers/readme_gen readmePrefix $(patsubst %,%readmePrefix,$(DIRS)) $(README_SOURCES)
-   	(CAKEMLDIR)/developers/readme_gen $(README_SOURCES)
+	$(CAKEMLDIR)/developers/readme_gen $(README_SOURCES)

icing/examples/Holmakefile

@@ -4,21 +4,19 @@ INCLUDES = $(HOLDIR)/examples/formal-languages/context-free\
 	   $(CAKEMLDIR)/semantics $(CAKEMLDIR)/characteristic\
 	   $(CAKEMLDIR)/compiler $(CAKEMLDIR)/compiler/inference\
 	   $(CAKEMLDIR)/compiler/backend/semantics\
-  	 $(CAKEMLDIR)/icing $(CAKEMLDIR)/icing/flover
+           $(CAKEMLDIR)/icing $(CAKEMLDIR)/icing/flover
 
-all: README.md dirs dopplerProgCompTheory
+all: $(DEFAULT_TARGETS) README.md dirs dopplerProgCompTheory
 .PHONY: all
 
 dirs:
 	mkdir -p output/1 output/2 output/3 output/4 output/6 output/8 output/9
 .PHONY: dirs
 
-README_SOURCES = $(wildcard *Script.sml) $(wildcard *Lib.sml) $(wildcard *Syntax.sml)
-DIRS = $(patsubst bootstrap/,,$(patsubst encoders/,,$(wildcard */)))
 README_SOURCES = $(wildcard *Script.sml) $(wildcard *Lib.sml) $(wildcard *Syntax.sml)
 DIRS = $(wildcard */)
 README.md: $(CAKEMLDIR)/developers/readme_gen readmePrefix $(patsubst %,%readmePrefix,$(DIRS)) $(README_SOURCES)
-   	$(CAKEMLDIR)/developers/readme_gen $(README_SOURCES)
+	$(CAKEMLDIR)/developers/readme_gen $(README_SOURCES)
 
 PROGTARGETS = $(patsubst %Script.sml, %Theory.uo, $(wildcard *ProgCompScript.sml))
 progs: $(PROGTARGETS)

icing/flover/Holmakefile

@@ -1,7 +1,9 @@
 INCLUDES = Infra semantics
 OPTIONS = QUIT_ON_FAILURE
 
+all: $(DEFAULT_TARGETS) README.md
+
 README_SOURCES = $(wildcard *Script.sml) $(wildcard *Lib.sml) $(wildcard *Syntax.sml)
- DIRS = $(wildcard */)
- README.md: $(CAKEMLDIR)/developers/readme_gen readmePrefix $(patsubst %,%readmePrefix,$(DIRS)) $(README_SOURCES)
- 	$(CAKEMLDIR)/developers/readme_gen $(README_SOURCES)
+DIRS = $(wildcard */)
+README.md: $(CAKEMLDIR)/developers/readme_gen readmePrefix $(patsubst %,%readmePrefix,$(DIRS)) $(README_SOURCES)
+	$(CAKEMLDIR)/developers/readme_gen $(README_SOURCES)