Anonymous

Index: bookmark_module/CMakeLists.txt
===================================================================
--- bookmark_module/CMakeLists.txt	(revision 737687)
+++ bookmark_module/CMakeLists.txt	(working copy)
@@ -1,15 +1,15 @@
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../../            # sidebar dir
   ${CMAKE_CURRENT_SOURCE_DIR}/../      # trees dir
-  ${CMAKE_SOURCE_DIR}/apps/konqueror/sidebar            # sidebar dir
-  ${CMAKE_SOURCE_DIR}/apps/konqueror/sidebar/trees      # trees dir
+  ${CMAKE_CURRENT_BINARY_DIR}/../            # trees dir
 )
 
-set(konq_sidebartree_bookmarks_SRCS bookmark_module.cpp bookmark_item.cpp ${libkonq_sidebar_tree_SRCS} )
+set(konq_sidebartree_bookmarks_SRCS bookmark_module.cpp bookmark_item.cpp)
 
 
 kde4_add_plugin(konq_sidebartree_bookmarks ${konq_sidebartree_bookmarks_SRCS})
 
+target_link_libraries(konq_sidebartree_bookmarks sidebar_tree)
 target_link_libraries(konq_sidebartree_bookmarks  ${KDE4_KDEUI_LIBS} konqsidebarplugin konq)
 
 install(TARGETS konq_sidebartree_bookmarks  DESTINATION ${PLUGIN_INSTALL_DIR} )
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 737687)
+++ CMakeLists.txt	(working copy)
@@ -4,6 +4,8 @@
 	${CMAKE_CURRENT_SOURCE_DIR}/konq_sidebartreeitem.cpp 
 	${CMAKE_CURRENT_SOURCE_DIR}/konq_sidebartreetoplevelitem.cpp
 	)
+# this is a pseudo library
+add_library(sidebar_tree STATIC ${libkonq_sidebar_tree_SRCS})
 
 add_subdirectory( init )
 add_subdirectory( dirtree_module )
Index: dirtree_module/CMakeLists.txt
===================================================================
--- dirtree_module/CMakeLists.txt	(revision 737687)
+++ dirtree_module/CMakeLists.txt	(working copy)
@@ -1,6 +1,7 @@
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../.. # sidebar dir
-  ${CMAKE_CURRENT_SOURCE_DIR}/..    # trees dir
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../ # sidebar dir
+  ${CMAKE_CURRENT_SOURCE_DIR}/../    # trees dir
+  ${CMAKE_CURRENT_BINARY_DIR}/../            # trees dir
  )
 
 
@@ -11,6 +12,7 @@
 
 kde4_add_plugin(konq_sidebartree_dirtree ${konq_sidebartree_dirtree_SRCS})
 
+target_link_libraries(konq_sidebartree_dirtree sidebar_tree )
 target_link_libraries(konq_sidebartree_dirtree  ${KDE4_KDE3SUPPORT_LIBS} konq konqsidebarplugin  )
 
 install(TARGETS konq_sidebartree_dirtree  DESTINATION ${PLUGIN_INSTALL_DIR} )
Index: history_module/CMakeLists.txt
===================================================================
--- history_module/CMakeLists.txt	(revision 737687)
+++ history_module/CMakeLists.txt	(working copy)
@@ -1,6 +1,7 @@
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../.. # sidebar dir
-  ${CMAKE_CURRENT_SOURCE_DIR}/..    # trees dir
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../ # sidebar dir
+  ${CMAKE_CURRENT_SOURCE_DIR}/../    # trees dir
+  ${CMAKE_CURRENT_BINARY_DIR}/../            # trees dir
 )
 
 
@@ -11,6 +12,7 @@
 
 kde4_add_plugin(konq_sidebartree_history ${konq_sidebartree_history_SRCS})
 
+target_link_libraries(konq_sidebartree_history sidebar_tree )
 target_link_libraries(konq_sidebartree_history  ${KDE4_KDEUI_LIBS} konqsidebarplugin konq )
 
 install(TARGETS konq_sidebartree_history  DESTINATION ${PLUGIN_INSTALL_DIR} )