Remove clang and llvm submodules

The viewer can now be built against released (and packaged) LLVM/Clang
versions so the custom versions are not needed anymore.

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index 205185a..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "llvm"]
-       path = llvm
-       url = http://llvm.org/git/llvm.git
-[submodule "clang"]
-       path = clang
-       url = http://llvm.org/git/clang.git

diff --git a/Makefile b/Makefile
index 6ad68ffe69cfe72f0ed88e548afaa1a49fb9780c..4aade4d4b1f14fb2d4b2a438f471c4efb18eaeb3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,8 @@
--include config.local
+all: src examples
 
-ifneq ($(wildcard llvm/_build),)
-# Use our version of clang (even without installing)
-LLVM_BIN= $(CURDIR)/_install/bin
+.PHONY: src examples
 
-LLVM_CONFIG := $(LLVM_BIN)/llvm-config
-
-export LLVM_CONFIG
-compile_llvm_target = _install/lib/libclang.so
-else
-compile_llvm_target = skip_llvm
-endif
-
-all: llvm src examples
-
-.PHONY: llvm src examples skip_llvm
-
-llvm: $(compile_llvm_target)
-
-_install/lib/libclang.so:
-       $(MAKE) -C llvm/_build install
-
-skip_llvm:
-       @echo "LLVM compilation skipped"
-
-src: llvm
+src:
        $(MAKE) -C src
 
 examples: src

diff --git a/clang b/clang
deleted file mode 160000 (submodule)
index b6e6be2..0000000
--- a/clang
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b6e6be2176ceada1b87602d6525cdf19d7be1d4f

diff --git a/llvm b/llvm
deleted file mode 160000 (submodule)
index c2b768f..0000000
--- a/llvm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c2b768f09e108b71348af58f3ab31d0fc6d15dd6