diff --git a/MultiSource/Applications/ALAC/CMakeLists.txt b/MultiSource/Applications/ALAC/CMakeLists.txt
index b79a0a0..a4c603a 100644
--- a/MultiSource/Applications/ALAC/CMakeLists.txt
+++ b/MultiSource/Applications/ALAC/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS encode decode)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/ALAC/decode/CMakeLists.txt b/MultiSource/Applications/ALAC/decode/CMakeLists.txt
index 448a9ce..18680fc 100644
--- a/MultiSource/Applications/ALAC/decode/CMakeLists.txt
+++ b/MultiSource/Applications/ALAC/decode/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 if("${ENDIAN}" STREQUAL "little")
   list(APPEND CFLAGS -DTARGET_RT_LITTLE_ENDIAN=1)
   list(APPEND CXXFLAGS -DTARGET_RT_LITTLE_ENDIAN=1)
@@ -14,5 +11,3 @@
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune.caf)
 set(RUN_OPTIONS - -)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/ALAC/encode/CMakeLists.txt b/MultiSource/Applications/ALAC/encode/CMakeLists.txt
index 7e00668..55a94df 100644
--- a/MultiSource/Applications/ALAC/encode/CMakeLists.txt
+++ b/MultiSource/Applications/ALAC/encode/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 if("${ENDIAN}" STREQUAL "little")
   list(APPEND CFLAGS -DTARGET_RT_LITTLE_ENDIAN=1)
   list(APPEND CXXFLAGS -DTARGET_RT_LITTLE_ENDIAN=1)
@@ -14,5 +11,3 @@
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune.wav)
 set(RUN_OPTIONS - -)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/Burg/CMakeLists.txt b/MultiSource/Applications/Burg/CMakeLists.txt
index 93e0d03..b56bf0c 100644
--- a/MultiSource/Applications/Burg/CMakeLists.txt
+++ b/MultiSource/Applications/Burg/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG burg)
 set(CPPFLAGS -DDEBUG)
 list(APPEND CFLAGS -std=gnu89)
@@ -13,5 +10,3 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_yacc_parser(burg_parser gram.y ${CMAKE_CURRENT_BINARY_DIR}/y.tab.c ${CMAKE_CURRENT_BINARY_DIR}/y.tab.h)
     llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/CMakeLists.txt b/MultiSource/Applications/CMakeLists.txt
index 0ec3668..66ca82d 100644
--- a/MultiSource/Applications/CMakeLists.txt
+++ b/MultiSource/Applications/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS Burg aha sgefa siod d spiff treecc SPASS oggenc JM viterbi SIBsim4 ClamAV sqlite3 lemon)
@@ -45,4 +44,4 @@
   set(PARALLEL_DIRS ${TMP10})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/ClamAV/CMakeLists.txt b/MultiSource/Applications/ClamAV/CMakeLists.txt
index 52877c2..33dbdbb 100644
--- a/MultiSource/Applications/ClamAV/CMakeLists.txt
+++ b/MultiSource/Applications/ClamAV/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(TMP1  aspack.c autoit.c binhex.c blob.c cab.c chmunpack.c cvd.c dconf.c dsig.c elf.c entconv.c filetypes.c fsg.c hashtab.c htmlnorm.c is_tar.c jscript.c line.c lockdb.c matcher-ac.c matcher-bm.c matcher.c mbox.c md5.c message.c mew.c msexpand.c mspack.c ole2_extract.c others.c packlibs.c pdf.c pe.c petite.c phishcheck.c phish_domaincheck_db.c phish_whitelist.c pst.c readdb.c rebuildpe.c regex_list.c rtf.c scanners.c sis.c snprintf.c special.c spin.c str.c suecrypt.c table.c text.c tnef.c unarj.c unsp.c untar.c unzip.c upack.c upx.c uuencode.c vba_extract.c wwunpack.c yc.c)
 llvm_prepend(TMP1 libclamav_ ${TMP1})
 set(TMP2  clamscan.c manager.c others.c treewalk.c)
@@ -78,5 +75,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/JM/CMakeLists.txt b/MultiSource/Applications/JM/CMakeLists.txt
index 3dd8f1f..3f593c1 100644
--- a/MultiSource/Applications/JM/CMakeLists.txt
+++ b/MultiSource/Applications/JM/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS ldecod lencod)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/JM/ldecod/CMakeLists.txt b/MultiSource/Applications/JM/ldecod/CMakeLists.txt
index cdb8a07..30462ae 100644
--- a/MultiSource/Applications/JM/ldecod/CMakeLists.txt
+++ b/MultiSource/Applications/JM/ldecod/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ldecod)
 set(CPPFLAGS -D __USE_LARGEFILE64 -D _FILE_OFFSET_BITS=64)
 set(LDFLAGS -lm ${TOOLLINKOPTS})
@@ -9,5 +6,3 @@
   set(XCORE_TARGET_NEEDS_MEMORY 64)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/JM/lencod/CMakeLists.txt b/MultiSource/Applications/JM/lencod/CMakeLists.txt
index bb091f9..8be9c28 100644
--- a/MultiSource/Applications/JM/lencod/CMakeLists.txt
+++ b/MultiSource/Applications/JM/lencod/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG lencod)
 set(CPPFLAGS -D __USE_LARGEFILE64 -D _FILE_OFFSET_BITS=64)
 set(LDFLAGS -lm ${TOOLLINKOPTS})
@@ -11,5 +8,3 @@
   set(RUN_OPTIONS -d ${CMAKE_CURRENT_SOURCE_DIR}/data/encoder.cfg -p InputFile=${CMAKE_CURRENT_SOURCE_DIR}/data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=${CMAKE_CURRENT_SOURCE_DIR}/data/leakybucketrate.cfg -p QmatrixFile=${CMAKE_CURRENT_SOURCE_DIR}/data/q_matrix.cfg)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/SIBsim4/CMakeLists.txt b/MultiSource/Applications/SIBsim4/CMakeLists.txt
index 5ee498e..1b3e7d6 100644
--- a/MultiSource/Applications/SIBsim4/CMakeLists.txt
+++ b/MultiSource/Applications/SIBsim4/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG SIBsim4)
 set(CPPFLAGS )
 set(LDFLAGS )
@@ -10,5 +7,3 @@
   set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x.fa ${CMAKE_CURRENT_SOURCE_DIR}/y.fa)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/SPASS/CMakeLists.txt b/MultiSource/Applications/SPASS/CMakeLists.txt
index 54470c5..63ced46 100644
--- a/MultiSource/Applications/SPASS/CMakeLists.txt
+++ b/MultiSource/Applications/SPASS/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG SPASS)
 set(CPPFLAGS -DCLOCK_NO_TIMING -fno-strict-aliasing -w)
 set(LDFLAGS -lm)
@@ -11,5 +8,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/aha/CMakeLists.txt b/MultiSource/Applications/aha/CMakeLists.txt
index 25de27f..18ae093 100644
--- a/MultiSource/Applications/aha/CMakeLists.txt
+++ b/MultiSource/Applications/aha/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG aha)
 set(CPPFLAGS )
 set(LDFLAGS )
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/d/CMakeLists.txt b/MultiSource/Applications/d/CMakeLists.txt
index 81b2ef7..1a3c398 100644
--- a/MultiSource/Applications/d/CMakeLists.txt
+++ b/MultiSource/Applications/d/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG make_dparser)
 set(Source make_dparser.c write_ctables.c gram.c lex.c lr.c arg.c parse.c scan.c symtab.c util.c version.c grammar.g.c)
 set(CPPFLAGS -DD_BUILD_VERSION=5725)
 set(RUN_OPTIONS -v ${CMAKE_CURRENT_SOURCE_DIR}/grammar.g)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/hbd/CMakeLists.txt b/MultiSource/Applications/hbd/CMakeLists.txt
index de34450..d6889bc 100644
--- a/MultiSource/Applications/hbd/CMakeLists.txt
+++ b/MultiSource/Applications/hbd/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG hbd)
 list(APPEND CPPFLAGS -DHAVE_CONFIG_H)
 list(APPEND LDFLAGS -lstdc++)
@@ -8,5 +5,3 @@
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/Sort.class)
 set(REQUIRES_EH_SUPPORT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/hexxagon/CMakeLists.txt b/MultiSource/Applications/hexxagon/CMakeLists.txt
index 1199f75..f4f8382 100644
--- a/MultiSource/Applications/hexxagon/CMakeLists.txt
+++ b/MultiSource/Applications/hexxagon/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG hexxagon)
 set(REQUIRES_EH_SUPPORT 1)
 list(APPEND LDFLAGS -lstdc++)
 list(APPEND LIBS -lstdc++)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/kimwitu++/CMakeLists.txt b/MultiSource/Applications/kimwitu++/CMakeLists.txt
index 38bb924..60e56a5 100644
--- a/MultiSource/Applications/kimwitu++/CMakeLists.txt
+++ b/MultiSource/Applications/kimwitu++/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG kc)
 set(CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DYYDEBUG=1)
 set(LDFLAGS -lstdc++)
@@ -8,5 +5,3 @@
 set(RUN_OPTIONS -f test  -o -v -s kcc ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f3.k ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f2.k ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f1.k)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/kimwitu++/doc/CMakeLists.txt b/MultiSource/Applications/kimwitu++/doc/CMakeLists.txt
index 7d1ca51..9b24dd7 100644
--- a/MultiSource/Applications/kimwitu++/doc/CMakeLists.txt
+++ b/MultiSource/Applications/kimwitu++/doc/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(XMLs kpp-main.xml kpp-intro.xml kpp-manual.xml kpp-cook.xml kpp-rpn.xml)
 set(FIGs syntaxtreex.fig simplify.fig fprintdot.fig)
 set(FIGDIR figures)
@@ -28,5 +25,3 @@
 set(TMP9 ${PNGs})
 llvm_prepend(TMP9 ${IMGDIR}/ ${TMP9})
 set(PNGs ${TMP9})
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt b/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
index 26cce6e..07eaae1 100644
--- a/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
+++ b/MultiSource/Applications/lambda-0.1.3/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG lambda)
 list(APPEND LDFLAGS -lstdc++)
 list(APPEND LIBS -lstdc++)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/lemon/CMakeLists.txt b/MultiSource/Applications/lemon/CMakeLists.txt
index cac1547..8aee65f 100644
--- a/MultiSource/Applications/lemon/CMakeLists.txt
+++ b/MultiSource/Applications/lemon/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(Source lemon.c)
 set(PROG lemon)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/parse.y ${CMAKE_CURRENT_SOURCE_DIR}/example1.y ${CMAKE_CURRENT_SOURCE_DIR}/example2.y ${CMAKE_CURRENT_SOURCE_DIR}/example3.y ${CMAKE_CURRENT_SOURCE_DIR}/example4.y ${CMAKE_CURRENT_SOURCE_DIR}/example5.y ${CMAKE_CURRENT_SOURCE_DIR}/lighttpd_configparser.y ${CMAKE_CURRENT_SOURCE_DIR}/lighttpd_mod_ssi_exprparser.y ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_dtd_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_mate_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/xapian_queryparser.lemony ${CMAKE_CURRENT_SOURCE_DIR}/ecmascript.y)
@@ -8,5 +5,3 @@
 set(RUNTIMELIMIT 1500)
 set(DIFFPROG ${PROGDIR}/DiffOutput.sh "diff ")
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/lua/CMakeLists.txt b/MultiSource/Applications/lua/CMakeLists.txt
index 3948d97..6822dcb 100644
--- a/MultiSource/Applications/lua/CMakeLists.txt
+++ b/MultiSource/Applications/lua/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(Source lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c loslib.c ltablib.c lstrlib.c loadlib.c linit.c lua.c)
 list(APPEND LDFLAGS -lm)
 if("${ARCH}" STREQUAL "XCore")
@@ -25,4 +22,3 @@
 add_custom_target(lua_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/generate_inputs.sh)
     llvm_multisource()
 add_dependencies(lua lua_input)
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/minisat/CMakeLists.txt b/MultiSource/Applications/minisat/CMakeLists.txt
index 9a51343..6fae071 100644
--- a/MultiSource/Applications/minisat/CMakeLists.txt
+++ b/MultiSource/Applications/minisat/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG minisat)
 set(CPPFLAGS -D NDEBUG)
 set(LDFLAGS -lstdc++ -lm)
@@ -22,5 +19,3 @@
 endif()
 list(APPEND JIT_OPTS -load libz${SHLIBEXT})
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/obsequi/CMakeLists.txt b/MultiSource/Applications/obsequi/CMakeLists.txt
index ad66bd3..b625e77 100644
--- a/MultiSource/Applications/obsequi/CMakeLists.txt
+++ b/MultiSource/Applications/obsequi/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Obsequi)
 list(APPEND CPPFLAGS -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE)
 list(APPEND CPPFLAGS -DTWO_STAGE_GENERATION)
@@ -15,5 +12,3 @@
 endif()
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/oggenc/CMakeLists.txt b/MultiSource/Applications/oggenc/CMakeLists.txt
index aeadb64..ca9d2c0 100644
--- a/MultiSource/Applications/oggenc/CMakeLists.txt
+++ b/MultiSource/Applications/oggenc/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG oggenc)
 set(CPPFLAGS -fno-strict-aliasing)
 set(LDFLAGS -lm)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/tune)
 set(RUN_OPTIONS "-Q -s 901820 -")
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/sgefa/CMakeLists.txt b/MultiSource/Applications/sgefa/CMakeLists.txt
index 6082fda..b37a02e 100644
--- a/MultiSource/Applications/sgefa/CMakeLists.txt
+++ b/MultiSource/Applications/sgefa/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG sgefa)
 set(LDFLAGS -lm)
 set(FP_TOLERANCE 0.0001)
@@ -10,5 +7,3 @@
   set(CPPFLAGS -DSCALE=40)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/siod/CMakeLists.txt b/MultiSource/Applications/siod/CMakeLists.txt
index 6e412fa..16cd262 100644
--- a/MultiSource/Applications/siod/CMakeLists.txt
+++ b/MultiSource/Applications/siod/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG siod)
 set(CPPFLAGS -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix)
 set(LDFLAGS -lm ${TOOLLINKOPTS})
 set(RUN_OPTIONS -v1 ${CMAKE_CURRENT_SOURCE_DIR}/test.scm)
 set(USE_REFERENCE_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/spiff/CMakeLists.txt b/MultiSource/Applications/spiff/CMakeLists.txt
index d196f67..46ccc26 100644
--- a/MultiSource/Applications/spiff/CMakeLists.txt
+++ b/MultiSource/Applications/spiff/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG spiff)
 set(CPPFLAGS )
 set(LDFLAGS )
@@ -11,5 +8,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/sqlite3/CMakeLists.txt b/MultiSource/Applications/sqlite3/CMakeLists.txt
index 8faa2a0..de35409 100644
--- a/MultiSource/Applications/sqlite3/CMakeLists.txt
+++ b/MultiSource/Applications/sqlite3/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(Source sqlite3.c shell.c)
 set(PROG sqlite3)
 list(APPEND CPPFLAGS -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -I.)
@@ -25,4 +22,3 @@
 add_custom_target(sqlite_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/test15.sql)
     llvm_multisource()
 add_dependencies(sqlite3 sqlite_input)
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/treecc/CMakeLists.txt b/MultiSource/Applications/treecc/CMakeLists.txt
index 618320b..503e0ca 100644
--- a/MultiSource/Applications/treecc/CMakeLists.txt
+++ b/MultiSource/Applications/treecc/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG treecc)
 set(RUN_OPTIONS -n ${CMAKE_CURRENT_SOURCE_DIR}/examples/expr_cpp.tc)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/viterbi/CMakeLists.txt b/MultiSource/Applications/viterbi/CMakeLists.txt
index c88e5b0..b46bc7f 100644
--- a/MultiSource/Applications/viterbi/CMakeLists.txt
+++ b/MultiSource/Applications/viterbi/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG viterbi)
 set(CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DPROJ_SRC_DIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\")
 set(LDFLAGS )
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/7zip/CMakeLists.txt b/MultiSource/Benchmarks/7zip/CMakeLists.txt
index dec5168..c67e4c7 100644
--- a/MultiSource/Benchmarks/7zip/CMakeLists.txt
+++ b/MultiSource/Benchmarks/7zip/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG 7zip-benchmark)
 set(RUN_OPTIONS b)
 list(APPEND CFLAGS -DBREAK_HANDLER -DUNICODE -D_UNICODE -I${CMAKE_CURRENT_SOURCE_DIR}/C -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/myWindows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/include_windows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -D_7ZIP_LARGE_PAGES -pthread)
@@ -22,5 +19,3 @@
 	$(RUNSAFELYLOCAL) /dev/null $@.compile $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -S $< -o $@ $(LLVMCC_EMITIR_FLAG))
 set(PROGRAM_IS_NONDETERMINISTIC 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt b/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
index 3bf0fb0..be861a3 100644
--- a/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS SMG2000 )
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt b/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
index 73aafcc..a08456e 100644
--- a/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG smg2000)
 list(APPEND CPPFLAGS -D_POSIX_SOURCE -DHYPRE_TIMING -DHYPRE_SEQUENTIAL )
 list(APPEND CPPFLAGS -I. )
@@ -15,5 +12,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt b/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt
index acce2d3..454ee6b 100644
--- a/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG AMGmk)
 list(APPEND LIBS -lm)
 list(APPEND LDFLAGS -lm)
@@ -10,5 +7,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt b/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
index a1fde6a..7172d90 100644
--- a/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS IRSmk AMGmk CrystalMk )
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt b/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt
index 487265e..66cc9f8 100644
--- a/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG CrystalMk)
 list(APPEND LIBS -lm)
 list(APPEND LDFLAGS -lm)
@@ -10,5 +7,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt b/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt
index bd7c3b8..0121296 100644
--- a/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG IRSmk)
 list(APPEND LIBS -lm)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/irsmk_input)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/sphot/CMakeLists.txt b/MultiSource/Benchmarks/ASC_Sequoia/sphot/CMakeLists.txt
index 883e6aa..3c4adcf 100644
--- a/MultiSource/Benchmarks/ASC_Sequoia/sphot/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASC_Sequoia/sphot/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG sphot)
 list(APPEND LIBS -lm)
 list(APPEND LDFLAGS -lm)
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/BitBench/CMakeLists.txt b/MultiSource/Benchmarks/BitBench/CMakeLists.txt
index eccebb7..b674ecd 100644
--- a/MultiSource/Benchmarks/BitBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/BitBench/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS five11 drop3 uudecode uuencode)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt b/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt
index 410a17b..e32f531 100644
--- a/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt
+++ b/MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG drop3)
 set(LDFLAGS )
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt b/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt
index 64f84d6..217e539 100644
--- a/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt
+++ b/MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG five11)
 set(LDFLAGS )
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt b/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt
index 876dd85..24489da 100644
--- a/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt
+++ b/MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG uudecode)
 set(LDFLAGS )
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt b/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt
index b44a09b..f99fbce 100644
--- a/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt
+++ b/MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG uuencode)
 set(LDFLAGS )
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Bullet/CMakeLists.txt b/MultiSource/Benchmarks/Bullet/CMakeLists.txt
index 03e508e..6eeebd4 100644
--- a/MultiSource/Benchmarks/Bullet/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Bullet/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG bullet)
 list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/include -DNO_TIME)
 set(LDFLAGS -lstdc++ -lm)
@@ -10,5 +7,3 @@
   set(RUNTIMELIMIT 1500)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/CMakeLists.txt b/MultiSource/Benchmarks/CMakeLists.txt
index eb8a278..7ee5326 100644
--- a/MultiSource/Benchmarks/CMakeLists.txt
+++ b/MultiSource/Benchmarks/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS Fhourstones Fhourstones-3.1 McCat Olden Ptrdist llubenchmark sim FreeBench MallocBench Prolangs-C SciMark2-C mediabench nbench ASCI_Purple MiBench Trimaran VersaBench NPB-serial BitBench ASC_Sequoia TSVC)
@@ -25,4 +24,4 @@
   set(PARALLEL_DIRS ${TMP4})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt b/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
index 4a36e69..f32d45a 100644
--- a/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Fhourstones-3.1/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG fhourstones3.1)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/inputs_large)
@@ -11,5 +8,3 @@
   set(XCORE_TARGET_NEEDS_MEMORY 64)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt b/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt
index c31fe1d..1649a32 100644
--- a/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Fhourstones/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG fhourstones)
 set(CPPFLAGS -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
index 68f3276..9076969 100644
--- a/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS distray mason pcompress2 analyzer fourinarow neural pifft)
@@ -7,4 +6,4 @@
   set(PARALLEL_DIRS ${TMP1})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt
index 119fffd..c2bc8a2 100644
--- a/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/analyzer/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG analyzer)
 set(CPPFLAGS -DVERSION='"1.00"' -DCOMPDATE="\\"today\\"" -DCFLAGS='""' -DHOSTNAME="\\"thishost\\"" )
 if(DEFINED LARGE_PROBLEM_SIZE)
@@ -9,5 +6,3 @@
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt
index 9c45b79..729e528 100644
--- a/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/distray/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG distray)
 set(CPPFLAGS -DVERSION='"1.00"' -DCOMPDATE="\\"today\\"" -DCFLAGS='""' -DHOSTNAME="\\"thishost\\"" )
 set(LDFLAGS -lm)
@@ -11,5 +8,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt
index c1ff9b8..cbca26c 100644
--- a/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/fourinarow/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG fourinarow)
 set(CPPFLAGS -DVERSION='"1.00"' -DCOMPDATE="\\"today\\"" -DCFLAGS='""' -DHOSTNAME="\\"thishost\\"" )
 if(DEFINED LARGE_PROBLEM_SIZE)
@@ -9,5 +6,3 @@
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt
index b40119a..34b051d 100644
--- a/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/mason/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG mason)
 set(CPPFLAGS -DVERSION='"1.00"' -DCOMPDATE="\\"today\\"" -DCFLAGS='""' -DHOSTNAME="\\"thishost\\"" )
 if(DEFINED LARGE_PROBLEM_SIZE)
@@ -9,5 +6,3 @@
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt
index 55c5b3f..fc9ca0a 100644
--- a/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/neural/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG neural)
 set(CPPFLAGS -DVERSION='"1.00"' -DCOMPDATE="\\"today\\"" -DCFLAGS='""' -DHOSTNAME="\\"thishost\\"" )
 set(LDFLAGS -lm)
@@ -10,5 +7,3 @@
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt
index 42eb4a1..5004692 100644
--- a/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/pcompress2/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG pcompress2)
 set(CPPFLAGS -DVERSION='"1.00"' -DCOMPDATE="\\"today\\"" -DCFLAGS='""' -DHOSTNAME="\\"thishost\\"" )
 if(DEFINED LARGE_PROBLEM_SIZE)
@@ -18,4 +15,3 @@
 add_custom_target(pcompress2_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${INPUT_FILE})
     llvm_multisource()
 add_dependencies(pcompress2 pcompress2_input)
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt
index a7b3e06..ebf599b 100644
--- a/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/pifft/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG pifft)
 set(CPPFLAGS -DVERSION='"1.00"' -DCOMPDATE="\\"today\\"" -DCFLAGS='""' -DHOSTNAME="\\"thishost\\"" )
 set(LDFLAGS -lm)
@@ -10,5 +7,3 @@
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/test.in)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
index ba8f33e..ae77274 100644
--- a/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS cfrac espresso gs)
@@ -7,4 +6,4 @@
   set(PARALLEL_DIRS ${TMP1})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt
index d2d8c1f..ffe5a47 100644
--- a/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/cfrac/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG cfrac)
 list(APPEND CPPFLAGS -DNOMEMOPT)
 list(APPEND LIBS -lm)
@@ -12,5 +9,3 @@
   set(RUN_OPTIONS 41757646344123832613190542166099121)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt
index f288a33..26caef1 100644
--- a/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG espresso)
 list(APPEND CPPFLAGS -DNOMEMOPT)
 list(APPEND CFLAGS -std=gnu89)
 set(RUN_OPTIONS -t ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/largest.espresso)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt
index a4be01c..2a225bb 100644
--- a/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/gawk/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(RUN_OPTIONS -f ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/adj.awk type=l linelen=70 indent=5 ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/words-large.awk)
 set(PROG gawk)
 list(APPEND LIBS -lm)
@@ -11,5 +8,3 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_yacc_parser(gawk_parser awk.y ${CMAKE_CURRENT_BINARY_DIR}/awk.tab.c ${CMAKE_CURRENT_BINARY_DIR}/awk.tab.h)
     llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt
index 2b80648..fb30c10 100644
--- a/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/gs/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG gs)
 list(APPEND LIBS -lm)
 list(APPEND LDFLAGS -lm)
@@ -12,5 +9,3 @@
 list(APPEND Source gschar.c gscolor.c gscoord.c gsdevice.c gsfile.c gsfont.c gsimage.c gsim2out.c gsline.c gsmatrix.c gsmisc.c gspaint.c gspath.c gspath2.c gsstate.c gstype1.c gxcache.c gxcolor.c gxdither.c gxdraw.c gxfill.c gxht.c gxpath.c gxpath2.c gxstroke.c gdevmem.c gdevs.c)
 set(RUN_OPTIONS -DNODISPLAY ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/large.ps)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt
index 49251b7..2ee81c6 100644
--- a/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/make/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG make)
 list(APPEND CPPFLAGS -DHAVE_SIGLIST -DNO_LDAV -DNOMEMOPT -DPOSIX)
 set(Source commands.c job.c dir.c file.c load.c misc.c main.c read.c remake.c remote.c rule.c implicit.c default.c variable.c expand.c function.c vpath.c version.c arscan.c ar.c)
 set(RUN_OPTIONS -n -f ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/GNUmakefile.make USEROPT=BWGC VPATH=${CMAKE_CURRENT_SOURCE_DIR})
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt
index a77bf9d..d50cdec 100644
--- a/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/p2c/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG p2c)
 list(APPEND CPPFLAGS -DNOMEMOPT)
 set(RUN_OPTIONS -v)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/mf.p)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt
index eae9df5..7917f8f 100644
--- a/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/perl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG perl)
 set(REQUIRES_EH_SUPPORT 1)
 list(APPEND CPPFLAGS -DHAS_STRERROR -DHAS_MKDIR -DHAS_RMDIR -U_POSIX_SOURCE -D__USE_MISC)
@@ -9,5 +6,3 @@
 set(Source array.c doarg.c eval.c regexec.c cmd.c doio.c form.c perl.c stab.c usersub.c cons.c dolist.c hash.c perly.c str.c util.c consarg.c dump.c malloc.c regcomp.c toke.c)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/endsort.perl ${CMAKE_CURRENT_SOURCE_DIR}/INPUT/endsort.perl)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt b/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt
index 2c234a8..cfa3540 100644
--- a/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/01-qbsort/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG qbsort)
 set(RUN_OPTIONS 1000)
 set(LDFLAGS -lm)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/benchmark.in3)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt b/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt
index 64ac9d3..2dc7dc8 100644
--- a/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/03-testtrie/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG testtrie)
 set(LDFLAGS -lm)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/testtrie.in2)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt b/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt
index 2e06ea6..476634a 100644
--- a/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/04-bisect/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG bisect)
 set(LDFLAGS -lm)
 set(FP_TOLERANCE 0.001)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/bisect_test.in)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt b/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt
index 04293e2..5efcc70 100644
--- a/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG eks)
 set(LDFLAGS -lm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt b/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt
index c6fd4bf..8975ded 100644
--- a/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/08-main/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG main)
 set(LDFLAGS -lm)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt b/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt
index 2cadf00..44fdd4a 100644
--- a/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/09-vor/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG vor)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/vor.in3)
 set(LDFLAGS -lm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt b/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt
index da53688..7f4d16a 100644
--- a/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/12-IOtest/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG iotest)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt b/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt
index ecefb56..ba41275 100644
--- a/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/15-trie/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG trie)
 set(LDFLAGS -lm)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/trie.in1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt b/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt
index fa42bec..9a3e979 100644
--- a/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/17-bintr/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG bintr)
 set(LDFLAGS -lm)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/bnchmrk.in1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt b/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt
index 0acbc36..3d8ca56 100644
--- a/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/18-imp/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG imp)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/sg01.imp)
 set(LDFLAGS -lm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/CMakeLists.txt b/MultiSource/Benchmarks/McCat/CMakeLists.txt
index 9d7ab3d..364711f 100644
--- a/MultiSource/Benchmarks/McCat/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS 01-qbsort 04-bisect 08-main 12-IOtest 17-bintr 03-testtrie 05-eks 09-vor 15-trie 18-imp)
@@ -7,4 +6,4 @@
   set(PARALLEL_DIRS ${TMP1})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/CMakeLists.txt
index a9b68cf..7791205 100644
--- a/MultiSource/Benchmarks/MiBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS automotive-basicmath automotive-bitcount automotive-susan consumer-jpeg consumer-lame consumer-typeset network-dijkstra network-patricia office-ispell office-stringsearch security-blowfish security-rijndael security-sha telecomm-CRC32 telecomm-FFT telecomm-adpcm telecomm-gsm)
@@ -23,4 +22,4 @@
   set(PARALLEL_DIRS ${TMP7})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt
index 83cd19b..7d289dc 100644
--- a/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/automotive-basicmath/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG automotive-basicmath)
 set(LDFLAGS -lm)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt
index 0de20df..4c7b659 100644
--- a/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/automotive-bitcount/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG automotive-bitcount)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS 1125000)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt
index 88b0089..8c43dcc 100644
--- a/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/automotive-susan/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG automotive-susan)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.pgm Output/output_large.smoothing.pgm -s)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt
index 2e8461f..c3aeffa 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/consumer-jpeg/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG consumer-jpeg)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS -dct int -ppm -outfile Output/output_large_decode.ppm ${CMAKE_CURRENT_SOURCE_DIR}/input_large.jpg)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
index e0d1a56..e6f7745 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG consumer-lame)
 set(CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS -S ${CMAKE_CURRENT_SOURCE_DIR}/large.wav Output/output_large.mp3)
 set(USE_REFERENCE_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
index 4addcd7..3dc32ef 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG consumer-typeset)
 set(CPPFLAGS -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR=\\"lout.lib\\" -DFONT_DIR=\\"font\\" -DMAPS_DIR=\\"maps\\" -DINCL_DIR=\\"include\\" -DDATA_DIR=\\"data\\" -DHYPH_DIR=\\"hyph\\" -DLOCALE_DIR=\\"locale\\" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0  -DPDF_COMPRESSION=0 -D_FORTIFY_SOURCE=0)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS -x -I ${CMAKE_CURRENT_SOURCE_DIR}/data/include -D ${CMAKE_CURRENT_SOURCE_DIR}/data/data -F ${CMAKE_CURRENT_SOURCE_DIR}/data/font -C ${CMAKE_CURRENT_SOURCE_DIR}/data/maps -H ${CMAKE_CURRENT_SOURCE_DIR}/data/hyph ${CMAKE_CURRENT_SOURCE_DIR}/large.lout)
 
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt
index 45de986..c19b2de 100644
--- a/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/network-dijkstra/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG network-dijkstra)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.dat)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt
index a8604a6..544fce9 100644
--- a/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG network-patricia)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/large.udp)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
index e0f3a32..cbcad93 100644
--- a/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG office-ispell)
 set(CPPFLAGS -Dconst=)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS -a -d ${CMAKE_CURRENT_SOURCE_DIR}/americanmed+)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.txt)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt
index d767bbf..3a0e6b4 100644
--- a/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/office-stringsearch/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG office-stringsearch)
 set(LDFLAGS -lm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt
index e0f6217..7e926e1 100644
--- a/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/security-blowfish/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG security-blowfish)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS print_test_data)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt
index b5fb170..2bfd6be 100644
--- a/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/security-rijndael/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG security-rijndael)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/output_large.enc Output/output_large.dec d 1234567890abcdeffedcba09876543211234567890abcdeffedcba0987654321)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt
index ba7c8db..42f68bd 100644
--- a/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/security-sha/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG security-sha)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input_large.asc )
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt
index 422d6c0..789d68a 100644
--- a/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/telecomm-CRC32/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG telecomm-CRC32)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/large.pcm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt
index 0508bc9..eff1b66 100644
--- a/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/telecomm-FFT/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG telecomm-fft)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS 8 32768 -i)
 set(FP_ABSTOLERANCE 0.00001)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
index d47ee10..d971299 100644
--- a/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/telecomm-adpcm/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG telecomm-adpcm)
 set(LDFLAGS -lm)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/large.adpcm)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt
index 06e00cd..d5620bb 100644
--- a/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/telecomm-gsm/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG telecomm-gsm)
 set(CPPFLAGS -DSTUPID_COMPILER -DNeedFunctionPrototypes=1 -DSASR)
 set(LDFLAGS -lm)
 set(RUN_OPTIONS -fps -c ${CMAKE_CURRENT_SOURCE_DIR}/large.au)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt b/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
index 2dd7741..c88bd32 100644
--- a/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
+++ b/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS is )
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt b/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt
index d78597d..2b5435b 100644
--- a/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt
+++ b/MultiSource/Benchmarks/NPB-serial/dc/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG dc)
 set(LDFLAGS )
 set(Source adc.c dc.c jobcntl.c c_print_results.c extbuild.c rbt.c)
@@ -9,5 +6,3 @@
   set(CPPFLAGS -DSMALL_PROBLEM_SIZE)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt b/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt
index 47b2af5..96591fb 100644
--- a/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt
+++ b/MultiSource/Benchmarks/NPB-serial/is/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG is)
 set(LDFLAGS )
 if(DEFINED SMALL_PROBLEM_SIZE)
@@ -11,5 +8,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/CMakeLists.txt b/MultiSource/Benchmarks/Olden/CMakeLists.txt
index 80a446f..65cad33 100644
--- a/MultiSource/Benchmarks/Olden/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS bh em3d mst power tsp bisort health perimeter treeadd voronoi)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt b/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt
index 4eb9c33..28f17a8 100644
--- a/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/bh/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG bh)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS -lm)
@@ -14,5 +11,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt b/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt
index 0441d5a..ed49a99 100644
--- a/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/bisort/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG bisort)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS -lm)
@@ -10,5 +7,3 @@
   set(RUN_OPTIONS 700000)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt b/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt
index 075e150..2b58d83 100644
--- a/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/em3d/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG em3d)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS )
@@ -10,5 +7,3 @@
   set(RUN_OPTIONS 1024 1000 125)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/health/CMakeLists.txt b/MultiSource/Benchmarks/Olden/health/CMakeLists.txt
index 19596a7..ffad70b 100644
--- a/MultiSource/Benchmarks/Olden/health/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/health/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG health)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS -lm)
@@ -18,5 +15,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt b/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt
index 241c2db..c179c9c 100644
--- a/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/mst/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG mst)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS )
@@ -10,5 +7,3 @@
   set(RUN_OPTIONS 1000)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt b/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt
index 05bc766..ec47102 100644
--- a/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/perimeter/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG perimeter)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS )
@@ -17,5 +14,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/power/CMakeLists.txt b/MultiSource/Benchmarks/Olden/power/CMakeLists.txt
index 4eb696b..8f583c8 100644
--- a/MultiSource/Benchmarks/Olden/power/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/power/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG power)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS -lm)
 set(FP_TOLERANCE 0.00001)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt b/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt
index f510887..50b5758 100644
--- a/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/treeadd/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG treeadd)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS )
@@ -13,5 +10,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt b/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt
index 0e58382..9f196d7 100644
--- a/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/tsp/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG tsp)
 set(CPPFLAGS -DTORONTO)
 set(LDFLAGS -lm)
@@ -17,5 +14,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt b/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt
index 14a5d10..f3cf195 100644
--- a/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/voronoi/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG voronoi)
 set(INCLUDES defines.h)
 set(CPPFLAGS -DTORONTO)
@@ -19,5 +16,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt b/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt
index d6446e1..a5aac68 100644
--- a/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt
+++ b/MultiSource/Benchmarks/OptimizerEval/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG optimizer-eval)
 set(CPPFLAGS )
 set(LDFLAGS -lm)
 set(PROGRAM_IS_NONDETERMINISTIC 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt b/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
index 34ff435..5b1fe5d 100644
--- a/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
+++ b/MultiSource/Benchmarks/PAQ8p/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG paq8p)
 list(APPEND CPPFLAGS -DNOASM -DLLVM)
 set(LDFLAGS -lstdc++ -lm)
@@ -10,5 +7,3 @@
   set(RUN_OPTIONS -4 ${CMAKE_CURRENT_SOURCE_DIR}/file1.in)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
index 7c1938e..1ea7c48 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS NP city deriv1 deriv2 employ family fsm garage life objects ocean office primes shapes simul trees vcirc)
@@ -27,4 +26,4 @@
   set(PARALLEL_DIRS ${TMP11})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt
index 94e874d..f606944 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/NP/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG np)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt
index ddd1d84..b898e6d 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/city/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG city)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt
index a5bb71b..d63472d 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/deriv1/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG deriv1)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt
index edac96d..b878dc9 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/deriv2/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG deriv2)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt
index 5645f6f..41933d3 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/employ/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG employ)
 set(LDFLAGS -lstdc++)
 set(RUN_OPTIONS 400)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt
index afdb2b3..61ec63f 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/family/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG family)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt
index 3d159b9..123bfc7 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/fsm/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG fsm)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt
index 730cf6a..61dd5c8 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/garage/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG garage)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt
index f175d00..31c37b1 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/life/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG life)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt
index 1cd7e64..a82ab93 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/objects/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG objects)
 set(LIBS -lstdc++)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt
index 32bc7b6..8feba2c 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/ocean/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ocean)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt
index 60e0411..644643e 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/office/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG office)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt
index ec74aad..322430c 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/primes/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG primes)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt
index f4657f7..cd3d5ef 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/shapes/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG shapes)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt
index ca613cb..573870b 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/simul/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG simul)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt
index dac328e..16011d7 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/trees/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG trees)
 set(LIBS -lstdc++)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt
index 452261d..85aaa47 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/vcirc/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG vcirc)
 set(LDFLAGS -lstdc++)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
index b8a76cd..d55810f 100644
--- a/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS TimberWolfMC agrep allroots archie-client assembler bison cdecl compiler fixoutput football gnugo loader plot2fig simulator unix-smail unix-tbl)
@@ -45,4 +44,4 @@
   set(PARALLEL_DIRS ${TMP17})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt
index 3ba1dcc..9f494cc 100644
--- a/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG timberwolfmc)
 set(LDFLAGS -lm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt
index 6d82c79..bc8f214 100644
--- a/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/agrep/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG agrep)
 set(RUN_OPTIONS -2 int ${CMAKE_CURRENT_SOURCE_DIR}/InstructionCombining.cpp.txt)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt
index cc27db3..8ec7567 100644
--- a/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/allroots/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG allroots)
 set(LDFLAGS -lm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt
index 3a3a348..6f650f9 100644
--- a/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt
@@ -1,7 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
-
 include(CheckFunctionExists)
 check_function_exists(re_comp HAVE_RE_COMP)
 
@@ -12,5 +8,3 @@
   endif()
   llvm_multisource()
 endif()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt
index b8cb6b2..025d7cb 100644
--- a/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/assembler/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG assembler)
 set(LDFLAGS -lm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt
index 02486d1..95cbe15 100644
--- a/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/bison/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG mybison)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/parse.y.in -v)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
index f92c008..3c1c095 100644
--- a/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND CFLAGS -std=gnu89)
 set(PROG cdecl)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/testset)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt
index b0e11e3..d0c60bf 100644
--- a/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/compiler/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG compiler)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt
index 1b4dc7a..b79a863 100644
--- a/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/fixoutput/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG fixoutput)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt
index c5ccde6..bcef273 100644
--- a/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/football/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG football)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt
index 471c866..ac290df 100644
--- a/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/gnugo/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG gnugo)
 set(HASH_PROGRAM_OUTPUT 1)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/stdin)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt
index 24a9e2e..bea1906 100644
--- a/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/loader/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(LDFLAGS -lm)
 set(PROG loader)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt
index 838db07..f05571a 100644
--- a/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/plot2fig/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 include(CheckFunctionExists)
 check_function_exists(re_comp HAVE_RE_COMP)
 if(HAVE_RE_COMP)
   set(PROG plot2fig)
   llvm_multisource()
 endif()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt
index 5c393f1..4d91149 100644
--- a/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/simulator/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG simulator)
 set(LDFLAGS -lm)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt
index c119845..4353032 100644
--- a/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/unix-smail/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG unix-smail)
 set(RUN_OPTIONS -v ALL)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt
index d7decc1..96c9845 100644
--- a/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/unix-tbl/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG unix-tbl)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt b/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
index 8c34301..3b2935f 100644
--- a/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS anagram bc ft ks yacr2)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt b/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt
index 9879104..7eb1285 100644
--- a/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Ptrdist/anagram/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG anagram)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/words 2)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/input.OUT)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt b/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt
index 2360e56..6c11a6e 100644
--- a/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Ptrdist/bc/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG bc)
 set(OBJS scan.o util.o main.o number.o storage.o load.o execute.o bc.o global.o)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/primes.b)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt b/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt
index ba9a5dc..9bbd68d 100644
--- a/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Ptrdist/ft/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ft)
 if(DEFINED LARGE_PROBLEM_SIZE)
   list(APPEND RUN_OPTIONS 6000 100000)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt b/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt
index 85b9b32..56df9e9 100644
--- a/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Ptrdist/ks/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ks)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/KL-4.in)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt b/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt
index 097fc05..e0bd903 100644
--- a/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Ptrdist/yacr2/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG yacr2)
 set(CPPFLAGS -DTODD)
 list(APPEND RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input2.in)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt b/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt
index 24a6e21..0433099 100644
--- a/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt
+++ b/MultiSource/Benchmarks/SciMark2-C/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG scimark2)
 set(CPPFLAGS )
 set(LDFLAGS -lm)
@@ -17,5 +14,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/CMakeLists.txt
index c985ec1..1085c1a 100644
--- a/MultiSource/Benchmarks/TSVC/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS LinearDependence-flt InductionVariable-flt GlobalDataFlow-flt ControlFlow-flt Symbolics-flt StatementReordering-flt LoopRestructuring-flt NodeSplitting-flt Expansion-flt CrossingThresholds-flt Reductions-flt Recurrences-flt Searching-flt Packing-flt LoopRerolling-flt Equivalencing-flt IndirectAddressing-flt ControlLoops-flt LinearDependence-dbl InductionVariable-dbl GlobalDataFlow-dbl ControlFlow-dbl Symbolics-dbl StatementReordering-dbl LoopRestructuring-dbl NodeSplitting-dbl Expansion-dbl CrossingThresholds-dbl Reductions-dbl Recurrences-dbl Searching-dbl Packing-dbl LoopRerolling-dbl Equivalencing-dbl IndirectAddressing-dbl ControlLoops-dbl)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt
index 03e7eaa..676f05a 100644
--- a/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ControlFlow-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt
index 75f5a06..2ad4772 100644
--- a/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/ControlFlow-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ControlFlow-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 2325 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt
index e7e9c4a..9e08896 100644
--- a/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ControlLoops-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt
index f2d5421..f272cda 100644
--- a/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/ControlLoops-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ControlLoops-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 1640 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt
index 781e082..8293947 100644
--- a/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/CrossingThresholds-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG CrossingThresholds-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 5880 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt
index 620b4ff..cd50f71 100644
--- a/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/CrossingThresholds-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG CrossingThresholds-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 5880 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt
index 8588161..c22433a 100644
--- a/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Equivalencing-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Equivalencing-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3125 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt
index ae3d45f..2157468 100644
--- a/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Equivalencing-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Equivalencing-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3125 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt
index 706aab1..edd0372 100644
--- a/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Expansion-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Expansion-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt
index 8c148f5..c088315 100644
--- a/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Expansion-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Expansion-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 4160 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt
index c3f9248..e5ed566 100644
--- a/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG GlobalDataFlow-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt
index 777de03..bc4a2b3 100644
--- a/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/GlobalDataFlow-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG GlobalDataFlow-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3450 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt
index 37a40f2..15fff56 100644
--- a/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/IndirectAddressing-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG IndirectAddressing-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 12500 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt
index a40de0f..776cc2f 100644
--- a/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/IndirectAddressing-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG IndirectAddressing-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 12500 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt
index d78c341..f30f61a 100644
--- a/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG InductionVariable-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt
index 500d132..4bbe597 100644
--- a/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/InductionVariable-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG InductionVariable-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 9100 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt
index 9a89bbb..a67c4b5 100644
--- a/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG LinearDependence-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt
index ae6a7e9..6e04590 100644
--- a/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/LinearDependence-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG LinearDependence-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 3570 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt
index eebc812..977a285 100644
--- a/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG LoopRerolling-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt
index 0ce9ebe..e6ef4e1 100644
--- a/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/LoopRerolling-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG LoopRerolling-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 5260 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt
index 5015006..62b0b12 100644
--- a/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/LoopRestructuring-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG LoopRestructuring-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 4350 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt
index be81d13..0ab7276 100644
--- a/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/LoopRestructuring-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG LoopRestructuring-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 4350 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt
index d90a99e..7e82453 100644
--- a/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG NodeSplitting-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt
index da030ae..07a1c04 100644
--- a/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG NodeSplitting-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt
index c7548a0..87ee9cf 100644
--- a/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Packing-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Packing-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 50000 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt
index 6d6adf8..1cb25a8 100644
--- a/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Packing-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Packing-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 50000 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt
index e0a7010..661d372 100644
--- a/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Recurrences-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Recurrences-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 20000 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt
index 4732441..348bd14 100644
--- a/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Recurrences-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Recurrences-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 20000 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt
index 74e4efb..489a095 100644
--- a/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Reductions-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Reductions-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 1670 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt
index 5705240..3ff80bd 100644
--- a/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Reductions-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Reductions-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 1670 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt
index 91a7e38..3c015be 100644
--- a/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Searching-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Searching-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 80000 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt
index 5013511..3baf837 100644
--- a/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Searching-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Searching-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 80000 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt
index 37be98f..e5c72a6 100644
--- a/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG StatementReordering-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 7200)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt
index 5d7b18d..500eddc 100644
--- a/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/StatementReordering-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG StatementReordering-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 20000 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt
index 0f8f47b..9315732 100644
--- a/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Symbolics-dbl/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Symbolics-dbl)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 9090 14)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt
index 9fb72cf..d36d990 100644
--- a/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/Symbolics-flt/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Symbolics-flt)
 set(LDFLAGS -lm)
 list(APPEND CFLAGS -std=gnu99)
 set(RUN_OPTIONS 9090 5)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Trimaran/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
index 45104d2..84cde6d 100644
--- a/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS enc-3des enc-md5 enc-pc1 enc-rc4 netbench-crc netbench-url)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt
index edc052e..642f5eb 100644
--- a/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/enc-3des/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG enc-3des)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 200)
@@ -12,5 +9,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt
index ee1f40c..39b4556 100644
--- a/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/enc-md5/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG enc-md5)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 50)
@@ -12,5 +9,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt
index 430dcd0..e1fc0ff 100644
--- a/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/enc-pc1/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG enc-pc1)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 20000000)
@@ -12,5 +9,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt
index 899dc56..3bcd4ae 100644
--- a/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/enc-rc4/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG enc-rc4)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 1000000)
@@ -12,5 +9,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt
index 6212e5a..7de437e 100644
--- a/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/netbench-crc/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG netbench-crc)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 40000)
@@ -15,5 +12,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
index 1f726bf..0d0bdc9 100644
--- a/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG netbench-url)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/medium_inputs 1400)
@@ -12,5 +9,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt b/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt
index 975cc57..801dc3a 100644
--- a/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt
+++ b/MultiSource/Benchmarks/VersaBench/8b10b/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG 8b10b)
 if(DEFINED SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt 2000)
@@ -8,5 +5,3 @@
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt 20000)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/VersaBench/CMakeLists.txt b/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
index ef614c9..ace00da 100644
--- a/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 if("${ENDIAN}" STREQUAL "big")
@@ -7,4 +6,4 @@
   set(PARALLEL_DIRS 8b10b beamformer bmm dbms ecbdes)
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt b/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt
index f54f153..f1a959e 100644
--- a/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt
+++ b/MultiSource/Benchmarks/VersaBench/beamformer/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm)
 set(PROG beamformer)
 if(DEFINED LARGE_PROBLEM_SIZE)
@@ -14,5 +11,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt b/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt
index d57aa6b..cdc995f 100644
--- a/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt
+++ b/MultiSource/Benchmarks/VersaBench/bmm/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG bmm)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 1024 1024)
@@ -12,5 +9,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt b/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
index ffffe2c..7251452 100644
--- a/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
+++ b/MultiSource/Benchmarks/VersaBench/dbms/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG dbms)
 list(APPEND LDFLAGS -lm)
 if(DEFINED SMALL_PROBLEM_SIZE)
@@ -9,5 +6,3 @@
   set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/dbms.ref.in)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt b/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt
index 82386e2..530106b 100644
--- a/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt
+++ b/MultiSource/Benchmarks/VersaBench/ecbdes/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG ecbdes)
 if(DEFINED LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS 34)
@@ -12,5 +9,3 @@
   endif()
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt b/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt
index bbcd11c..c987c33 100644
--- a/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt
+++ b/MultiSource/Benchmarks/llubenchmark/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG llu)
 set(CPPFLAGS )
 set(LDFLAGS )
@@ -10,5 +7,3 @@
   set(RUN_OPTIONS -i 3000)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mafft/CMakeLists.txt b/MultiSource/Benchmarks/mafft/CMakeLists.txt
index f1acaa4..e95fdc8 100644
--- a/MultiSource/Benchmarks/mafft/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mafft/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(Source Calignm1.c constants.c defs.c Falign.c fft.c fftFunctions.c Galign11.c genalign11.c genGalign11.c Halignmm.c io.c Lalign11.c Lalignmm.c mltaln9.c MSalign11.c MSalignmm.c mtxutl.c pairlocalalign.c partQalignmm.c partSalignmm.c Qalignmm.c Ralignmm.c rna.c SAalignmm.c Salignmm.c suboptalign11.c tddis.c)
 set(PROG pairlocalalign)
 set(CPPFLAGS -DLLVM)
@@ -16,5 +13,3 @@
   set(RUNTIMELIMIT 1500)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/CMakeLists.txt
index ba5f4a6..4d36507 100644
--- a/MultiSource/Benchmarks/mediabench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS adpcm g721 gsm jpeg mpeg2)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
index e035ea9..c4c0992 100644
--- a/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS rawcaudio rawdaudio)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt
index f135613..52c056d 100644
--- a/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/adpcm/rawcaudio/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm )
 set(PROG rawcaudio)
 set(Source rawcaudio.c adpcm.c)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt
index 836b1e6..cbcfb04 100644
--- a/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/adpcm/rawdaudio/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.adpcm )
 set(PROG rawdaudio)
 set(HASH_PROGRAM_OUTPUT 1)
 set(Source rawdaudio.c adpcm.c)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
index 64bcae3..813fd1d 100644
--- a/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS g721encode )
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt
index 9f256d1..5c50855 100644
--- a/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/g721/g721encode/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(RUN_OPTIONS -4 -l)
 set(STDIN_FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm)
 set(PROG encode)
 set(Source encode.c  g711.c  g721.c  g723_24.c  g723_40.c  g72x.c)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
index d63103a..e14f71e 100644
--- a/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS toast )
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt
index ae98d88..548951a 100644
--- a/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/gsm/toast/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(RUN_OPTIONS -cpl ${CMAKE_CURRENT_SOURCE_DIR}/../data/clinton.pcm)
 set(PROG toast)
 list(APPEND CPPFLAGS -DNeedFunctionPrototypes=1 -DSASR)
 set(Source add.c         gsm_decode.c   gsm_option.c  rpe.c          toast.c code.c        gsm_destroy.c  gsm_print.c   short_term.c   toast_lin.c debug.c       gsm_encode.c   long_term.c   table.c     toast_ulaw.c decode.c      gsm_explode.c  lpc.c         toast_alaw.c gsm_create.c  gsm_implode.c  preprocess.c  toast_audio.c)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
index fef69d7..efa6060 100644
--- a/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS jpeg-6a )
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt
index 01aae51..336180a 100644
--- a/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/jpeg/jpeg-6a/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(RUN_OPTIONS -dct int -progressive -opt ${CMAKE_CURRENT_SOURCE_DIR}/../data/testimg.ppm)
 set(PROG cjpeg)
 set(Source jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c jfdctint.c jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c jcomapi.c jutils.c jerror.c jmemmgr.c jmemnobs.c)
 list(APPEND Source cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c rdswitch.c cdjpeg.c)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
index b0047bd..779dfbb 100644
--- a/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS mpeg2dec)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt
index 639774f..ec8c3d1 100644
--- a/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(RUN_OPTIONS -b ${CMAKE_CURRENT_SOURCE_DIR}/../data/mei16v2.m2v -r -f -o0 ${CMAKE_CURRENT_BINARY_DIR}/tmp%d)
 set(PROG mpeg2decode)
 list(APPEND LIBS -lm)
 list(APPEND LDFLAGS -lm)
 set(Source display.c  gethdr.c  idct.c     mpeg2dec.c  store.c    verify.c getbits.c  getpic.c  idctref.c  recon.c     subspic.c getblk.c   getvlc.c  motion.c   spatscal.c  systems.c)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/nbench/CMakeLists.txt b/MultiSource/Benchmarks/nbench/CMakeLists.txt
index 1384c1b..f36f892 100644
--- a/MultiSource/Benchmarks/nbench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/nbench/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG nbench)
 set(CPPFLAGS -DBASE_ITERATIONS=25)
 set(LDFLAGS -lm)
@@ -17,4 +14,3 @@
 add_custom_target(nbench_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/NNET.DAT)
     llvm_multisource()
 add_dependencies(nbench nbench_input)
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/sim/CMakeLists.txt b/MultiSource/Benchmarks/sim/CMakeLists.txt
index 38dd38d..7cc6134 100644
--- a/MultiSource/Benchmarks/sim/CMakeLists.txt
+++ b/MultiSource/Benchmarks/sim/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG sim)
 set(CPPFLAGS -DUNIX)
 set(LDFLAGS )
 set(RUN_OPTIONS 8 ${CMAKE_CURRENT_SOURCE_DIR}/tob.38-44 ${CMAKE_CURRENT_SOURCE_DIR}/liv.42-48)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt b/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
index 81c0da5..26b5865 100644
--- a/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
+++ b/MultiSource/Benchmarks/tramp3d-v4/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG tramp3d-v4)
 set(CPPFLAGS -fno-exceptions)
 set(LDFLAGS -lstdc++)
@@ -14,5 +11,3 @@
   set(RUNTIMELIMIT 700)
 endif()
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/CMakeLists.txt b/MultiSource/CMakeLists.txt
index 058de7c..11fcb4f 100644
--- a/MultiSource/CMakeLists.txt
+++ b/MultiSource/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS Applications Benchmarks)
@@ -6,4 +5,4 @@
   list(APPEND PARALLEL_DIRS UnitTests)
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Examples/CMakeLists.txt b/MultiSource/Examples/CMakeLists.txt
index 3fc73ab..246652b 100644
--- a/MultiSource/Examples/CMakeLists.txt
+++ b/MultiSource/Examples/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS MultipleResults)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/Examples/MultipleResults/CMakeLists.txt b/MultiSource/Examples/MultipleResults/CMakeLists.txt
index 3d339e8..6e0c8ca 100644
--- a/MultiSource/Examples/MultipleResults/CMakeLists.txt
+++ b/MultiSource/Examples/MultipleResults/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG MultipleResults)
 set(LDFLAGS )
 set(EXTRA_TEST_RESULTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/Output/MultipleResults.extra-results.txt)
 set(RUN_OPTIONS ${EXTRA_TEST_RESULTS_FILE})
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Examples/Noisy/CMakeLists.txt b/MultiSource/Examples/Noisy/CMakeLists.txt
index 5df8baa..588a45f 100644
--- a/MultiSource/Examples/Noisy/CMakeLists.txt
+++ b/MultiSource/Examples/Noisy/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG Noisy)
 set(CPPFLAGS )
 set(LDFLAGS )
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/C++11/CMakeLists.txt b/MultiSource/UnitTests/C++11/CMakeLists.txt
index e3a40a6..a660d30 100644
--- a/MultiSource/UnitTests/C++11/CMakeLists.txt
+++ b/MultiSource/UnitTests/C++11/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS frame_layout)
@@ -9,4 +8,4 @@
   set(PARALLEL_DIRS ${TMP2})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt b/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt
index 7243ab6..57a4222 100644
--- a/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt
+++ b/MultiSource/UnitTests/C++11/frame_layout/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG frame_layout)
 set(LDFLAGS )
 list(APPEND CPPFLAGS -std=c++11)
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/CMakeLists.txt b/MultiSource/UnitTests/CMakeLists.txt
index c41fb18..05dc0b0 100644
--- a/MultiSource/UnitTests/CMakeLists.txt
+++ b/MultiSource/UnitTests/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS C++11)
@@ -6,4 +5,4 @@
   list(APPEND PARALLEL_DIRS Mips)
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/Mips/CMakeLists.txt b/MultiSource/UnitTests/Mips/CMakeLists.txt
index e6b4f62..b6ecd77 100644
--- a/MultiSource/UnitTests/Mips/CMakeLists.txt
+++ b/MultiSource/UnitTests/Mips/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS )
@@ -7,4 +6,4 @@
   list(APPEND PARALLEL_DIRS Mips16)
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt b/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
index 00dec1a..327128f 100644
--- a/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
+++ b/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 list(APPEND PARALLEL_DIRS multitest fp16_32_1)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt b/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt
index 70ba6a4..7735712 100644
--- a/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt
+++ b/MultiSource/UnitTests/Mips/Mips16/fp16_32_1/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG fp16_32_1)
 set(CPPFLAGS )
 set(LDFLAGS )
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt b/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt
index 651475b..e5e038b 100644
--- a/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt
+++ b/MultiSource/UnitTests/Mips/Mips16/multitest/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(PROG multitest)
 set(CPPFLAGS )
 set(LDFLAGS )
 llvm_multisource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Adobe-C++/CMakeLists.txt b/SingleSource/Benchmarks/Adobe-C++/CMakeLists.txt
index 27c909a..5825a30 100644
--- a/SingleSource/Benchmarks/Adobe-C++/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Adobe-C++/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm -lstdc++)
 set(LIBS -lstdc++)
 set(FP_ABSTOLERANCE 0.01)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt b/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
index 9b5905a..ab59fc9 100644
--- a/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
+++ b/SingleSource/Benchmarks/BenchmarkGame/CMakeLists.txt
@@ -1,8 +1,7 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 set(DIRS Large)
 list(APPEND LDFLAGS -lm)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/Benchmarks/BenchmarkGame/Large/CMakeLists.txt b/SingleSource/Benchmarks/BenchmarkGame/Large/CMakeLists.txt
index c28f0f4..28b1118 100644
--- a/SingleSource/Benchmarks/BenchmarkGame/Large/CMakeLists.txt
+++ b/SingleSource/Benchmarks/BenchmarkGame/Large/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/CMakeLists.txt b/SingleSource/Benchmarks/CMakeLists.txt
index 6649f3f..7fd9f11 100644
--- a/SingleSource/Benchmarks/CMakeLists.txt
+++ b/SingleSource/Benchmarks/CMakeLists.txt
@@ -1,7 +1,6 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS Dhrystone CoyoteBench Shootout Shootout-C++ Stanford McGill Misc Misc-C++ Misc-C++-EH BenchmarkGame Adobe-C++ Polybench Linpack SmallPT)
 list(APPEND LDFLAGS -lm)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/CoyoteBench/CMakeLists.txt b/SingleSource/Benchmarks/CoyoteBench/CMakeLists.txt
index d400d1b..740d0e4 100644
--- a/SingleSource/Benchmarks/CoyoteBench/CMakeLists.txt
+++ b/SingleSource/Benchmarks/CoyoteBench/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm -lstdc++)
 if("${ARCH}" STREQUAL "XCore")
   if(NOT DEFINED SMALL_PROBLEM_SIZE)
@@ -12,5 +9,3 @@
   set(RUNTIMELIMIT 1200)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Dhrystone/CMakeLists.txt b/SingleSource/Benchmarks/Dhrystone/CMakeLists.txt
index 0673133..dfe246f 100644
--- a/SingleSource/Benchmarks/Dhrystone/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Dhrystone/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Linpack/CMakeLists.txt b/SingleSource/Benchmarks/Linpack/CMakeLists.txt
index 3b46757..ac4dd8e 100644
--- a/SingleSource/Benchmarks/Linpack/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Linpack/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.0001)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/McGill/CMakeLists.txt b/SingleSource/Benchmarks/McGill/CMakeLists.txt
index 608fe55..08b6c16 100644
--- a/SingleSource/Benchmarks/McGill/CMakeLists.txt
+++ b/SingleSource/Benchmarks/McGill/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm )
 set(FP_TOLERANCE 0.001)
 if(DEFINED BENCHMARKING_ONLY)
   list(APPEND PROGRAMS_TO_SKIP exptree)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Misc-C++-EH/CMakeLists.txt b/SingleSource/Benchmarks/Misc-C++-EH/CMakeLists.txt
index 5984146..67f97a2 100644
--- a/SingleSource/Benchmarks/Misc-C++-EH/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Misc-C++-EH/CMakeLists.txt
@@ -1,9 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm -lstdc++)
 set(LIBS -lstdc++)
 set(REQUIRES_EH_SUPPORT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt b/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
index c80fb4d..05f0e24 100644
--- a/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Misc-C++/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 set(DIRS Large)
 list(APPEND LDFLAGS -lm -lstdc++)
@@ -12,4 +11,4 @@
 endif()
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/Benchmarks/Misc-C++/Large/CMakeLists.txt b/SingleSource/Benchmarks/Misc-C++/Large/CMakeLists.txt
index 729d2c9..b8d78b8 100644
--- a/SingleSource/Benchmarks/Misc-C++/Large/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Misc-C++/Large/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm -lstdc++)
 set(LIBS -lstdc++)
 set(FP_ABSTOLERANCE 0.01)
@@ -11,5 +8,3 @@
   endif()
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Misc/CMakeLists.txt b/SingleSource/Benchmarks/Misc/CMakeLists.txt
index e33f97b..2c35d04 100644
--- a/SingleSource/Benchmarks/Misc/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Misc/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm )
 set(FP_TOLERANCE 0.001)
 if("${ARCH}" STREQUAL "PowerPC")
@@ -17,5 +14,3 @@
   endif()
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/CMakeLists.txt
index 1d9d292..a6f07ef 100644
--- a/SingleSource/Benchmarks/Polybench/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS datamining linear-algebra medley stencils)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
index b0617fc..564ac32 100644
--- a/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS correlation covariance )
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt
index 372c502..f210afb 100644
--- a/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/datamining/correlation/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG correlation)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt
index dbcaab1..13e6bd4 100644
--- a/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/datamining/covariance/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG covariance)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
index 8c20f00..a7c7fee 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS kernels solvers)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt
index bfc6b45..a16bdb0 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG 2mm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -19,5 +16,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt
index bda9e2d..1731b7e 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG 3mm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -19,5 +16,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
index 74f8fa9..f708fdc 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS 2mm 3mm atax bicg cholesky doitgen gemm gemver gesummv mvt symm syr2k syrk trisolv trmm)
@@ -11,4 +10,4 @@
   set(PARALLEL_DIRS ${TMP3})
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/CMakeLists.txt
index ccdd4b5..e7e40f7 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG atax)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
   set(XCORE_TARGET_NEEDS_MEMORY 128)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/CMakeLists.txt
index bd47b94..94963ff 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG bicg)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
   set(XCORE_TARGET_NEEDS_MEMORY 128)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt
index 6001f0c..a3931e5 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/cholesky/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG cholesky)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt
index 24aa615..977a788 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/doitgen/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG doitgen)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -13,5 +10,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt
index a2aa8df..eede200 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemm/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG gemm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/CMakeLists.txt
index b5a866a..553c6f0 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG gemver)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
   set(XCORE_TARGET_NEEDS_MEMORY 128)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt
index 559c205..ab7e687 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG gesummv)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -13,5 +10,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/CMakeLists.txt
index e2fdb0f..e8c7637 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/mvt/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG mvt)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
   set(XCORE_TARGET_NEEDS_MEMORY 128)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt
index f874960..11e8d59 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG symm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -12,5 +9,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt
index dc7dd6f..86d8a03 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syr2k/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG syr2k)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt
index cf09440..2dc4fc0 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/syrk/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG syrk)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/CMakeLists.txt
index d9f2883..cfb2957 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG trisolv)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
   set(XCORE_TARGET_NEEDS_MEMORY 128)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt
index 32c0eec..55363fd 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG trmm)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
index 8e68b6f..4f4fe1c 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS durbin dynprog gramschmidt lu)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/CMakeLists.txt
index e61891d..9316256 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/durbin/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG durbin)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
   set(XCORE_TARGET_NEEDS_MEMORY 256)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/dynprog/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/dynprog/CMakeLists.txt
index 9ff7884..0c159d5 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/dynprog/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/dynprog/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG dynprog)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt
index b8ea6a4..a0c960f 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG gramschmidt)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/lu/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/lu/CMakeLists.txt
index 3f28d6e..9e3bfd5 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/lu/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/lu/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG lu)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/ludcmp/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/ludcmp/CMakeLists.txt
index 693d7ab..85eea66 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/ludcmp/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/ludcmp/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG ludcmp)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
index 2ce9461..84049c3 100644
--- a/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS floyd-warshall reg_detect)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt
index 67f1fd3..5b6441b 100644
--- a/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/medley/floyd-warshall/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG floyd-warshall)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/medley/reg_detect/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/medley/reg_detect/CMakeLists.txt
index f1ef260..7339b18 100644
--- a/SingleSource/Benchmarks/Polybench/medley/reg_detect/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/medley/reg_detect/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG reg_detect)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
index 9188d84..3e46441 100644
--- a/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS adi fdtd-2d fdtd-apml jacobi-1d-imper jacobi-2d-imper seidel-2d)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt
index 6c3eaa9..0e64304 100644
--- a/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/stencils/adi/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG adi)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt
index 940d293..7844a5f 100644
--- a/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/stencils/fdtd-2d/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG fdtd-2d)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt
index 25680f7..3247af2 100644
--- a/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/stencils/fdtd-apml/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG fdtd-apml)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/stencils/jacobi-1d-imper/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/stencils/jacobi-1d-imper/CMakeLists.txt
index c1ab3a9..29f92ef 100644
--- a/SingleSource/Benchmarks/Polybench/stencils/jacobi-1d-imper/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/stencils/jacobi-1d-imper/CMakeLists.txt
@@ -1,10 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG jacobi-1d-imper)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt
index 96f4c8c..03b4096 100644
--- a/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/stencils/jacobi-2d-imper/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG jacobi-2d-imper)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt
index 7a0bfd6..d8f49bf 100644
--- a/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/stencils/seidel-2d/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(POLYBENCH_UTILS SingleSource/Benchmarks/Polybench/utilities )
 set(PROG seidel-2d)
 list(APPEND CFLAGS -I ${CMAKE_SOURCE_DIR}/${POLYBENCH_UTILS} -DPOLYBENCH_DUMP_ARRAYS)
@@ -9,5 +6,3 @@
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt b/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
index 916ac53..a07bad5 100644
--- a/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Shootout-C++/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 list(APPEND CXXFLAGS -Wno-deprecated)
 list(APPEND CPPFLAGS -Wno-deprecated)
@@ -17,4 +16,4 @@
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/Benchmarks/Shootout-C++/EH/CMakeLists.txt b/SingleSource/Benchmarks/Shootout-C++/EH/CMakeLists.txt
index be12b8f..a1fd49e 100644
--- a/SingleSource/Benchmarks/Shootout-C++/EH/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Shootout-C++/EH/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(REQUIRES_EH_SUPPORT 1)
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Shootout/CMakeLists.txt b/SingleSource/Benchmarks/Shootout/CMakeLists.txt
index d72eb6b..c95d8f9 100644
--- a/SingleSource/Benchmarks/Shootout/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Shootout/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm)
 if("${ARCH}" STREQUAL "XCore")
   set(XCORE_TARGET_NEEDS_MEMORY 256)
@@ -9,5 +6,3 @@
   list(APPEND PROGRAMS_TO_SKIP hello)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/SmallPT/CMakeLists.txt b/SingleSource/Benchmarks/SmallPT/CMakeLists.txt
index a3a4ff4..9a9fd61 100644
--- a/SingleSource/Benchmarks/SmallPT/CMakeLists.txt
+++ b/SingleSource/Benchmarks/SmallPT/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm -lstdc++)
 set(FP_TOLERANCE 0.001)
 if("${ARCH}" STREQUAL "XCore")
@@ -9,5 +6,3 @@
   set(RUNTIMELIMIT 1200)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Stanford/CMakeLists.txt b/SingleSource/Benchmarks/Stanford/CMakeLists.txt
index 9fe80f1..f5dd321 100644
--- a/SingleSource/Benchmarks/Stanford/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Stanford/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.001)
 if(DEFINED BENCHMARKING_ONLY)
   list(APPEND PROGRAMS_TO_SKIP IntMM)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/CMakeLists.txt b/SingleSource/CMakeLists.txt
index 81ffbfc..5f5cba9 100644
--- a/SingleSource/CMakeLists.txt
+++ b/SingleSource/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS Regression Benchmarks)
@@ -6,4 +5,4 @@
   list(APPEND PARALLEL_DIRS UnitTests)
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/Regression/C++/CMakeLists.txt b/SingleSource/Regression/C++/CMakeLists.txt
index ad74d8e..3c7a2bf 100644
--- a/SingleSource/Regression/C++/CMakeLists.txt
+++ b/SingleSource/Regression/C++/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 set(DIRS EH)
 if(DEFINED BENCHMARKING_ONLY)
@@ -8,4 +7,4 @@
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/Regression/C++/EH/CMakeLists.txt b/SingleSource/Regression/C++/EH/CMakeLists.txt
index f4554bd..11aca95 100644
--- a/SingleSource/Regression/C++/EH/CMakeLists.txt
+++ b/SingleSource/Regression/C++/EH/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(REQUIRES_EH_SUPPORT 1)
 if(DEFINED BENCHMARKING_ONLY)
   list(APPEND PROGRAMS_TO_SKIP class_hierarchy ConditionalExpr ctor_dtor_count ctor_dtor_count-2 dead_try_block exception_spec_test function_try_block inlined_cleanup recursive-throw simple_rethrow simple_throw throw_rethrow_test)
 endif()
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Regression/C/CMakeLists.txt b/SingleSource/Regression/C/CMakeLists.txt
index 4731868..b99f195 100644
--- a/SingleSource/Regression/C/CMakeLists.txt
+++ b/SingleSource/Regression/C/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 if("${ARCH}" STREQUAL "x86")
   if(DEFINED USE_REFERENCE_OUTPUT)
     set(EXEC_XFAILS casts)
@@ -11,5 +8,3 @@
 endif()
 list(APPEND LDFLAGS -lm)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Regression/C/SSE/CMakeLists.txt b/SingleSource/Regression/C/SSE/CMakeLists.txt
index 5f680dc..1c03d36 100644
--- a/SingleSource/Regression/C/SSE/CMakeLists.txt
+++ b/SingleSource/Regression/C/SSE/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND CFLAGS -msse2)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Regression/CMakeLists.txt b/SingleSource/Regression/CMakeLists.txt
index 3e9edc5..f4055ce 100644
--- a/SingleSource/Regression/CMakeLists.txt
+++ b/SingleSource/Regression/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 set(DIRS C++ C)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/UnitTests/C++11/CMakeLists.txt b/SingleSource/UnitTests/C++11/CMakeLists.txt
index 7d414f9..8088728 100644
--- a/SingleSource/UnitTests/C++11/CMakeLists.txt
+++ b/SingleSource/UnitTests/C++11/CMakeLists.txt
@@ -1,11 +1,6 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND CPPFLAGS -std=c++11 -pthread)
 if(DEFINED BENCHMARKING_ONLY)
   list(APPEND PROGRAMS_TO_SKIP stdthreadbug)
 endif()
 list(APPEND LDFLAGS -lstdc++ -pthread)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/CMakeLists.txt b/SingleSource/UnitTests/CMakeLists.txt
index 5b00af9..0a1aedc 100644
--- a/SingleSource/UnitTests/CMakeLists.txt
+++ b/SingleSource/UnitTests/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 set(DIRS SetjmpLongjmp)
 set(DIRS )
@@ -37,4 +36,4 @@
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/UnitTests/EH/CMakeLists.txt b/SingleSource/UnitTests/EH/CMakeLists.txt
index be12b8f..a1fd49e 100644
--- a/SingleSource/UnitTests/EH/CMakeLists.txt
+++ b/SingleSource/UnitTests/EH/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(REQUIRES_EH_SUPPORT 1)
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Integer/CMakeLists.txt b/SingleSource/UnitTests/Integer/CMakeLists.txt
index 1cbe917..4d22719 100644
--- a/SingleSource/UnitTests/Integer/CMakeLists.txt
+++ b/SingleSource/UnitTests/Integer/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 execute_process(COMMAND date +%j OUTPUT_VARIABLE TMP1)
 set(SEED TMP1)
 set(RUN_OPTIONS 31415926)
@@ -14,5 +11,3 @@
   list(APPEND CPPFLAGS -DENABLE_LARGE_INTEGERS)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Mips/CMakeLists.txt b/SingleSource/UnitTests/Mips/CMakeLists.txt
index c74ee2b..a5f6726f 100644
--- a/SingleSource/UnitTests/Mips/CMakeLists.txt
+++ b/SingleSource/UnitTests/Mips/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(DIRS)
 set(PARALLEL_DIRS)
 
 string(FIND "${MIPSARCH}" "mips16" TMP1)
@@ -6,4 +5,4 @@
   list(APPEND PARALLEL_DIRS Mips16)
 endif()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Mips/Mips16/CMakeLists.txt b/SingleSource/UnitTests/Mips/Mips16/CMakeLists.txt
index 2a5979e..630458a 100644
--- a/SingleSource/UnitTests/Mips/Mips16/CMakeLists.txt
+++ b/SingleSource/UnitTests/Mips/Mips16/CMakeLists.txt
@@ -1,7 +1 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
-set(DIRS )
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/ObjC++/CMakeLists.txt b/SingleSource/UnitTests/ObjC++/CMakeLists.txt
index 2a25ed8..35be51f 100644
--- a/SingleSource/UnitTests/ObjC++/CMakeLists.txt
+++ b/SingleSource/UnitTests/ObjC++/CMakeLists.txt
@@ -1,10 +1,4 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
-set(DIRS )
 list(APPEND LDFLAGS -lstdc++ -lobjc -framework Foundation)
 if(DEFINED CC_UNDER_TEST_IS_LLVM_GCC)
   set(PROGRAMS_TO_SKIP property-reference-object)
 endif()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/ObjC/CMakeLists.txt b/SingleSource/UnitTests/ObjC/CMakeLists.txt
index 88a4281..ceecf61 100644
--- a/SingleSource/UnitTests/ObjC/CMakeLists.txt
+++ b/SingleSource/UnitTests/ObjC/CMakeLists.txt
@@ -1,11 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(DISABLE_JIT 1)
-set(DIRS )
 list(APPEND LDFLAGS -lobjc -framework Foundation)
 if(DEFINED CC_UNDER_TEST_IS_LLVM_GCC)
   set(EXEC_XFAILS dot-syntax-2)
 endif()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/SetjmpLongjmp/C++/CMakeLists.txt b/SingleSource/UnitTests/SetjmpLongjmp/C++/CMakeLists.txt
index be12b8f..a1fd49e 100644
--- a/SingleSource/UnitTests/SetjmpLongjmp/C++/CMakeLists.txt
+++ b/SingleSource/UnitTests/SetjmpLongjmp/C++/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(REQUIRES_EH_SUPPORT 1)
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/SetjmpLongjmp/C/CMakeLists.txt b/SingleSource/UnitTests/SetjmpLongjmp/C/CMakeLists.txt
index 10b9e99..d22ef6f 100644
--- a/SingleSource/UnitTests/SetjmpLongjmp/C/CMakeLists.txt
+++ b/SingleSource/UnitTests/SetjmpLongjmp/C/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(REQUIRES_EH_SUPPORT 1)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt b/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
index 7e35a37..bde72de 100644
--- a/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
+++ b/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 set(DIRS C C++)
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt b/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt
index 1044d9a..7362b41 100644
--- a/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt
+++ b/SingleSource/UnitTests/SignlessTypes/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 set(DIRS Large)
 execute_process(COMMAND date +%j OUTPUT_VARIABLE TMP1)
@@ -8,4 +7,4 @@
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt b/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt
index 4490cee..1643dc2 100644
--- a/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt
+++ b/SingleSource/UnitTests/SignlessTypes/Large/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 set(RUN_OPTIONS 31415926)
 list(APPEND LDFLAGS -lstdc++)
 set(HASH_PROGRAM_OUTPUT 1)
@@ -10,5 +7,3 @@
   endif()
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Threads/CMakeLists.txt b/SingleSource/UnitTests/Threads/CMakeLists.txt
index 4665d81..911eb99 100644
--- a/SingleSource/UnitTests/Threads/CMakeLists.txt
+++ b/SingleSource/UnitTests/Threads/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 if(NOT "${ARCH}" STREQUAL "XCore")
   list(APPEND LDFLAGS -lpthread)
 else()
@@ -10,5 +7,3 @@
   set(PROGRAMS_TO_SKIP tls 2010-12-08-tls)
 endif()
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt b/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt
index 2689a8c..05775dc 100644
--- a/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt
+++ b/SingleSource/UnitTests/Vector/AArch64/CMakeLists.txt
@@ -1,11 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
-set(DIRS )
 if(DEFINED BENCHMARKING_ONLY)
   list(APPEND PROGRAMS_TO_SKIP aarch64_neon_intrinsics)
 endif()
 list(APPEND CFLAGS -std=c99)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Vector/Altivec/CMakeLists.txt b/SingleSource/UnitTests/Vector/Altivec/CMakeLists.txt
index 1035bf2..8dcbdd2 100644
--- a/SingleSource/UnitTests/Vector/Altivec/CMakeLists.txt
+++ b/SingleSource/UnitTests/Vector/Altivec/CMakeLists.txt
@@ -1,11 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
-set(DIRS )
 set(FP_TOLERANCE 0.002)
 list(APPEND TARGET_FLAGS -maltivec)
 list(APPEND TEST_TARGET_FLAGS -maltivec)
 list(APPEND LCCFLAGS -maltivec)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Vector/CMakeLists.txt b/SingleSource/UnitTests/Vector/CMakeLists.txt
index eb7cec2..23a853f 100644
--- a/SingleSource/UnitTests/Vector/CMakeLists.txt
+++ b/SingleSource/UnitTests/Vector/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(DIRS)
-set(PARALLEL_DIRS)
 
 set(DIRS )
 if("${ARCH}" STREQUAL "PowerPC")
@@ -28,4 +27,4 @@
 endif()
 llvm_singlesource()
 
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
+llvm_add_subdirectories(${DIRS})
diff --git a/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt b/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt
index c05e4ca..1cb0e7e 100644
--- a/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt
+++ b/SingleSource/UnitTests/Vector/NEON/CMakeLists.txt
@@ -1,11 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
-set(DIRS )
 if(DEFINED BENCHMARKING_ONLY)
   list(APPEND PROGRAMS_TO_SKIP simple)
 endif()
 list(APPEND CFLAGS -std=c99)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt b/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt
index 5f8a957..c3790af 100644
--- a/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt
+++ b/SingleSource/UnitTests/Vector/SSE/CMakeLists.txt
@@ -1,11 +1,5 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
-set(DIRS )
 set(FP_TOLERANCE 0.016)
 list(APPEND LDFLAGS -lm)
 list(APPEND TARGET_FLAGS -msse2)
 list(APPEND LCCFLAGS -msse2)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Vectorizer/CMakeLists.txt b/SingleSource/UnitTests/Vectorizer/CMakeLists.txt
index 7348413..b616c17 100644
--- a/SingleSource/UnitTests/Vectorizer/CMakeLists.txt
+++ b/SingleSource/UnitTests/Vectorizer/CMakeLists.txt
@@ -1,7 +1,2 @@
-set(DIRS)
-set(PARALLEL_DIRS)
-
 list(APPEND LDFLAGS -lstdc++)
 llvm_singlesource()
-
-llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})