--- src/bindings/rtt/CMakeLists.txt.orig	2009-10-02 12:01:02.000000000 +0200
+++ src/bindings/rtt/CMakeLists.txt	2010-01-27 16:51:25.993131372 +0100
@@ -18,39 +18,12 @@
   VERSION "${bfl_VERSION}") 
   INSTALL_TARGETS( /lib/rtt/${OROCOS_TARGET}/plugins orocos-bfl_toolkit-${OROCOS_TARGET})
   INSTALL_FILES( /include/bfl/bindings/rtt FILES ${HPPS})
-  TARGET_LINK_LIBRARIES(orocos-bfl_toolkit-${OROCOS_TARGET} orocos-bfl orocos-rtt-${OROCOS_TARGET})
+  TARGET_LINK_LIBRARIES(orocos-bfl_toolkit-${OROCOS_TARGET} orocos-bfl ${OROCOS_RTT_LINK_DIRS}/liborocos-rtt-${OROCOS_TARGET}.so)
 
-  CONFIGURE_FILE( bfl_toolkit.pc.in src/bindings/rtt/orocos-bfl_toolkit-${OROCOS_TARGET}.pc @ONLY)
+  CONFIGURE_FILE( bfl_toolkit.pc.in orocos-bfl_toolkit-${OROCOS_TARGET}.pc @ONLY)
   INSTALL_FILES( /lib/pkgconfig FILES orocos-bfl_toolkit-${OROCOS_TARGET}.pc)
 
   INCLUDE_DIRECTORIES( $ENV{GLOBAL_INCLUDE_DIRS} )
 
 ENDIF( OROCOS_PLUGIN )
-IF( OROCOS_PLUGIN )
 
-
-  #CONFIGURE_FILE( bfl_toolkit.hpp.in src/bindings/rtt/bfl_toolkit.hpp)
-  INSTALL_FILES( /include/bfl/bindings/rtt FILES bfl_toolkit.hpp)
-  INCLUDE_DIRECTORIES(${PROJ_SOURCE_DIR}/src)
-
-  FILE( GLOB SRCS [^.]*.cpp [^.]*.cxx)
-  FILE( GLOB HPPS [^.]*.hpp [^.]*.h)
-  
-  INCLUDE_DIRECTORIES(${PROJ_SOURCE_DIR} ${PROJ_BINARY_DIR}/src/bindings/rtt
-      ${OROCOS_RTT_INCLUDE_DIRS} ${OROCOS_INSTALL}/include/rtt )
-  ADD_DEFINITIONS(-D_REENTRANT)
-  INCLUDE_DIRECTORIES(/usr/include/rtt)
-  ADD_LIBRARY(orocos-bfl_toolkit-${OROCOS_TARGET} SHARED ${SRCS})
-  SET_TARGET_PROPERTIES(orocos-bfl_toolkit-${OROCOS_TARGET} PROPERTIES
-  SOVERSION "${bfl_VERSION_MAJOR}.${bfl_VERSION_MINOR}" 
-  VERSION "${bfl_VERSION}") 
-  INSTALL_TARGETS( /lib/rtt/${OROCOS_TARGET}/plugins orocos-bfl_toolkit-${OROCOS_TARGET})
-  INSTALL_FILES( /include/bfl/bindings/rtt FILES ${HPPS})
-  TARGET_LINK_LIBRARIES(orocos-bfl_toolkit-${OROCOS_TARGET} orocos-bfl orocos-rtt-${OROCOS_TARGET})
-
-  CONFIGURE_FILE( bfl_toolkit.pc.in src/bindings/rtt/orocos-bfl_toolkit-${OROCOS_TARGET}.pc @ONLY)
-  INSTALL_FILES( /lib/pkgconfig FILES orocos-bfl_toolkit-${OROCOS_TARGET}.pc)
-
-  INCLUDE_DIRECTORIES( $ENV{GLOBAL_INCLUDE_DIRS} )
-
-ENDIF( OROCOS_PLUGIN )