Removed Trillium/Fairis and added Trillium as submodule (#37)

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "actris"]
 	path = external/actris
 	url = https://gitlab.mpi-sws.org/iris/actris.git
+[submodule "external/trillium"]
+	path = external/trillium
+	url = [email protected]:logsem/trillium.git

Makefile

@@ -1,7 +1,5 @@
-TRILLIUM_DIR := 'trillium'
 ANERIS_DIR := 'aneris'
-FAIRNESS_DIR := 'fairness'
-LOCAL_SRC_DIRS := $(TRILLIUM_DIR) $(ANERIS_DIR) $(FAIRNESS_DIR)
+LOCAL_SRC_DIRS := $(ANERIS_DIR)
 SRC_DIRS := $(LOCAL_SRC_DIRS) 'external'
 
 ALL_VFILES := $(shell find $(SRC_DIRS) -name "*.v")
@@ -44,19 +42,13 @@ clean:
 	rm -f .coqdeps.d
 
 # project-specific targets
-.PHONY: build clean-trillium clean-fairness clean-aneris trillium fairness aneris
+.PHONY: build clean-aneris aneris
 
-VPATH= $(TRILLIUM_DIR) $(ANERIS_DIR) $(FAIRNESS_DIR)
+VPATH= $(ANERIS_DIR)
 VPATH_FILES := $(shell find $(VPATH) -name "*.v")
 
 build: $(VPATH_FILES:.v=.vo)
 
-fairness :
-	@$(MAKE) build VPATH=$(FAIRNESS_DIR)
-
-trillium :
-	@$(MAKE) build VPATH=$(TRILLIUM_DIR)
-
 aneris :
 	@$(MAKE) build VPATH=$(ANERIS_DIR)
 
@@ -65,11 +57,5 @@ clean-local:
 	$(Q)find $(LOCAL_SRC_DIRS) \( -name "*.vo" -o -name "*.vo[sk]" \
 		-o -name ".*.aux" -o -name ".*.cache" -o -name "*.glob" \) -delete
 
-clean-trillium:
-	@$(MAKE) clean-local LOCAL_SRC_DIRS=$(TRILLIUM_DIR)
-
 clean-aneris:
 	@$(MAKE) clean-local LOCAL_SRC_DIRS=$(ANERIS_DIR)
-
-clean-fairness:
-	@$(MAKE) clean-local LOCAL_SRC_DIRS=$(FAIRNESS_DIR)

_CoqProject

@@ -1,17 +1,17 @@
--Q trillium trillium
 -Q aneris aneris
--Q fairness trillium.fairness
 
 -Q external/stdpp/stdpp stdpp
 -Q external/stdpp/stdpp_unstable stdpp.unstable
 -Q external/iris/iris iris
+-Q external/trillium/trillium trillium
 -Q external/record-update/src RecordUpdate
 -Q external/paco/src Paco
 -Q external/actris/theories actris
 
 -Q external/iris/iris_deprecated iris.deprecated
 -Q external/iris/iris_unstable iris.unstable
 -Q external/iris/iris_heap_lang iris.heap_lang
+-Q external/trillium/fairis trillium.fairness
 
 -arg -w -arg -notation-overridden
 -arg -w -arg -redundant-canonical-projection