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
This commit is contained in:
hsc
2012-09-12 07:52:30 +00:00
parent 5dc0b5a343
commit f9c96ddf2d
26 changed files with 52 additions and 50 deletions

View File

@ -44,7 +44,7 @@ endif(BUILD_BOCHS)
## Additional Compiler flags ## ## Additional Compiler flags ##
set(CMAKE_C_FLAGS "-g -Wall") set(CMAKE_C_FLAGS "-g -Wall")
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
## Tell the linker where to find the libfail.a ## Tell the linker where to find the Fail* libraries
link_directories("${LIBRARY_OUTPUT_PATH}") link_directories("${LIBRARY_OUTPUT_PATH}")
# Add "simulators"-directory to the include path. This allows # Add "simulators"-directory to the include path. This allows

View File

@ -7,9 +7,9 @@ set(SRCS
) )
add_executable(ovp_cortexM3 ${SRCS}) add_executable(ovp_cortexM3 ${SRCS})
add_dependencies(ovp_cortexM3 ovpstatusmessages ) add_dependencies(ovp_cortexM3 fail-ovpstatusmessages )
target_link_libraries(ovp_cortexM3 ${SIM_LDFLAGS} sal cpn comm efw util ovpstatusmessages) target_link_libraries(ovp_cortexM3 ${SIM_LDFLAGS} fail fail-ovpstatusmessages)
## OVP links all needed shared libraries via a runtimeloader ## OVP links all needed shared libraries via a runtimeloader
set_target_properties(ovp_cortexM3 PROPERTIES LINK_FLAGS "-L${CMAKE_BINARY_DIR}/lib -lpcl -lprotobuf -m32 ") set_target_properties(ovp_cortexM3 PROPERTIES LINK_FLAGS "-L${CMAKE_BINARY_DIR}/lib -lpcl -lprotobuf -m32 ")

View File

@ -4,10 +4,9 @@ set(SRCS
) )
add_definitions("-m32") add_definitions("-m32")
message(STATUS "flaky ld flags: ${HOST_LDFLAGS}") message(STATUS "flaky ld flags: ${HOST_LDFLAGS}")
add_library(flaky SHARED ${SRCS}) add_library(fail-flaky SHARED ${SRCS})
add_dependencies(flaky msg sal) add_dependencies(fail-flaky fail-comm fail-sal)
set_target_properties(flaky PROPERTIES LINK_FLAGS "${HOST_LDFLAGS} -m32") set_target_properties(fail-flaky PROPERTIES LINK_FLAGS "${HOST_LDFLAGS} -m32")
target_link_libraries(flaky ${IMPERAS_VMISTUBS} ${LIBRARY_OUTPUT_PATH}/libsal.a)
target_link_libraries(fail-flaky ${IMPERAS_VMISTUBS} ${LIBRARY_OUTPUT_PATH}/libsal.a)

View File

@ -11,5 +11,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS} ) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS} )
## Build library ## Build library
add_library(ovpstatusmessages ${PROTO_SRCS} ${PROTO_HDRS} ) add_library(fail-ovpstatusmessages ${PROTO_SRCS} ${PROTO_HDRS} )

View File

@ -7,7 +7,7 @@ set(SRCS
platform/platform.cpp platform/platform.cpp
) )
add_executable(ovp ${SRCS}) add_executable(ovp ${SRCS})
add_dependencies(ovp msg) add_dependencies(ovp fail-comm)
target_link_libraries(ovp ${SIM_LDFLAGS} ) target_link_libraries(ovp ${SIM_LDFLAGS} )
## OVP links all needed shared libraries via a runtimeloader ## OVP links all needed shared libraries via a runtimeloader
set_target_properties(ovp PROPERTIES LINK_FLAGS " -m32 ") set_target_properties(ovp PROPERTIES LINK_FLAGS " -m32 ")

View File

@ -33,4 +33,8 @@ add_library(fail dummy.cc)
## -> the Fail* targets and user defined experiment targets ## -> the Fail* targets and user defined experiment targets
# start/end-group: ld must iterate over these archives more than once to figure # start/end-group: ld must iterate over these archives more than once to figure
# out which objects are needed # 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)

View File

@ -16,5 +16,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
add_library(comm ${SRCS} ${PROTO_SRCS} ${PROTO_HDRS}) add_library(fail-comm ${SRCS} ${PROTO_SRCS} ${PROTO_HDRS})
target_link_libraries(comm ${PROTOBUF_LIBRARY}) target_link_libraries(fail-comm ${PROTOBUF_LIBRARY})

View File

@ -3,6 +3,6 @@ set(SRCS
JobServer.cc JobServer.cc
) )
add_library(cpn ${SRCS}) add_library(fail-cpn ${SRCS})
add_dependencies(cpn comm) add_dependencies(fail-cpn fail-comm)

View File

@ -6,10 +6,10 @@ set(SRCS
JobClient.cc JobClient.cc
) )
add_library(efw ${SRCS}) add_library(fail-efw ${SRCS})
add_dependencies(efw comm) add_dependencies(fail-efw fail-comm)
find_package(LibPCL REQUIRED) find_package(LibPCL REQUIRED)
include_directories(${LIBPCL_INCLUDE_DIRS}) include_directories(${LIBPCL_INCLUDE_DIRS})
link_directories(${LIBPCL_LINK_DIRS}) link_directories(${LIBPCL_LINK_DIRS})
target_link_libraries(efw ${LIBPCL_LIBRARIES}) target_link_libraries(fail-efw ${LIBPCL_LIBRARIES})

View File

@ -33,6 +33,6 @@ elseif(BUILD_OVP)
) )
endif(BUILD_BOCHS) endif(BUILD_BOCHS)
add_library(sal ${SRCS}) add_library(fail-sal ${SRCS})
add_dependencies(sal efw) add_dependencies(fail-sal fail-efw)

View File

@ -7,7 +7,7 @@ env.Prepend(CPPPATH=Dir('../../../../../src/core/'))
env.Prepend(CPPPATH=Dir('../../../../../build/src/core/')) env.Prepend(CPPPATH=Dir('../../../../../build/src/core/'))
env.Prepend(LIBPATH=Dir('../../../../../build/lib/')) 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): if (len(gStaticLibs)>0):
linkFlags = ['-Wl,--start-group'] linkFlags = ['-Wl,--start-group']

View File

@ -24,5 +24,5 @@ find_package(Boost 1.42 COMPONENTS thread REQUIRED)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS})
add_library(util ${SRCS}) add_library(fail-util ${SRCS})
target_link_libraries(util ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY}) target_link_libraries(fail-util ${PROTOBUF_LIBRARY} ${Boost_THREAD_LIBRARY})

View File

@ -24,10 +24,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
## Build library ## 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)
## This is the example's campaign server distributing experiment parameters ## This is the example's campaign server distributing experiment parameters
add_executable(${EXPERIMENT_NAME}-server main.cc) 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) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)

View File

@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
## Build library ## 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 ## This is the example's campaign server distributing experiment parameters
add_executable(${EXPERIMENT_NAME}-server main.cc) 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) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)

View File

@ -24,10 +24,10 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
## Build library ## 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)
## This is the example's campaign server distributing experiment parameters ## This is the example's campaign server distributing experiment parameters
add_executable(${EXPERIMENT_NAME}-server main.cc) 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) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)

View File

@ -15,4 +15,4 @@ set(MY_EXPERIMENT_SRCS
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
## build library ## build library
add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})

View File

@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
## build library ## build library
add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})

View File

@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
## build library ## build library
add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})

View File

@ -27,14 +27,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
## Build library ## 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) find_package(LibUdis86 REQUIRED)
include_directories(${LIBUDIS86_INCLUDE_DIRS}) include_directories(${LIBUDIS86_INCLUDE_DIRS})
link_directories(${LIBUDIS86_LINK_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 ## This is the example's campaign server distributing experiment parameters
add_executable(${EXPERIMENT_NAME}-server main.cc) 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) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)

View File

@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
## Build library ## 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 ## This is the example's campaign server distributing experiment parameters
add_executable(${EXPERIMENT_NAME}-server mhcampaign.cc) 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) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)

View File

@ -14,4 +14,4 @@ set(MY_EXPERIMENT_SRCS
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
## build library ## build library
add_library(${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS}) add_library(fail-${EXPERIMENT_NAME} ${MY_EXPERIMENT_SRCS})

View File

@ -12,6 +12,6 @@ set(MY_CAMPAIGN_SRCS
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
## Build library ## 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)

View File

@ -24,9 +24,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
#PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) #PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
## Build library ## 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 ## This is the example's campaign server distributing experiment parameters
#add_executable(${EXPERIMENT_NAME}-server main.cc) #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) #install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)

View File

@ -25,11 +25,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS})
## Build library ## 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 ## This is the example's campaign server distributing experiment parameters
add_executable(${EXPERIMENT_NAME}-server main.cc) 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) install(TARGETS ${EXPERIMENT_NAME}-server RUNTIME DESTINATION bin)

View File

@ -7,4 +7,4 @@ set(MY_PLUGIN_SRCS
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
## Build library ## Build library
add_library(${PLUGIN_NAME} ${MY_PLUGIN_SRCS}) add_library(fail-${PLUGIN_NAME} ${MY_PLUGIN_SRCS})

View File

@ -15,4 +15,4 @@ set(MY_PLUGIN_SRCS
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
## Build library ## 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})