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

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})

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)

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})

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)

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']

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})