1 files changed, 43 insertions, 46 deletions
diff --git a/artsc/CMakeLists.txt b/artsc/CMakeLists.txt
index c8659c3..6240910 100644
--- a/artsc/CMakeLists.txt
+++ b/artsc/CMakeLists.txt
@@ -28,76 +28,73 @@ endforeach(INC)
 
 configure_file( artsc-config.in artsc-config @ONLY )
 configure_file( artsc_export.h.in artsc_export.h @ONLY )
-
-set( FLOWLIBS artsflow )
-
-set( artsc_INCS
-  artsc.h
-  artsc_export.h
-)
+install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/artsc-config DESTINATION ${BIN_INSTALL_DIR} )
 
 add_definitions(
   -DCOMPILING_ARTSC
 )
 
+
+##### include paths #############################
+
 include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR} # for artsc_export.h
-  ${CMAKE_BINARY_DIR}/mcop # for arts_export.h
-  ${CMAKE_SOURCE_DIR}/mcop # for common.h
-  ${CMAKE_BINARY_DIR}/flow # for artsflow.h
-  ${CMAKE_SOURCE_DIR}/flow # for stdsynthmodule.h
-  ${CMAKE_BINARY_DIR}/soundserver # for soundserver.h
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/mcop
+  ${CMAKE_SOURCE_DIR}/mcop
+  ${CMAKE_BINARY_DIR}/flow
+  ${CMAKE_SOURCE_DIR}/flow
+  ${CMAKE_BINARY_DIR}/soundserver
 )
 
-##### libartsdsp ################################
 
-set( artsdsp_SRCS
-  artsdsp.c
-)
+##### headers ###################################
 
-add_library( artsdsp SHARED ${artsdsp_SRCS} )
-set_target_properties( artsdsp PROPERTIES VERSION 0.0 SOVERSION 0 )
-target_link_libraries( artsdsp artsc )
+# FIXME these header must be installed?
+#install( FILES
+#    artsc.h artsc_export.h
+#  DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
-##### libartsdsp_st #############################
+##### artsdsp (shared lib) ######################
 
-set( artsdsp_st_SRCS
-  artsc.c
-  artsdsp.c
+tde_add_library( artsdsp SHARED
+  SOURCES artsdsp.c
+  VERSION 0.0.0
+  LINK artsc-shared
+  DESTINATION ${LIB_INSTALL_DIR}
 )
 
-add_library( artsdsp_st SHARED ${artsdsp_st_SRCS} )
-set_target_properties( artsdsp_st PROPERTIES VERSION 0.0 SOVERSION 0 )
-set_target_properties( artsdsp_st PROPERTIES COMPILE_FLAGS -DARTSC_BACKEND=\\"$(libdir)/libartscbackend.la\\" )
-target_link_libraries( artsdsp_st ltdlc )
-
 
-##### libartsc ##################################
+##### artsdsp_st (shared lib) ###################
 
-set( artsc_SRCS
-  artsc.c
+tde_add_library( artsdsp_st SHARED
+  SOURCES artsc.c artsdsp.c
+  VERSION 0.0.0
+  LINK ltdlc-static
+  DESTINATION ${LIB_INSTALL_DIR}
 )
 
-add_library( artsc SHARED ${artsc_SRCS} )
-set_target_properties( artsc PROPERTIES VERSION 0.0 SOVERSION 0 )
-set_target_properties( artsc PROPERTIES COMPILE_FLAGS -DARTSC_BACKEND=\\"$(libdir)/libartscbackend.la\\" )
-target_link_libraries( artsc ltdlc ${LIBPTHREAD} )
+set_target_properties( artsdsp_st-shared PROPERTIES COMPILE_FLAGS -DARTSC_BACKEND=\\"$(libdir)/libartscbackend.la\\" )
 
 
-##### libartscbackend ###########################
+##### artsc (shared lib) ########################
 
-set( artscbackend_SRCS
-  artscbackend.cc
+tde_add_library( artsc SHARED
+  SOURCES artsc.c
+  VERSION 0.0.0
+  LINK ltdlc-static
+  DESTINATION ${LIB_INSTALL_DIR}
 )
 
-add_library( artscbackend SHARED ${artscbackend_SRCS} )
-set_target_properties( artscbackend PROPERTIES VERSION 0.0 SOVERSION 0 )
-target_link_libraries( artscbackend ${FLOWLIBS} soundserver_idl )
+set_target_properties( artsc-shared PROPERTIES COMPILE_FLAGS -DARTSC_BACKEND=\\"$(libdir)/libartscbackend.la\\" )
 
 
-##### install ###################################
+##### artscbackend (shared lib) #################
 
-#install( FILES ${artsc_INCS} DESTINATION ${INCLUDE_INSTALL_DIR} )
-install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/artsc-config DESTINATION ${BIN_INSTALL_DIR} )
-install( TARGETS artsdsp artsdsp_st artsc artscbackend LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
-\ No newline at end of file
+tde_add_library( artscbackend SHARED
+  SOURCES artscbackend.cc
+  VERSION 0.0.0
+  LINK soundserver_idl-shared artsflow-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)