Makefile: ulib-in-fsharp does not need ulib-extra

Makefile

@@ -194,7 +194,7 @@ ci-ulib-extra:
 	+$(Q)$(MAKE) -C ulib extra
 
 .PHONY: ci-ulib-in-fsharp
-ci-ulib-in-fsharp: ci-ulib-extra
+ci-ulib-in-fsharp:
 	+$(Q)$(MAKE) -C ulib ulib-in-fsharp
 
 .PHONY: ci-post

ulib/Makefile

@@ -31,7 +31,7 @@ include $(FSTAR_HOME)/.common.mk
 ulib-in-fsharp: ulib-in-fsharp-dll
 	+$(MAKE) -f Makefile.extract.fsharp nuget
 
-ulib-in-fsharp-dll: all
+ulib-in-fsharp-dll: core
 	+$(MAKE) -f Makefile.extract.fsharp dll
 
 .PHONY: ulib-in-fsharp-dll

ulib/Makefile.extract.fsharp

@@ -14,22 +14,24 @@ ifndef FSTAR_HOME
   export FSTAR_HOME
 endif
 FSTAR_ULIB=$(shell if test -d $(FSTAR_HOME)/ulib ; then echo $(FSTAR_HOME)/ulib ; else echo $(FSTAR_HOME)/lib/fstar ; fi)
+include $(FSTAR_ULIB)/ml/Makefile.realized
 include $(FSTAR_ULIB)/gmake/z3.mk
 include $(FSTAR_ULIB)/gmake/fstar.mk
 
 FSTAR_FILES:=$(wildcard *.fst *.fsti) \
 	     $(wildcard experimental/*fst experimental/*fsti)
+EXTRACT_MODULES=--extract '* $(NOEXTRACT_MODULES)'
 
 OUTPUT_DIRECTORY=fs/extracted
 
 CODEGEN ?= FSharp
 
-MY_FSTAR=$(FSTAR) $(OTHERFLAGS) --already_cached '*,' --warn_error @241 --cache_checked_modules --odir $(OUTPUT_DIRECTORY) --cache_dir .cache
+MY_FSTAR=$(FSTAR) $(OTHERFLAGS) --warn_error @241 --cache_checked_modules --odir $(OUTPUT_DIRECTORY) --cache_dir .cache
 
 # And then, in a separate invocation, from each .checked file we
 # extract an .fs file
 $(OUTPUT_DIRECTORY)/%.fs:
-	$(MY_FSTAR) $(subst .checked,,$(notdir $<)) --codegen $(CODEGEN) --extract_module $(basename $(notdir $(subst .checked,,$<)))
+	$(MY_FSTAR) --already_cached '*' $(subst .checked,,$(notdir $<)) --codegen $(CODEGEN) --extract_module $(basename $(notdir $(subst .checked,,$<)))
 
 .depend.extract.fsharp:
 	$(call msg, "DEPEND")