get dependencies from the dependencies repo

5 files changed, 7 insertions, 13 deletions

diff --git a/.gitmodules b/.gitmodules
index e7c98f15..8c234166 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "external/googletest"]
 	path = external/googletest
 	url = https://github.com/google/googletest
+[submodule "opendc-simulator-dependencies"]
+	path = opendc-simulator-dependencies
+	url = https://github.com/tudelft-atlarge/opendc-simulator-dependencies.git
diff --git a/Simulator/makefile b/Simulator/makefile
index 52386dab..7bcf4848 100644
--- a/Simulator/makefile
+++ b/Simulator/makefile
@@ -18,21 +18,12 @@ src/modeling/Rack.cpp
 all: sqlite simulator
 
 clean:
-	rm -rf simulator external/
+	rm -f simulator sqlite3.o
 
 simulator:
-	$(CXX) -o simulator -Iexternal $(SOURCE) $(CFLAGS)
+	$(CXX) -o simulator $(SOURCE) $(CFLAGS)
 
-sqlite:
-	cd ../external/sqlite ; \
-	git rev-parse --git-dir >/dev/null || exit 1 ; \
-	git log -1 --format=format:%ci%n | sed -e 's/ [-+].*$//;s/ /T/;s/^/D /' > manifest ; \
-	echo $(git log -1 --format=format:%H) > manifest.uuid
-	mkdir external
-	cd external ; \
-	./../../external/sqlite/configure --disable-tcl ; \
-	make sqlite3.o
-	mv external/sqlite3.o sqlite3.o
-	rm -rf external/
+sqlite: 
+	$(CC) -o sqlite3.o -c ../opendc-simulator-dependencies/sqlite/sqlite3.c
 
 .PHONY: all, clean
\ No newline at end of file
diff --git a/external/googletest b/external/googletest
deleted file mode 160000
-Subproject 9ae086a9ebafabdc49b71bb7f3879f551adee09
diff --git a/external/sqlite b/external/sqlite
deleted file mode 160000
-Subproject 34d46d5de472e17ac1673f9b8449d674aa2406d
diff --git a/opendc-simulator-dependencies b/opendc-simulator-dependencies
new file mode 160000
+Subproject b5466ecde7da8977b00e2b541c6d55bef9b0a7b