This turns the three libraries into a single library, as is more
customary for a UNIX software package. A check was added so that the
IRMd does not try to contact itself.
Signed-off-by: Sander Vrijders <sander.vrijders@xxxxxxxx>
---
CMakeLists.txt | 21 ++++------
doc/man/fccntl.3 | 2 +-
doc/man/flow_alloc.3 | 2 +-
doc/man/flow_read.3 | 2 +-
doc/man/fqueue.3 | 2 +-
doc/man/fset.3 | 2 +-
include/ouroboros/wrap/CMakeLists.txt | 3 +-
ouroboros-dev.pc.in | 12 ------
ouroboros-irm.pc.in => ouroboros.pc.in | 6 +--
irmd.service.in => ouroboros.service.in | 2 +-
src/ipcpd/broadcast/CMakeLists.txt | 2 +-
src/ipcpd/eth/CMakeLists.txt | 4 +-
src/ipcpd/local/CMakeLists.txt | 2 +-
src/ipcpd/normal/CMakeLists.txt | 2 +-
src/ipcpd/normal/pol/tests/CMakeLists.txt | 2 +-
src/ipcpd/normal/tests/CMakeLists.txt | 2 +-
src/ipcpd/raptor/CMakeLists.txt | 2 +-
src/ipcpd/udp/CMakeLists.txt | 2 +-
src/irmd/CMakeLists.txt | 8 ++--
src/lib/CMakeLists.txt | 50 ++++++-----------------
src/lib/config.h.in | 2 +
src/lib/dev.c | 5 ++-
src/lib/tests/CMakeLists.txt | 2 +-
src/tools/irm/CMakeLists.txt | 2 +-
src/tools/obc/CMakeLists.txt | 2 +-
src/tools/ocbr/CMakeLists.txt | 2 +-
src/tools/oecho/CMakeLists.txt | 2 +-
src/tools/operf/CMakeLists.txt | 2 +-
src/tools/oping/CMakeLists.txt | 2 +-
src/tools/ovpn/CMakeLists.txt | 2 +-
30 files changed, 59 insertions(+), 94 deletions(-)
delete mode 100644 ouroboros-dev.pc.in
rename ouroboros-irm.pc.in => ouroboros.pc.in (65%)
rename irmd.service.in => ouroboros.service.in (51%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24e025d..e1b93c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,23 +98,17 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "DebugLSan")
test_and_set_c_compiler_flag_global(-fsanitize=leak)
endif ()
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ouroboros-dev.pc.in"
- "${CMAKE_CURRENT_BINARY_DIR}/ouroboros-dev.pc" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ouroboros.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/ouroboros.pc" @ONLY)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ouroboros-irm.pc.in"
- "${CMAKE_CURRENT_BINARY_DIR}/ouroboros-irm.pc" @ONLY)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ouroboros-dev.pc"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ouroboros-irm.pc"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ouroboros.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
if (IS_DIRECTORY "/usr/lib/systemd")
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/irmd.service.in"
- "${CMAKE_CURRENT_BINARY_DIR}/irmd.service" @ONLY)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ouroboros.service.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/ouroboros.service" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/irmd.service"
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ouroboros.service"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/systemd/system")
endif ()
@@ -129,6 +123,9 @@ if (NOT (PROTOBUF_C_INCLUDE_DIRS AND PROTOBUF_C_LIBRARY
endif ()
include_directories(${PROTOBUF_C_INCLUDE_DIRS})
+# Set name for the IPC Resource Manager
+set(IRMD_TARGET irmd CACHE INTERNAL "")
+
add_subdirectory(include)
add_subdirectory(src)
add_subdirectory(doc)
diff --git a/doc/man/fccntl.3 b/doc/man/fccntl.3
index a738a8f..01ff219 100644
--- a/doc/man/fccntl.3
+++ b/doc/man/fccntl.3
@@ -14,7 +14,7 @@ fccntl \- control commands for flows and FRCT connections
\fBint fccntl(int \fIfd\fB, int \fIcmd\fB, ...);
-Compile and link with \fI-louroboros-dev\fR.
+Compile and link with \fI-louroboros\fR.
.SH DESCRIPTION
diff --git a/doc/man/flow_alloc.3 b/doc/man/flow_alloc.3
index 8a21eda..4aad28b 100644
--- a/doc/man/flow_alloc.3
+++ b/doc/man/flow_alloc.3
@@ -21,7 +21,7 @@ const struct timespec * \fItimeo\fB);
\fBint flow_dealloc(int \fIfd\fB);\fR
-Compile and link with \fI-louroboros-dev\fR.
+Compile and link with \fI-louroboros\fR.
.SH DESCRIPTION
diff --git a/doc/man/flow_read.3 b/doc/man/flow_read.3
index 20f5b97..d7eb555 100644
--- a/doc/man/flow_read.3
+++ b/doc/man/flow_read.3
@@ -16,7 +16,7 @@ flow_read, flow_write \- read and write from/to a flow
\fBint flow_write(int \fIfd\fB, const void * \fIbuf\fB, size_t \fIcount\fB);\fR
-Compile and link with \fI-louroboros-dev\fR.
+Compile and link with \fI-louroboros\fR.
.SH DESCRIPTION
diff --git a/doc/man/fqueue.3 b/doc/man/fqueue.3
index abd21cf..2888337 100644
--- a/doc/man/fqueue.3
+++ b/doc/man/fqueue.3
@@ -24,7 +24,7 @@ on flows
\fBint fevent(fset_t * \fIset\fB, fqueue_t * \fIfq\fB,
const struct timespec * \fItimeo\fB);
-Compile and link with \fI-louroboros-dev\fR.
+Compile and link with \fI-louroboros\fR.
.SH DESCRIPTION
diff --git a/doc/man/fset.3 b/doc/man/fset.3
index a209415..2e0ae15 100644
--- a/doc/man/fset.3
+++ b/doc/man/fset.3
@@ -25,7 +25,7 @@ manipulation of a set of flow descriptors
\fBbool fset_has(fset_t * \fIset\fB, int \fIfd\fB);
-Compile and link with \fI-louroboros-dev\fR.
+Compile and link with \fI-louroboros\fR.
.SH DESCRIPTION
diff --git a/include/ouroboros/wrap/CMakeLists.txt
b/include/ouroboros/wrap/CMakeLists.txt
index abcd1ce..f77f087 100644
--- a/include/ouroboros/wrap/CMakeLists.txt
+++ b/include/ouroboros/wrap/CMakeLists.txt
@@ -35,8 +35,7 @@ else ()
TYPE MODULE)
endif()
- swig_link_libraries(ouroboros ${PYTHON_LIBRARIES} ouroboros-common
- ouroboros-dev ouroboros-irm)
+ swig_link_libraries(ouroboros ${PYTHON_LIBRARIES} ouroboros)
# Installation directives
if (CMAKE_INSTALL_PREFIX STREQUAL "")
diff --git a/ouroboros-dev.pc.in b/ouroboros-dev.pc.in
deleted file mode 100644
index 8895a76..0000000
--- a/ouroboros-dev.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/usr/lib
-includedir=${prefix}/usr/include
-
-Name: ouroboros-dev
-Description: Development library for Ouroboros
-URL: @PACKAGE_URL@
-Version: @PACKAGE_VERSION@
-
-Libs: -L${libdir} -louroboros-dev
-Cflags: -I${includedir}
diff --git a/ouroboros-irm.pc.in b/ouroboros.pc.in
similarity index 65%
rename from ouroboros-irm.pc.in
rename to ouroboros.pc.in
index 5e5841c..675fdfc 100644
--- a/ouroboros-irm.pc.in
+++ b/ouroboros.pc.in
@@ -3,10 +3,10 @@ exec_prefix=${prefix}
libdir=${exec_prefix}/usr/lib
includedir=${prefix}/usr/include
-Name: ouroboros-irm
-Description: Management library for Ouroboros
+Name: ouroboros
+Description: Ouroboros library
URL: @PACKAGE_URL@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -louroboros-irm
+Libs: -L${libdir} -louroboros
Cflags: -I${includedir}
diff --git a/irmd.service.in b/ouroboros.service.in
similarity index 51%
rename from irmd.service.in
rename to ouroboros.service.in
index e6dc006..1e8c774 100644
--- a/irmd.service.in
+++ b/ouroboros.service.in
@@ -1,5 +1,5 @@
[Unit]
-Description=Ouroboros IPC Resource Manager Daemon
+Description=Ouroboros, an IPC subsystem
[Service]
ExecStart=@CMAKE_INSTALL_PREFIX@/sbin/irmd
diff --git a/src/ipcpd/broadcast/CMakeLists.txt
b/src/ipcpd/broadcast/CMakeLists.txt
index afcc869..d33ff1d 100644
--- a/src/ipcpd/broadcast/CMakeLists.txt
+++ b/src/ipcpd/broadcast/CMakeLists.txt
@@ -24,7 +24,7 @@ set(SOURCE_FILES
add_executable(ipcpd-broadcast ${SOURCE_FILES} ${IPCP_SOURCES}
${LAYER_CONFIG_PROTO_SRCS})
-target_link_libraries(ipcpd-broadcast LINK_PUBLIC ouroboros-dev)
+target_link_libraries(ipcpd-broadcast LINK_PUBLIC ouroboros)
include(AddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES "Debug*")
diff --git a/src/ipcpd/eth/CMakeLists.txt b/src/ipcpd/eth/CMakeLists.txt
index e4acdb7..07b4f38 100644
--- a/src/ipcpd/eth/CMakeLists.txt
+++ b/src/ipcpd/eth/CMakeLists.txt
@@ -113,8 +113,8 @@ if (HAVE_ETH)
${NETMAP_C_INCLUDE_DIR})
endif ()
- target_link_libraries(ipcpd-eth-llc LINK_PUBLIC ouroboros-dev)
- target_link_libraries(ipcpd-eth-dix LINK_PUBLIC ouroboros-dev)
+ target_link_libraries(ipcpd-eth-llc LINK_PUBLIC ouroboros)
+ target_link_libraries(ipcpd-eth-dix LINK_PUBLIC ouroboros)
include(AddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES "Debug*")
diff --git a/src/ipcpd/local/CMakeLists.txt b/src/ipcpd/local/CMakeLists.txt
index a84f4f1..9b1255e 100644
--- a/src/ipcpd/local/CMakeLists.txt
+++ b/src/ipcpd/local/CMakeLists.txt
@@ -19,7 +19,7 @@ set(LOCAL_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/main.c)
add_executable(ipcpd-local ${LOCAL_SOURCES} ${IPCP_SOURCES})
-target_link_libraries(ipcpd-local LINK_PUBLIC ouroboros-common ouroboros-dev)
+target_link_libraries(ipcpd-local LINK_PUBLIC ouroboros)
include(AddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES "Debug*")
diff --git a/src/ipcpd/normal/CMakeLists.txt b/src/ipcpd/normal/CMakeLists.txt
index d158539..ad32e99 100644
--- a/src/ipcpd/normal/CMakeLists.txt
+++ b/src/ipcpd/normal/CMakeLists.txt
@@ -53,7 +53,7 @@ set(SOURCE_FILES
add_executable(ipcpd-normal ${SOURCE_FILES} ${IPCP_SOURCES}
${KAD_PROTO_SRCS} ${LAYER_CONFIG_PROTO_SRCS})
-target_link_libraries(ipcpd-normal LINK_PUBLIC ouroboros-dev)
+target_link_libraries(ipcpd-normal LINK_PUBLIC ouroboros)
include(AddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES "Debug*")
diff --git a/src/ipcpd/normal/pol/tests/CMakeLists.txt
b/src/ipcpd/normal/pol/tests/CMakeLists.txt
index d065253..55ca425 100644
--- a/src/ipcpd/normal/pol/tests/CMakeLists.txt
+++ b/src/ipcpd/normal/pol/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ create_test_sourcelist(${PARENT_DIR}_tests test_suite.c
)
add_executable(${PARENT_DIR}_test EXCLUDE_FROM_ALL ${${PARENT_DIR}_tests})
-target_link_libraries(${PARENT_DIR}_test ouroboros-common)
+target_link_libraries(${PARENT_DIR}_test ouroboros)
add_dependencies(check ${PARENT_DIR}_test)
diff --git a/src/ipcpd/normal/tests/CMakeLists.txt
b/src/ipcpd/normal/tests/CMakeLists.txt
index 482711d..87589bd 100644
--- a/src/ipcpd/normal/tests/CMakeLists.txt
+++ b/src/ipcpd/normal/tests/CMakeLists.txt
@@ -24,7 +24,7 @@ protobuf_generate_c(KAD_PROTO_SRCS KAD_PROTO_HDRS
../kademlia.proto)
add_executable(${PARENT_DIR}_test EXCLUDE_FROM_ALL ${${PARENT_DIR}_tests}
${KAD_PROTO_SRCS})
-target_link_libraries(${PARENT_DIR}_test ouroboros-common)
+target_link_libraries(${PARENT_DIR}_test ouroboros)
add_dependencies(check ${PARENT_DIR}_test)
diff --git a/src/ipcpd/raptor/CMakeLists.txt b/src/ipcpd/raptor/CMakeLists.txt
index 1883d9b..8154987 100644
--- a/src/ipcpd/raptor/CMakeLists.txt
+++ b/src/ipcpd/raptor/CMakeLists.txt
@@ -35,7 +35,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
${CMAKE_CURRENT_SOURCE_DIR}/main.c)
add_executable(ipcpd-raptor ${RAPTOR_SOURCES} ${IPCP_SOURCES})
- target_link_libraries(ipcpd-raptor LINK_PUBLIC ouroboros-dev)
+ target_link_libraries(ipcpd-raptor LINK_PUBLIC ouroboros)
include(AddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES "Debug*")
diff --git a/src/ipcpd/udp/CMakeLists.txt b/src/ipcpd/udp/CMakeLists.txt
index b21afe7..f8a70ba 100644
--- a/src/ipcpd/udp/CMakeLists.txt
+++ b/src/ipcpd/udp/CMakeLists.txt
@@ -19,7 +19,7 @@ set(UDP_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/main.c)
add_executable(ipcpd-udp ${UDP_SOURCES} ${IPCP_SOURCES})
-target_link_libraries(ipcpd-udp LINK_PUBLIC ouroboros-dev)
+target_link_libraries(ipcpd-udp LINK_PUBLIC ouroboros)
# Find the nsupdate executable
find_program(NSUPDATE_EXECUTABLE
diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt
index 59d0d10..04ce222 100644
--- a/src/irmd/CMakeLists.txt
+++ b/src/irmd/CMakeLists.txt
@@ -37,16 +37,16 @@ set(SOURCE_FILES
utils.c
)
-add_executable (irmd ${SOURCE_FILES})
+add_executable (${IRMD_TARGET} ${SOURCE_FILES})
-target_link_libraries (irmd LINK_PUBLIC ouroboros-common)
+target_link_libraries (${IRMD_TARGET} LINK_PUBLIC ouroboros)
include(AddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES "Debug*")
- add_compile_flags(irmd -DCONFIG_OUROBOROS_DEBUG)
+ add_compile_flags(${IRMD_TARGET} -DCONFIG_OUROBOROS_DEBUG)
endif ()
-install(TARGETS irmd RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
+install(TARGETS ${IRMD_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
# Enable once irmd has tests
# add_subdirectory(tests)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index c18860a..e5cb6eb 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -179,22 +179,15 @@ set(SHM_RBUFF_LOCKLESS 0 CACHE BOOL
set(QOS_DISABLE_CRC TRUE CACHE BOOL
"Ignores ber setting on all QoS cubes")
-set(SOURCE_FILES_DEV
- # Add source files here
- cacep.c
- dev.c
- )
-
-set(SOURCE_FILES_IRM
- irm.c
-)
-
-set(SOURCE_FILES_COMMON
+set(SOURCE_FILES
bitmap.c
btree.c
+ cacep.c
crc32.c
+ dev.c
hash.c
hashtable.c
+ irm.c
list.c
lockfile.c
logs.c
@@ -215,39 +208,22 @@ set(SOURCE_FILES_COMMON
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
-add_library(ouroboros-common SHARED ${SOURCE_FILES_COMMON} ${IRM_PROTO_SRCS}
- ${IPCP_PROTO_SRCS} ${LAYER_CONFIG_PROTO_SRCS} ${QOSSPEC_PROTO_SRCS})
-
-add_library(ouroboros-dev SHARED ${SOURCE_FILES_DEV} ${CACEP_PROTO_SRCS})
-
-add_library(ouroboros-irm SHARED ${SOURCE_FILES_IRM})
+add_library(ouroboros SHARED ${SOURCE_FILES} ${IRM_PROTO_SRCS}
+ ${IPCP_PROTO_SRCS} ${LAYER_CONFIG_PROTO_SRCS} ${QOSSPEC_PROTO_SRCS}
+ ${CACEP_PROTO_SRCS})
include(AddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES "Debug*")
- add_compile_flags(ouroboros-common -DCONFIG_OUROBOROS_DEBUG)
- add_compile_flags(ouroboros-dev -DCONFIG_OUROBOROS_DEBUG)
- add_compile_flags(ouroboros-irm -DCONFIG_OUROBOROS_DEBUG)
+ add_compile_flags(ouroboros -DCONFIG_OUROBOROS_DEBUG)
endif ()
-target_link_libraries(ouroboros-common ${LIBRT_LIBRARIES}
- ${LIBPTHREAD_LIBRARIES} ${PROTOBUF_C_LIBRARY} ${OPENSSL_LIBRARIES}
- ${LIBGCRYPT_LIBRARIES} ${FUSE_LIBRARIES})
-
-target_link_libraries(ouroboros-dev ouroboros-common)
-
-target_link_libraries(ouroboros-irm ouroboros-common)
+target_link_libraries(ouroboros ${LIBRT_LIBRARIES} ${LIBPTHREAD_LIBRARIES}
+ ${PROTOBUF_C_LIBRARY} ${OPENSSL_LIBRARIES} ${LIBGCRYPT_LIBRARIES}
+ ${FUSE_LIBRARIES})
-install(TARGETS ouroboros-common LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(TARGETS ouroboros-dev LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(TARGETS ouroboros-irm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-target_include_directories(ouroboros-common PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
- ${SYS_RND_HDR} ${LIBGCRYPT_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
-
-target_include_directories(ouroboros-dev PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
- ${SYS_RND_HDR} ${LIBGCRYPT_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
+install(TARGETS ouroboros LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-target_include_directories(ouroboros-irm PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
+target_include_directories(ouroboros PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
${SYS_RND_HDR} ${LIBGCRYPT_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
add_subdirectory(tests)
diff --git a/src/lib/config.h.in b/src/lib/config.h.in
index e8cfeba..66ed22c 100644
--- a/src/lib/config.h.in
+++ b/src/lib/config.h.in
@@ -60,3 +60,5 @@
#define DU_BUFF_HEADSPACE @DU_BUFF_HEADSPACE@
#define DU_BUFF_TAILSPACE @DU_BUFF_TAILSPACE@
+
+#define IRMD_EXEC "@IRMD_TARGET@"
diff --git a/src/lib/dev.c b/src/lib/dev.c
index 42eed7e..6e0d1d4 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -344,6 +344,9 @@ static void init(int argc,
if (check_python(argv[0]))
prog = argv[1];
+ if (strcmp(argv[0], IRMD_EXEC) == 0)
+ return;
+
ai.pid = getpid();
#ifdef HAVE_LIBGCRYPT
if (!gcry_check_version(GCRYPT_VERSION))
@@ -432,7 +435,7 @@ static void init(int argc,
fail_fqueues:
bmp_destroy(ai.fds);
fail_fds:
- fprintf(stderr, "FATAL: ouroboros-dev init failed. "
+ fprintf(stderr, "FATAL: ouroboros init failed. "
"Make sure an IRMd is running.\n\n");
memset(&ai, 0, sizeof(ai));
exit(EXIT_FAILURE);
diff --git a/src/lib/tests/CMakeLists.txt b/src/lib/tests/CMakeLists.txt
index cc51c20..bc1373c 100644
--- a/src/lib/tests/CMakeLists.txt
+++ b/src/lib/tests/CMakeLists.txt
@@ -14,7 +14,7 @@ create_test_sourcelist(${PARENT_DIR}_tests test_suite.c
add_executable(${PARENT_DIR}_test EXCLUDE_FROM_ALL ${${PARENT_DIR}_tests})
-target_link_libraries(${PARENT_DIR}_test ouroboros-common)
+target_link_libraries(${PARENT_DIR}_test ouroboros)
add_dependencies(check ${PARENT_DIR}_test)
diff --git a/src/tools/irm/CMakeLists.txt b/src/tools/irm/CMakeLists.txt
index ca32e9c..e72b2fc 100644
--- a/src/tools/irm/CMakeLists.txt
+++ b/src/tools/irm/CMakeLists.txt
@@ -30,6 +30,6 @@ set(SOURCE_FILES
add_executable(irm ${SOURCE_FILES})
-target_link_libraries(irm LINK_PUBLIC ouroboros-irm)
+target_link_libraries(irm LINK_PUBLIC ouroboros)
install(TARGETS irm RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
diff --git a/src/tools/obc/CMakeLists.txt b/src/tools/obc/CMakeLists.txt
index db5e999..0b61cc3 100644
--- a/src/tools/obc/CMakeLists.txt
+++ b/src/tools/obc/CMakeLists.txt
@@ -11,6 +11,6 @@ set(SOURCE_FILES
add_executable(obc ${SOURCE_FILES})
-target_link_libraries(obc LINK_PUBLIC ouroboros-dev)
+target_link_libraries(obc LINK_PUBLIC ouroboros)
install(TARGETS obc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/ocbr/CMakeLists.txt b/src/tools/ocbr/CMakeLists.txt
index 5dac3e6..ec193c0 100644
--- a/src/tools/ocbr/CMakeLists.txt
+++ b/src/tools/ocbr/CMakeLists.txt
@@ -11,6 +11,6 @@ set(SOURCE_FILES
add_executable(ocbr ${SOURCE_FILES})
-target_link_libraries(ocbr LINK_PUBLIC ouroboros-dev)
+target_link_libraries(ocbr LINK_PUBLIC ouroboros)
install(TARGETS ocbr RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/oecho/CMakeLists.txt b/src/tools/oecho/CMakeLists.txt
index 50a6613..b2258c8 100644
--- a/src/tools/oecho/CMakeLists.txt
+++ b/src/tools/oecho/CMakeLists.txt
@@ -11,6 +11,6 @@ set(SOURCE_FILES
add_executable(oecho ${SOURCE_FILES})
-target_link_libraries(oecho LINK_PUBLIC ouroboros-dev)
+target_link_libraries(oecho LINK_PUBLIC ouroboros)
install(TARGETS oecho RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/operf/CMakeLists.txt b/src/tools/operf/CMakeLists.txt
index b6faf04..f4023a4 100644
--- a/src/tools/operf/CMakeLists.txt
+++ b/src/tools/operf/CMakeLists.txt
@@ -21,6 +21,6 @@ set(SOURCE_FILES
add_executable(operf ${SOURCE_FILES})
-target_link_libraries(operf LINK_PUBLIC ${LIBM_LIBRARIES} ouroboros-dev)
+target_link_libraries(operf LINK_PUBLIC ${LIBM_LIBRARIES} ouroboros)
install(TARGETS operf RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/oping/CMakeLists.txt b/src/tools/oping/CMakeLists.txt
index 31a4f96..3a0b0e4 100644
--- a/src/tools/oping/CMakeLists.txt
+++ b/src/tools/oping/CMakeLists.txt
@@ -23,6 +23,6 @@ set(SOURCE_FILES
add_executable(oping ${SOURCE_FILES})
-target_link_libraries(oping LINK_PUBLIC ${LIBM_LIBRARIES} ouroboros-dev)
+target_link_libraries(oping LINK_PUBLIC ${LIBM_LIBRARIES} ouroboros)
install(TARGETS oping RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/tools/ovpn/CMakeLists.txt b/src/tools/ovpn/CMakeLists.txt
index f3a2cac..3431010 100644
--- a/src/tools/ovpn/CMakeLists.txt
+++ b/src/tools/ovpn/CMakeLists.txt
@@ -16,6 +16,6 @@ set(SOURCE_FILES
add_executable(ovpn ${SOURCE_FILES})
-target_link_libraries(ovpn LINK_PUBLIC ouroboros-dev)
+target_link_libraries(ovpn LINK_PUBLIC ouroboros)
install(TARGETS ovpn RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--
2.20.0
