refactor(src): move yices into vendor subdir

Signed-off-by: Austin Seipp <[email protected]>

Author: thoughtpolice

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/yices/v2.6/yices2"]
-	path = src/yices/v2.6/yices2
+[submodule "src/vendor/yices/v2.6/yices2"]
+	path = src/vendor/yices/v2.6/yices2
 	url = https://github.com/SRI-CSL/yices2

src/Makefile

@@ -8,9 +8,9 @@ all: install
 
 .PHONY: install clean full_clean
 install clean full_clean:
-	$(MAKE)  -C stp         PREFIX=$(PREFIX)  $@
-	$(MAKE)  -C yices       PREFIX=$(PREFIX)  $@
-	$(MAKE)  -C vendor/htcl PREFIX=$(PREFIX)  $@
+	$(MAKE)  -C stp          PREFIX=$(PREFIX)  $@
+	$(MAKE)  -C vendor/yices PREFIX=$(PREFIX)  $@
+	$(MAKE)  -C vendor/htcl  PREFIX=$(PREFIX)  $@
 	# we need to build targets from here sequentially, as they operate in the same workspace
 	$(MAKE)  -C comp -j1   PREFIX=$(PREFIX)  $@
 	$(MAKE)  -C Libraries  PREFIX=$(PREFIX)  $@

src/comp/Makefile

@@ -62,8 +62,8 @@ STP_ARGS = -I../stp/include -L../stp/lib
 STP_LIBS = -lstp
 
 # Yices
-YICES_HS      = ../yices/include_hs
-YICES_ARGS = -I../yices/include -L../yices/lib
+YICES_HS      = ../vendor/yices/include_hs
+YICES_ARGS = -I../vendor/yices/include -L../vendor/yices/lib
 YICES_LIBS = -lyices
 
 # Libs which are only needed to build bsc/bluetcl

src/yices/.gitignore renamed to src/vendor/yices/.gitignore

@@ -1,4 +1,4 @@
-TOP:=../..
+TOP:=../../..
 
 PREFIX?=$(TOP)/inst