diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff878659..4d84ce83 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,4 +45,4 @@ set(experiment_libraries "")
 foreach(exp_or_plugin ${EXPERIMENTS_ACTIVATED} ${PLUGINS_ACTIVATED})
     set(experiment_libraries ${experiment_libraries} fail-${exp_or_plugin})
 endforeach(exp_or_plugin)
-target_link_libraries(fail -Wl,-start-group fail-sal fail-cpn fail-efw fail-comm fail-util ${experiment_libraries} -Wl,-end-group)
+target_link_libraries(fail fail-sal fail-cpn fail-efw fail-comm fail-util ${experiment_libraries})
diff --git a/src/core/efw/CMakeLists.txt b/src/core/efw/CMakeLists.txt
index 939e6633..3034c840 100644
--- a/src/core/efw/CMakeLists.txt
+++ b/src/core/efw/CMakeLists.txt
@@ -8,6 +8,7 @@ set(SRCS
 
 add_library(fail-efw ${SRCS})
 add_dependencies(fail-efw fail-comm)
+target_link_libraries(fail-efw fail-comm)
 
 find_package(LibPCL REQUIRED)
 include_directories(${LIBPCL_INCLUDE_DIRS})
diff --git a/src/core/sal/CMakeLists.txt b/src/core/sal/CMakeLists.txt
index a3ee96d7..30d42e9e 100644
--- a/src/core/sal/CMakeLists.txt
+++ b/src/core/sal/CMakeLists.txt
@@ -102,4 +102,8 @@ endif(CONFIG_FAST_BREAKPOINTS)
 
 
 add_library(fail-sal ${SRCS})
-add_dependencies(fail-sal fail-efw)
+target_link_libraries(fail-sal fail-efw fail-util)
+
+foreach(exp ${EXPERIMENTS_ACTIVATED})
+	target_link_libraries(fail-sal fail-${exp})
+endforeach()
diff --git a/src/core/util/CMakeLists.txt b/src/core/util/CMakeLists.txt
index b03de716..8492d0d9 100644
--- a/src/core/util/CMakeLists.txt
+++ b/src/core/util/CMakeLists.txt
@@ -67,6 +67,7 @@ mark_as_advanced(FAIL_OBJDUMP)
 
 add_library(fail-util ${SRCS})
 add_dependencies(fail-util fail-comm)
+target_link_libraries(fail-util fail-comm)
 target_link_libraries(fail-util ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${LIB_IBERTY} ${ZLIB_LIBRARIES} dwarf elf)
 
 option(BUILD_LLVM_DISASSEMBLER "Build the LLVM-based disassembler (LLVM 3.3 preferred, for 3.1 and 3.2 read doc/how-to-build.txt)" OFF)
diff --git a/src/core/util/llvmdisassembler/CMakeLists.txt b/src/core/util/llvmdisassembler/CMakeLists.txt
index 94665f29..80f52b1d 100644
--- a/src/core/util/llvmdisassembler/CMakeLists.txt
+++ b/src/core/util/llvmdisassembler/CMakeLists.txt
@@ -15,7 +15,7 @@ include(FindLLVM)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS} -fno-rtti" )
 
 add_library(fail-llvmdisassembler ${SRCS})
-add_dependencies(fail-llvmdisassembler fail-sal)
+target_link_libraries(fail-llvmdisassembler fail-sal)
 target_link_libraries(fail-llvmdisassembler ${LLVM_LIBS} ${LLVM_LDFLAGS} )
 
 ### Tests
diff --git a/src/experiments/checksum-oostubs/CMakeLists.txt b/src/experiments/checksum-oostubs/CMakeLists.txt
index ae411697..47c24345 100644
--- a/src/experiments/checksum-oostubs/CMakeLists.txt
+++ b/src/experiments/checksum-oostubs/CMakeLists.txt
@@ -25,7 +25,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/cool-checksum/CMakeLists.txt b/src/experiments/cool-checksum/CMakeLists.txt
index a45f3b4d..a169155f 100644
--- a/src/experiments/cool-checksum/CMakeLists.txt
+++ b/src/experiments/cool-checksum/CMakeLists.txt
@@ -25,7 +25,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/cored-voter/CMakeLists.txt b/src/experiments/cored-voter/CMakeLists.txt
index 684d21a0..986915e9 100644
--- a/src/experiments/cored-voter/CMakeLists.txt
+++ b/src/experiments/cored-voter/CMakeLists.txt
@@ -26,6 +26,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY} fail-llvmdisassembler)
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/dciao-kernelstructs/CMakeLists.txt b/src/experiments/dciao-kernelstructs/CMakeLists.txt
index a14aacf7..9e34be8e 100644
--- a/src/experiments/dciao-kernelstructs/CMakeLists.txt
+++ b/src/experiments/dciao-kernelstructs/CMakeLists.txt
@@ -29,6 +29,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/ecos_kernel_test/CMakeLists.txt b/src/experiments/ecos_kernel_test/CMakeLists.txt
index 7546f9c6..360fad89 100644
--- a/src/experiments/ecos_kernel_test/CMakeLists.txt
+++ b/src/experiments/ecos_kernel_test/CMakeLists.txt
@@ -29,7 +29,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY} ${MYSQL_LIBRARIES})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/ezs-logger/CMakeLists.txt b/src/experiments/ezs-logger/CMakeLists.txt
index b66af55e..9dbdcb77 100644
--- a/src/experiments/ezs-logger/CMakeLists.txt
+++ b/src/experiments/ezs-logger/CMakeLists.txt
@@ -16,5 +16,6 @@ set(MY_CAMPAIGN_SRCS
 ## Build library
 add_library(fail-${EXPERIMENT_NAME}  ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME})
 
diff --git a/src/experiments/generic-tracing/CMakeLists.txt b/src/experiments/generic-tracing/CMakeLists.txt
index 76d1912b..1bfc812a 100644
--- a/src/experiments/generic-tracing/CMakeLists.txt
+++ b/src/experiments/generic-tracing/CMakeLists.txt
@@ -14,4 +14,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
diff --git a/src/experiments/kesorefs/CMakeLists.txt b/src/experiments/kesorefs/CMakeLists.txt
index 37298030..8602c3ed 100644
--- a/src/experiments/kesorefs/CMakeLists.txt
+++ b/src/experiments/kesorefs/CMakeLists.txt
@@ -29,6 +29,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/l4-sys/CMakeLists.txt b/src/experiments/l4-sys/CMakeLists.txt
index b14e1b20..4a0589e8 100644
--- a/src/experiments/l4-sys/CMakeLists.txt
+++ b/src/experiments/l4-sys/CMakeLists.txt
@@ -38,6 +38,7 @@ find_package(LibUdis86 REQUIRED)
 include_directories(${LIBUDIS86_INCLUDE_DIRS})
 link_directories(${LIBUDIS86_LINK_DIRS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/mh-test-campaign/CMakeLists.txt b/src/experiments/mh-test-campaign/CMakeLists.txt
index 0f01e761..1c33ac26 100644
--- a/src/experiments/mh-test-campaign/CMakeLists.txt
+++ b/src/experiments/mh-test-campaign/CMakeLists.txt
@@ -26,6 +26,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/nanojpeg/CMakeLists.txt b/src/experiments/nanojpeg/CMakeLists.txt
index 993bae8e..10fe4f99 100644
--- a/src/experiments/nanojpeg/CMakeLists.txt
+++ b/src/experiments/nanojpeg/CMakeLists.txt
@@ -39,7 +39,8 @@ link_directories(${LIBUDIS86_LINK_DIRS})
 
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/rampage/CMakeLists.txt b/src/experiments/rampage/CMakeLists.txt
index e06f9396..8c461281 100644
--- a/src/experiments/rampage/CMakeLists.txt
+++ b/src/experiments/rampage/CMakeLists.txt
@@ -27,6 +27,7 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/tracing-test/CMakeLists.txt b/src/experiments/tracing-test/CMakeLists.txt
index fe8c210f..bfe7d9b0 100644
--- a/src/experiments/tracing-test/CMakeLists.txt
+++ b/src/experiments/tracing-test/CMakeLists.txt
@@ -14,4 +14,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing)
diff --git a/src/experiments/vezs-example/CMakeLists.txt b/src/experiments/vezs-example/CMakeLists.txt
index 071ad8e6..81320d74 100644
--- a/src/experiments/vezs-example/CMakeLists.txt
+++ b/src/experiments/vezs-example/CMakeLists.txt
@@ -26,6 +26,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
 add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/weather-monitor-gem5/CMakeLists.txt b/src/experiments/weather-monitor-gem5/CMakeLists.txt
index 2ba91b8a..659f9e19 100644
--- a/src/experiments/weather-monitor-gem5/CMakeLists.txt
+++ b/src/experiments/weather-monitor-gem5/CMakeLists.txt
@@ -26,7 +26,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/experiments/weather-monitor/CMakeLists.txt b/src/experiments/weather-monitor/CMakeLists.txt
index f82508ae..0d95b4ac 100644
--- a/src/experiments/weather-monitor/CMakeLists.txt
+++ b/src/experiments/weather-monitor/CMakeLists.txt
@@ -26,7 +26,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
 
 ## Build library
 add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-comm)
+target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm)
 target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY})
 
 ## This is the example's campaign server distributing experiment parameters
diff --git a/src/plugins/tracing/CMakeLists.txt b/src/plugins/tracing/CMakeLists.txt
index f1dbd2d9..d37dc373 100644
--- a/src/plugins/tracing/CMakeLists.txt
+++ b/src/plugins/tracing/CMakeLists.txt
@@ -9,5 +9,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 ## Build library
 add_library(fail-${PLUGIN_NAME} ${MY_PLUGIN_SRCS})
 add_dependencies(fail-${PLUGIN_NAME} fail-comm)
-target_link_libraries(fail-${PLUGIN_NAME})
-
+target_link_libraries(fail-${PLUGIN_NAME} fail-sal fail-cpn fail-efw fail-comm)