prefix internal libraries to avoid naming conflicts with system libraries

This is a precaution to avoid current and future naming conflicts with common system libraries. libutil (part of libc) is the first, but probably not the last example that already caused trouble twice. git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1614 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
2012-09-12 07:52:30 +00:00
parent 5dc0b5a343
commit f9c96ddf2d
26 changed files with 52 additions and 50 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -33,4 +33,8 @@ add_library(fail dummy.cc)
 ## -> the Fail* targets and user defined experiment targets
 # start/end-group: ld must iterate over these archives more than once to figure
 #                  out which objects are needed
-target_link_libraries(fail -Wl,--start-group ${EXPERIMENTS_ACTIVATED} ${PLUGINS_ACTIVATED} sal cpn efw comm util -Wl,--end-group)
+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 ${experiment_libraries} fail-sal fail-cpn fail-efw fail-comm fail-util -Wl,--end-group)
--- a/src/core/comm/CMakeLists.txt
+++ b/src/core/comm/CMakeLists.txt
@ -16,5 +16,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})

 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

-add_library(comm ${SRCS} ${PROTO_SRCS} ${PROTO_HDRS})
-target_link_libraries(comm ${PROTOBUF_LIBRARY})
+add_library(fail-comm ${SRCS} ${PROTO_SRCS} ${PROTO_HDRS})
+target_link_libraries(fail-comm ${PROTOBUF_LIBRARY})
--- a/src/core/cpn/CMakeLists.txt
+++ b/src/core/cpn/CMakeLists.txt
@ -3,6 +3,6 @@ set(SRCS
 	JobServer.cc
 )

-add_library(cpn ${SRCS})
+add_library(fail-cpn ${SRCS})

-add_dependencies(cpn comm)
+add_dependencies(fail-cpn fail-comm)
--- a/src/core/efw/CMakeLists.txt
+++ b/src/core/efw/CMakeLists.txt
@ -6,10 +6,10 @@ set(SRCS
 	JobClient.cc
 )

-add_library(efw ${SRCS})
-add_dependencies(efw comm)
+add_library(fail-efw ${SRCS})
+add_dependencies(fail-efw fail-comm)

 find_package(LibPCL REQUIRED)
 include_directories(${LIBPCL_INCLUDE_DIRS})
 link_directories(${LIBPCL_LINK_DIRS})
-target_link_libraries(efw ${LIBPCL_LIBRARIES})
+target_link_libraries(fail-efw ${LIBPCL_LIBRARIES})
--- a/src/core/sal/CMakeLists.txt
+++ b/src/core/sal/CMakeLists.txt
@ -33,6 +33,6 @@ elseif(BUILD_OVP)
 	)
 endif(BUILD_BOCHS)

-add_library(sal ${SRCS})
+add_library(fail-sal ${SRCS})

-add_dependencies(sal efw)
+add_dependencies(fail-sal fail-efw)
--- a/src/core/sal/gem5/SConscript
+++ b/src/core/sal/gem5/SConscript
@ -7,7 +7,7 @@ env.Prepend(CPPPATH=Dir('../../../../../src/core/'))
 env.Prepend(CPPPATH=Dir('../../../../../build/src/core/'))

 env.Prepend(LIBPATH=Dir('../../../../../build/lib/'))
-gStaticLibs = ['-lsal', '-lhsc-simple', '-lcomm', '-lcpn', '-lefw', '-lutil', '-lpcl']
+gStaticLibs = ['-lfail-sal', '-lfail-hsc-simple', '-lfail-comm', '-lfail-cpn', '-lfail-efw', '-lfail-util', '-lpcl']

 if (len(gStaticLibs)>0):
 	linkFlags = ['-Wl,--start-group']
--- a/src/core/util/CMakeLists.txt
+++ b/src/core/util/CMakeLists.txt
@ -24,5 +24,5 @@ find_package(Boost 1.42 COMPONENTS thread REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})

-add_library(util ${SRCS})
-target_link_libraries(util ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})
+add_library(fail-util ${SRCS})
+target_link_libraries(fail-util ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})
--- a/src/experiments/checksum-oostubs/CMakeLists.txt
+++ b/src/experiments/checksum-oostubs/CMakeLists.txt
@ -24,10 +24,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
-add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(${EXPERIMENT_NAME} tracing)
+add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
+add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing)

 ## This is the example's campaign server distributing experiment parameters
 add_executable(${EXPERIMENT_NAME}-server main.cc)
-target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
+target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
 install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)
--- a/src/experiments/cool-checksum/CMakeLists.txt
+++ b/src/experiments/cool-checksum/CMakeLists.txt
@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
-add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})

 ## This is the example's campaign server distributing experiment parameters
 add_executable(${EXPERIMENT_NAME}-server main.cc)
-target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
+target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
 install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)
--- a/src/experiments/ecos_kernel_test/CMakeLists.txt
+++ b/src/experiments/ecos_kernel_test/CMakeLists.txt
@ -24,10 +24,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
-add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
-add_dependencies(${EXPERIMENT_NAME} tracing)
+add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
+add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing)

 ## This is the example's campaign server distributing experiment parameters
 add_executable(${EXPERIMENT_NAME}-server main.cc)
-target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
+target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
 install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)
--- a/src/experiments/fault-coverage/CMakeLists.txt
+++ b/src/experiments/fault-coverage/CMakeLists.txt
@ -15,4 +15,4 @@ set(MY_EXPERIMENT_SRCS
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

 ## build library
-add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})
--- a/src/experiments/fire-interrupt/CMakeLists.txt
+++ b/src/experiments/fire-interrupt/CMakeLists.txt
@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

 ## build library
-add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})
--- a/src/experiments/hsc-simple/CMakeLists.txt
+++ b/src/experiments/hsc-simple/CMakeLists.txt
@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

 ## build library
-add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})
--- a/src/experiments/l4-sys/CMakeLists.txt
+++ b/src/experiments/l4-sys/CMakeLists.txt
@ -27,14 +27,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
-add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})

 find_package(LibUdis86 REQUIRED)
 include_directories(${LIBUDIS86_INCLUDE_DIRS})
 link_directories(${LIBUDIS86_LINK_DIRS})
-target_link_libraries(${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES})
+target_link_libraries(fail-${EXPERIMENT_NAME} ${LIBUDIS86_LIBRARIES})

 ## This is the example's campaign server distributing experiment parameters
 add_executable(${EXPERIMENT_NAME}-server main.cc)
-target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
+target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
 install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)
--- a/src/experiments/mh-test-campaign/CMakeLists.txt
+++ b/src/experiments/mh-test-campaign/CMakeLists.txt
@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
-add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})

 ## This is the example's campaign server distributing experiment parameters
 add_executable(${EXPERIMENT_NAME}-server mhcampaign.cc)
-target_link_libraries(${EXPERIMENT_NAME}-server fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
+target_link_libraries(fail-${EXPERIMENT_NAME}-server fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})
 install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)
--- a/src/experiments/regression-test/CMakeLists.txt
+++ b/src/experiments/regression-test/CMakeLists.txt
@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

 ## build library
-add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})
--- a/src/experiments/tracing-test/CMakeLists.txt
+++ b/src/experiments/tracing-test/CMakeLists.txt
@ -12,6 +12,6 @@ set(MY_CAMPAIGN_SRCS
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

 ## Build library
-add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})

-add_dependencies(${EXPERIMENT_NAME} tracing)
+add_dependencies(fail-${EXPERIMENT_NAME} fail-tracing)
--- a/src/experiments/vezs-example/CMakeLists.txt
+++ b/src/experiments/vezs-example/CMakeLists.txt
@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 #PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
-add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})

 ## This is the example's campaign server distributing experiment parameters
 #add_executable(${EXPERIMENT_NAME}-server main.cc)
-#target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
+#target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
 #install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)
--- a/src/experiments/weather-monitor/CMakeLists.txt
+++ b/src/experiments/weather-monitor/CMakeLists.txt
@ -25,11 +25,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})

 ## Build library
-add_library(${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})
+add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS})

-add_dependencies(${EXPERIMENT_NAME} tracing)
+add_dependencies(${EXPERIMENT_NAME} fail-tracing)

 ## This is the example's campaign server distributing experiment parameters
 add_executable(${EXPERIMENT_NAME}-server main.cc)
-target_link_libraries(${EXPERIMENT_NAME}-server ${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
+target_link_libraries(${EXPERIMENT_NAME}-server fail-${EXPERIMENT_NAME} fail ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})   
 install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)
--- a/src/plugins/serialoutput/CMakeLists.txt
+++ b/src/plugins/serialoutput/CMakeLists.txt
@ -7,4 +7,4 @@ set(MY_PLUGIN_SRCS
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

 ## Build library
-add_library(${PLUGIN_NAME} ${MY_PLUGIN_SRCS})
+add_library(fail-${PLUGIN_NAME} ${MY_PLUGIN_SRCS})
--- a/src/plugins/tracing/CMakeLists.txt
+++ b/src/plugins/tracing/CMakeLists.txt
@ -15,4 +15,4 @@ set(MY_PLUGIN_SRCS
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

 ## Build library
-add_library(${PLUGIN_NAME} ${MY_PLUGIN_SRCS} ${PROTO_SRCS} ${PROTO_HDRS})
+add_library(fail-${PLUGIN_NAME} ${MY_PLUGIN_SRCS} ${PROTO_SRCS} ${PROTO_HDRS})