From e538c727c648653412ced9f79b45edda91ab89b1 Mon Sep 17 00:00:00 2001 From: Sacheendra Talluri Date: Wed, 25 Jan 2017 12:31:42 +0100 Subject: get dependencies from the dependencies repo --- .gitmodules | 3 +++ Simulator/makefile | 17 ++++------------- external/googletest | 1 - external/sqlite | 1 - opendc-simulator-dependencies | 1 + 5 files changed, 8 insertions(+), 15 deletions(-) delete mode 160000 external/googletest delete mode 160000 external/sqlite create mode 160000 opendc-simulator-dependencies 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 index 9ae086a9..00000000 --- a/external/googletest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9ae086a9ebafabdc49b71bb7f3879f551adee09a diff --git a/external/sqlite b/external/sqlite deleted file mode 160000 index 34d46d5d..00000000 --- a/external/sqlite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 34d46d5de472e17ac1673f9b8449d674aa2406d5 diff --git a/opendc-simulator-dependencies b/opendc-simulator-dependencies new file mode 160000 index 00000000..b5466ecd --- /dev/null +++ b/opendc-simulator-dependencies @@ -0,0 +1 @@ +Subproject commit b5466ecde7da8977b00e2b541c6d55bef9b0a7bd -- cgit v1.2.3