Split mediachanger code into a common part and server-side only part

castor/CMakeLists.txt

@@ -20,10 +20,10 @@
 cmake_minimum_required (VERSION 2.6)
 
 add_subdirectory (legacymsg)
+add_subdirectory (mediachanger)
 add_subdirectory (utils)
 
 if (${COMPILE_SERVER} STREQUAL "1")
-  add_subdirectory (mediachanger)
   add_subdirectory (messages)
   add_subdirectory (db)
   add_subdirectory (gc)

castor/legacymsg/CMakeLists.txt

@@ -75,7 +75,6 @@ add_library (castorlegacymsg SHARED ${CASTOR_LEGACYMSG_LIB_SRC_FILES})
 CastorSetLibraryVersions (castorlegacymsg)
 target_link_libraries (castorlegacymsg
   castorclient
-  castorcommon
-  castormediachangerclient)
+  castorcommon)
 install (TARGETS castorlegacymsg LIBRARY DESTINATION ${CASTOR_DEST_LIB_DIR}
   NAMELINK_SKIP)

castor/mediachanger/CMakeLists.txt

@@ -19,7 +19,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 
-set (MEDIA_CHANGER_CLIENT_LIB_SRC_FILES
+set (MEDIA_CHANGER_LIB_SRC_FILES
   AcsLibrarySlot.cpp
   GenericLibrarySlot.cpp
   ManualLibrarySlot.cpp
@@ -29,32 +29,33 @@ set (MEDIA_CHANGER_CLIENT_LIB_SRC_FILES
   MmcProxyLog.cpp
   ScsiLibrarySlot.cpp
   TapeLibraryType.cpp)
-add_library(castormediachangerclient
-  ${MEDIA_CHANGER_CLIENT_LIB_SRC_FILES})
+add_library(castormediachanger ${MEDIA_CHANGER_LIB_SRC_FILES})
 
-##############################################################################
-# Rules to build and install castor-tape-mediachanger-mount
-##############################################################################
-set (MEDIA_CHANGER_MOUNT_SRC_FILES
-  CmdLine.cpp
-  CmdLineTool.cpp
-  MountCmd.cpp
-  MountCmdLine.cpp
-  MountCmdMain.cpp)
-add_executable (castor-tape-mediachanger-mount ${MEDIA_CHANGER_MOUNT_SRC_FILES})
-set_target_properties (castor-tape-mediachanger-mount PROPERTIES
-  COMPILE_FLAGS -I/usr/include/CDK
-  COMPILE_DEFINITIONS LINUX)
-target_link_libraries (castor-tape-mediachanger-mount
-  castorcommon
-  castorlegacymsg
-  castorlog
-  castormediachangerclient
-  castormessages
-  castorutils
-  ${STK_API_LIB}
-  ${STK_UTL_LIB}
-  ${STK_IPC_LIB}
-  ${STK_CL_LIB})
-install (TARGETS castor-tape-mediachanger-mount DESTINATION ${CASTOR_DEST_BIN_DIR})
-CastorInstallExeManPage(castor-tape-mediachanger-mount)
+if (${COMPILE_SERVER} STREQUAL "1")
+  ##############################################################################
+  # Rules to build and install castor-tape-mediachanger-mount
+  ##############################################################################
+  set (MEDIA_CHANGER_MOUNT_SRC_FILES
+    CmdLine.cpp
+    CmdLineTool.cpp
+    MountCmd.cpp
+    MountCmdLine.cpp
+    MountCmdMain.cpp)
+  add_executable (castor-tape-mediachanger-mount ${MEDIA_CHANGER_MOUNT_SRC_FILES})
+  set_target_properties (castor-tape-mediachanger-mount PROPERTIES
+    COMPILE_FLAGS -I/usr/include/CDK
+    COMPILE_DEFINITIONS LINUX)
+  target_link_libraries (castor-tape-mediachanger-mount
+    castorcommon
+    castorlegacymsg
+    castorlog
+    castormediachanger
+    castormessages
+    castorutils
+    ${STK_API_LIB}
+    ${STK_UTL_LIB}
+    ${STK_IPC_LIB}
+    ${STK_CL_LIB})
+  install (TARGETS castor-tape-mediachanger-mount DESTINATION ${CASTOR_DEST_BIN_DIR})
+  CastorInstallExeManPage(castor-tape-mediachanger-mount)
+endif (${COMPILE_SERVER} STREQUAL "1")

castor/messages/CMakeLists.txt

@@ -65,7 +65,7 @@ add_library(castormessages SHARED
 
 target_link_libraries(castormessages
   castorlog
-  castormediachangerclient
+  castormediachanger
   protobuf
   ssl
   zmq)

castor/tape/label/CMakeLists.txt

@@ -32,6 +32,6 @@ add_executable (castor-tape-label ${LABEL_SRC_FILES})
 target_link_libraries (castor-tape-label
   castorclient
   castorlegacymsg
-  castormediachangerclient)
+  castormediachanger)
 install (TARGETS castor-tape-label DESTINATION ${CASTOR_DEST_BIN_DIR})
 CastorInstallExeManPage (castor-tape-label)

castor/tape/tapeserver/drive/CMakeLists.txt

@@ -6,7 +6,7 @@ add_executable(TapeDriveReadWriteTest
   TapeDriveReadWriteTest.cpp)
 target_link_libraries(TapeDriveReadWriteTest
   TapeDrive
-  castormediachangerclient
+  castormediachanger
   SCSI
   System
   Utils