3 files changed, 19 insertions, 10 deletions
diff --git a/kdesktop/dbus/screensaver/CMakeLists.txt b/kdesktop/dbus/screensaver/CMakeLists.txt
index aa6d61a60..7d21e2f83 100644
--- a/kdesktop/dbus/screensaver/CMakeLists.txt
+++ b/kdesktop/dbus/screensaver/CMakeLists.txt
@@ -17,11 +17,14 @@ include_directories(
   ${DBUS_TQT_INCLUDE_DIRS}
 )
 
-
-##### headers ###################################
-
-install( FILES dbusscreensaverservice.h screensaverInterfaceImpl.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kdesktop/dbus 
+set( ScreenSaver_HDRS dbusbaseNode.h introspectableInterface.h screensaverInterface.h screensaverNode.h screensaverProxy.h)
+set( ScreenSaver_SRCS dbusbaseNode.cpp introspectableInterface.cpp screensaverInterface.cpp screensaverNode.cpp screensaverProxy.cpp )
+
+##### DbusScreenSaver #########################
+add_custom_command( 
+    OUTPUT  ${ScreenSaver_HDRS} ${ScreenSaver_SRCS}
+    COMMAND ${DBUSXML2QT3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/kdesktop/dbus/interfaces/org.freedesktop.ScreenSaver.xml 2>/dev/null
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/kdesktop/dbus/screensaver
 )
 
 ##### dbusscreensaverservice ####################
@@ -29,10 +32,16 @@ install( FILES dbusscreensaverservice.h screensaverInterfaceImpl.h
 set( target dbusscreensaverservice )
 
 set( ${target}_SRCS
-  dbusscreensaverservice.cpp screensaverInterfaceImpl.cpp
+  dbusscreensaverservice.cpp screensaverInterfaceImpl.cpp 
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
-  SOURCES ${${target}_SRCS}
+  SOURCES ${${target}_SRCS} ${ScreenSaver_SRCS}
   LINK ${DBUS_TQT_LIBRARIES} 
 )
+
+##### headers ###################################
+
+install( FILES dbusscreensaverservice.h screensaverInterfaceImpl.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kdesktop/dbus 
+)
diff --git a/kdesktop/dbus/screensaver/dbusscreensaverservice.h b/kdesktop/dbus/screensaver/dbusscreensaverservice.h
index 03713a4b1..4f4feb7ec 100644
--- a/kdesktop/dbus/screensaver/dbusscreensaverservice.h
+++ b/kdesktop/dbus/screensaver/dbusscreensaverservice.h
@@ -25,8 +25,8 @@
 #include <tqmap.h>
 #include <tqdbusconnection.h>
 
-#include "dbus/interfaces/screensaverNode.h"
-#include "dbus/interfaces/dbusbaseNode.h"
+#include "screensaverNode.h"
+#include "dbusbaseNode.h"
 #include "screensaverInterfaceImpl.h"
 
 class ScreenSaverService: public org::freedesktop::screensaverNode
diff --git a/kdesktop/dbus/screensaver/screensaverInterfaceImpl.h b/kdesktop/dbus/screensaver/screensaverInterfaceImpl.h
index 03f85712a..0cec20720 100644
--- a/kdesktop/dbus/screensaver/screensaverInterfaceImpl.h
+++ b/kdesktop/dbus/screensaver/screensaverInterfaceImpl.h
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 #include <tqdbusconnection.h>
 
-#include "dbus/interfaces/screensaverInterface.h"
+#include "screensaverInterface.h"
 
 #define DBUS_SCREENSAVER_SERVICE      "TDEDbusScreenSaver"
 #define DBUS_SCREENSAVER_SERVICE_NAME "org.freedesktop.ScreenSaver"