Updated basic components of the repository, dependency paths, Makefile, gitignore.

Author: numbleroot

.gitignore

@@ -19,3 +19,6 @@ project/plugins/project/
 # IntelliJ-specific
 .idea
 *.iml
+
+# Project-specific
+output/

.gitmodules

@@ -1,6 +1,7 @@
-[submodule "rewrite/lib/c4"]
-    path = lib/c4
-    url = https://github.com/bloom-lang/c4/
-[submodule "rewrite/lib/z3"]
-    path = lib/z3
-    url = https://git.codeplex.com/z3
+[submodule "lib/c4"]
+	path = lib/c4
+    url = https://github.com/bloom-lang/c4
+    ignore = dirty
+[submodule "lib/z3"]
+	path = lib/z3
+	url = https://github.com/Z3Prover/z3

Makefile

@@ -1,15 +1,24 @@
 all: deps
 
+clean-deps:
+	rm -rf lib/c4/build
+	rm -rf lib/z3/build
+
 deps: get-submodules c4 z3
 
-clean-deps:
-	rm -r lib/c4/build
-	rm -r lib/z3/build
+get-submodules:
+	git submodule update --init --recursive
 
 c4: lib/c4/build/src/libc4/libc4.dylib
 
 z3: lib/z3/build/z3-dist
 
+lib/c4/build/src/libc4/libc4.dylib:
+	@which cmake > /dev/null
+	cd lib/c4 && mkdir -p build
+	cd lib/c4/build && cmake ..
+	cd lib/c4/build && make
+
 lib/z3/build/z3-dist: lib/z3/build/libz3.dylib
 	# We need to make these parent directories so that Z3's Makefile
 	# doesn't complain about them missing when it copies files during
@@ -22,19 +31,7 @@ lib/z3/build/libz3.dylib:
 	cd lib/z3 && python scripts/mk_make.py --prefix=z3-dist
 	cd lib/z3/build && make -j4
 
-lib/c4/build/src/libc4/libc4.dylib:
-	@which cmake > /dev/null
-	cd lib/c4 && mkdir -p build
-	cd lib/c4/build && cmake ..
-	cd lib/c4/build && make
-
-get-submodules:
-	git submodule init
-	git submodule update
-
-CMAKE-installed:
-
 # SBT command for running only the fast unit tests and excluding the slower
 # end-to-end tests (which have been tagged using ScalaTest's `Slow` tag):
-fast-test: deps
+fast-test:
 	sbt "testOnly *Suite -- -l org.scalatest.tags.Slow"