Merging r259740:

[oota-llvm.git] / examples / Makefile

diff --git a/examples/Makefile b/examples/Makefile
index 39118f7ed176b079b9be696ecc56f1e60426a79d..50a6db76aa2551a9510e78c1545e9491ebc437cd 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,19 +1,32 @@
 ##===- examples/Makefile -----------------------------------*- Makefile -*-===##
-# 
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 ##===----------------------------------------------------------------------===##
 LEVEL=..
 
 include $(LEVEL)/Makefile.config
 
-PARALLEL_DIRS:= BrainF Fibonacci HowToUseJIT ModuleMaker
+PARALLEL_DIRS:= BrainF Fibonacci HowToUseJIT Kaleidoscope ModuleMaker
 
 ifeq ($(HAVE_PTHREAD),1)
-PARALLEL_DIRS += ParallelJIT 
+PARALLEL_DIRS += ParallelJIT
+endif
+
+ifeq ($(LLVM_ON_UNIX),1)
+    ifeq ($(ARCH),x86)
+       PARALLEL_DIRS += ExceptionDemo
+    endif
+    ifeq ($(ARCH),x86_64)
+       PARALLEL_DIRS += ExceptionDemo
+    endif
+endif
+
+ifeq ($(filter $(BINDINGS_TO_BUILD),ocaml),ocaml)
+       PARALLEL_DIRS += OCaml-Kaleidoscope
 endif
 
 include $(LEVEL)/Makefile.common