1 files changed, 43 insertions, 95 deletions

diff --git a/mcop/CMakeLists.txt b/mcop/CMakeLists.txt
index 19bc6ee..fe62f9f 100644
--- a/mcop/CMakeLists.txt
+++ b/mcop/CMakeLists.txt
@@ -9,115 +9,63 @@
 #
 #################################################
 
-set( mcop_INCS
-  ${CMAKE_CURRENT_BINARY_DIR}/arts_export.h
-  buffer.h
-  common.h
-  connection.h
-  core.h
-  dispatcher.h
-  factory.h
-  flowsystem.h
-  idlfilereg.h
-  ifacerepo_impl.h
-  iomanager.h
-  mcoputils.h
-  object.h
-  objectmanager.h
-  pool.h
-  socketconnection.h
-  startupmanager.h
-  tcpconnection.h
-  tcpserver.h
-  type.h
-  unixconnection.h
-  unixserver.h
-  referenceclean.h
-  datapacket.h
-  asyncstream.h
-  notification.h
-  extensionloader.h
-  mcopconfig.h
-  connect.h
-  reference.h
-  weakreference.h
-  dynamicrequest.h
-  anyref.h
-  debug.h
-  delayedreturn.h
-  dynamicskeleton.h
-  thread.h
-  core.idl
-)
-
-set( mcop_SRCS
-  buffer.cc
-  connection.cc
-  core.cc
-  debug.cc
-  dispatcher.cc
-  iomanager.cc
-  object.cc
-  socketconnection.cc
-  tcpconnection.cc
-  unixconnection.cc
-  tcpserver.cc
-  unixserver.cc
-  objectmanager.cc
-  factory.cc
-  idlfilereg.cc
-  ifacerepo_impl.cc
-  mcoputils.cc
-  startupmanager.cc
-  md5.c
-  md5auth.cc
-  referenceclean.cc
-  datapacket.cc
-  asyncstream.cc
-  notification.cc
-  flowsystem.cc
-  extensionloader.cc
-  tmpglobalcomm.cc
-  mcopconfig.cc
-  connect.cc
-  reference.cc
-  type.cc
-  trader_impl.cc
-  dynamicrequest.cc
-  anyref.cc
-  loopback.cc
-  delayedreturn.cc
-  thread.cc
-  dynamicskeleton.cc
-)
-
 configure_file( arts_export.h.in arts_export.h )
 
 if( NOT EXTENSION_DIR )
-  set( EXTENSION_DIR \"${CMAKE_INSTALL_PREFIX}/lib\" )
+  set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib )
 endif( NOT EXTENSION_DIR )
 
 if( NOT DTRADER_DIR )
-  set( DTRADER_DIR \"${CMAKE_INSTALL_PREFIX}/lib/mcop\" )
+  set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib/mcop )
 endif( NOT DTRADER_DIR )
 
 add_definitions(
-  -DEXTENSION_DIR=${EXTENSION_DIR}
-  -DTRADER_DIR=${DTRADER_DIR}
+  -DEXTENSION_DIR=\"${EXTENSION_DIR}\"
+  -DTRADER_DIR=\"${DTRADER_DIR}\"
 )
 
 include_directories(
-  ${CMAKE_BINARY_DIR} # for config.h
-  ${CMAKE_CURRENT_BINARY_DIR} # for arts_export.h
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-add_library( mcop SHARED ${mcop_SRCS} )
-target_link_libraries( mcop ltdlc )
-set_target_properties( mcop PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 
-add_dependencies( mcop ltdlc )
+##### headers ###################################
+
+install( FILES
+    buffer.h common.h connection.h core.h dispatcher.h
+    factory.h flowsystem.h idlfilereg.h ifacerepo_impl.h
+    iomanager.h mcoputils.h object.h objectmanager.h
+    pool.h socketconnection.h startupmanager.h tcpconnection.h
+    tcpserver.h type.h unixconnection.h unixserver.h
+    referenceclean.h datapacket.h asyncstream.h notification.h
+    extensionloader.h mcopconfig.h connect.h reference.h
+    weakreference.h dynamicrequest.h anyref.h debug.h
+    delayedreturn.h dynamicskeleton.h thread.h core.idl
+    ${CMAKE_CURRENT_BINARY_DIR}/arts_export.h
+  DESTINATION ${INCLUDE_INSTALL_DIR} )
 
-##### install ###################################
 
-install( FILES ${mcop_INCS} DESTINATION ${INCLUDE_INSTALL_DIR} )
-install( TARGETS mcop LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
\ No newline at end of file
+##### mcop (shared library) #####################
+
+set( target mcop )
+
+set( ${target}_SRCS
+  buffer.cc connection.cc core.cc debug.cc dispatcher.cc
+  iomanager.cc object.cc socketconnection.cc tcpconnection.cc
+  unixconnection.cc tcpserver.cc unixserver.cc objectmanager.cc
+  factory.cc idlfilereg.cc ifacerepo_impl.cc mcoputils.cc
+  startupmanager.cc md5.c md5auth.cc referenceclean.cc
+  datapacket.cc asyncstream.cc notification.cc
+  flowsystem.cc extensionloader.cc tmpglobalcomm.cc
+  mcopconfig.cc connect.cc reference.cc type.cc
+  trader_impl.cc dynamicrequest.cc anyref.cc
+  loopback.cc delayedreturn.cc thread.cc dynamicskeleton.cc
+)
+
+tde_add_library( ${target} SHARED
+  SOURCES ${${target}_SRCS}
+  VERSION 1.0.0
+  LINK ltdlc-static
+  DESTINATION ${LIB_INSTALL_DIR}
+)