1 files changed, 68 insertions, 36 deletions
diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index 48fb330..0839666 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -1,18 +1,19 @@
-#################################################
-#
-#  (C) 2010 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
+###########################################
+#                                         #
+#  (C) 2010 Serghei Amelian               #
+#  serghei (DOT) amelian (AT) gmail.com   #
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 2   #
+#                                         #
+###########################################
 
 add_subdirectory( mcopclass )
 add_subdirectory( gsl )
 add_subdirectory( gslpp )
 
+
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/artsc
@@ -21,29 +22,16 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${GLIB2_INCLUDE_DIRS}
+  ${AUDIOFILE_INCLUDE_DIRS}
+  ${ALSA_INCLUDE_DIRS}
+  ${ESOUND_INCLUDE_DIRS}
+  ${LIBJACK_INCLUDE_DIRS}
+  ${NAS_INCLUDE_DIR}
+  ${OSS_INCLUDE_DIR}
 )
 
 
-##### headers ###################################
-
-install( FILES
-    audiosubsys.h cache.h cachedwav.h convert.h
-    pipebuffer.h stdsynthmodule.h synthschedule.h
-    fft.h artsflow.idl audioio.h resample.h cpuinfo.h
-    bufferqueue.h gslschedule.h
-    ${CMAKE_CURRENT_BINARY_DIR}/artsflow.h
-  DESTINATION ${INCLUDE_INSTALL_DIR} )
-
-
-##### other data ################################
-
-install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/artsflow.mcoptype
-    ${CMAKE_CURRENT_BINARY_DIR}/artsflow.mcopclass
-  DESTINATION ${LIB_INSTALL_DIR}/mcop )
-
-
-##### artsflow (shared lib) #####################
+##### artsflow (shared )
 
 set( target artsflow )
 
@@ -64,24 +52,68 @@ set( ${target}_SRCS
 )
 
 tde_add_library( ${target} SHARED
-  SOURCES ${${target}_SRCS}
+
+  SOURCES
+        ${${target}_SRCS}
+  LINK
+     artsgsl-static
+     artsgslpp-static
+     artsflow_idl-shared
+     ${AUDIOFILE_LIBRARIES}
+     ${LIBJACK_LIBRARIES}
+     ${LIBSNDIO_LIBRARIES}
+     ${ESOUND_LIBRARIES}
+     ${NAS_LIBRARIES}
+     ${OSS_LIBRARIES}
+
   VERSION 1.0.0
-  LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES} ${LIBJACK_LIBRARIES} ${LIBSNDIO_LIBRARIES}
+
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
-##### artsflow_idl (shared lib) #################
+
+##### artsflow_idl (shared )
 
 add_custom_command(
   OUTPUT artsflow.cpp
   COMMAND ../mcopidl/mcopidl
-  ARGS -t ${CMAKE_CURRENT_SOURCE_DIR}/artsflow.idl DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/artsflow.idl
+  ARGS -t ${CMAKE_CURRENT_SOURCE_DIR}/artsflow.idl
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/artsflow.idl
 )
 
 tde_add_library( artsflow_idl SHARED
-  SOURCES artsflow.cpp
+
+  SOURCES
+        artsflow.cpp
+  LINK
+     mcop-shared
+     ${ALSA_LIBRARIES}
+
   VERSION 1.0.0
-  LINK mcop-shared ${ALSA_LIBRARIES}
+
   DESTINATION ${LIB_INSTALL_DIR}
+
   DEPENDENCIES mcopidl
 )
+
+
+##### headers
+
+install(
+    FILES audiosubsys.h cache.h cachedwav.h convert.h gslschedule.h
+          pipebuffer.h stdsynthmodule.h synthschedule.h bufferqueue.h
+          fft.h artsflow.idl audioio.h resample.h cpuinfo.h
+          ${CMAKE_CURRENT_BINARY_DIR}/artsflow.h
+
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/artsflow.mcoptype
+          ${CMAKE_CURRENT_BINARY_DIR}/artsflow.mcopclass
+
+    DESTINATION ${LIB_INSTALL_DIR}/mcop
+)