Rearrange libraries and build files.
This is the first change in an attempt to arrange the linking so that more errors are detected at link-time. - All files in server/core but for gateway.c are linked to one shared library called maxscale-common. - The files log_manager/log_manager.cc and utils/skygw_utils.cc are built into maxscale-common as well. - MaxScale itself consists now only of gateway.c and is linked with maxscale-common. - All plugins link with maxscale-common. - All executables link in addition with {EMBEDDED_LIB}. After this change, the change (MXS-517) where query_classifier is the only component that uses ${EMBEDDED_LIB} and the rest mysqlclient can be made much cleaner. After a few additional steps, all shared libraries can be linked with the linker flags "-Wl,-z,defs", which directs the linker to resolve all symbols. That will require that all shared libraries list all the libraries they need, but will at the same time ensure that any missing symbols are detected at link-time and not at run-time.
This commit is contained in:
@ -1,24 +1,24 @@
|
||||
add_library(mysqlmon SHARED mysql_mon.c)
|
||||
target_link_libraries(mysqlmon log_manager)
|
||||
target_link_libraries(mysqlmon maxscale-common)
|
||||
add_dependencies(mysqlmon pcre2)
|
||||
set_target_properties(mysqlmon PROPERTIES VERSION "1.4.0")
|
||||
install(TARGETS mysqlmon DESTINATION ${MAXSCALE_LIBDIR})
|
||||
|
||||
add_library(galeramon SHARED galeramon.c)
|
||||
target_link_libraries(galeramon log_manager)
|
||||
target_link_libraries(galeramon maxscale-common)
|
||||
add_dependencies(galeramon pcre2)
|
||||
set_target_properties(galeramon PROPERTIES VERSION "2.0.0")
|
||||
install(TARGETS galeramon DESTINATION ${MAXSCALE_LIBDIR})
|
||||
|
||||
add_library(ndbclustermon SHARED ndbclustermon.c)
|
||||
target_link_libraries(ndbclustermon log_manager)
|
||||
target_link_libraries(ndbclustermon maxscale-common)
|
||||
add_dependencies(ndbclustermon pcre2)
|
||||
set_target_properties(ndbclustermon PROPERTIES VERSION "2.1.0")
|
||||
install(TARGETS ndbclustermon DESTINATION ${MAXSCALE_LIBDIR})
|
||||
|
||||
if(BUILD_MMMON)
|
||||
add_library(mmmon SHARED mmmon.c)
|
||||
target_link_libraries(mmmon log_manager)
|
||||
target_link_libraries(mmmon maxscale-common)
|
||||
add_dependencies(mmmon pcre2)
|
||||
set_target_properties(mmmon PROPERTIES VERSION "1.1.1")
|
||||
install(TARGETS mmmon DESTINATION ${MAXSCALE_LIBDIR})
|
||||
|
Reference in New Issue
Block a user