Move kdecorations library into an own subdirectory

The KDecoration library lives in libkdecorations/ now.

Installation pathes are unchanged, so this does not influence 3rd party
decorations.

The changes in the KWin main directory are required due to incorrect
includes.
CCMAIL: kwin@kde.org

CMakeLists.txt

@@ -54,13 +54,14 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/lib
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/libkdecorations
     ${CMAKE_CURRENT_SOURCE_DIR}/effects
     ${CMAKE_CURRENT_SOURCE_DIR}/tabbox
     ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal
     ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kworkspace
     )
 
-
+add_subdirectory( libkdecorations )
 add_subdirectory( lib ) 
 add_subdirectory( killer )
 add_subdirectory( kcmkwin )

lib/CMakeLists.txt

@@ -1,33 +1,5 @@
 ########### next target ###############
 
-set(kdecorations_LIB_SRCS 
-   kdecoration.cpp 
-   kdecoration_p.cpp 
-   kdecoration_plugins_p.cpp 
-   kdecorationfactory.cpp 
-   kcommondecoration.cpp
-   kcommondecoration_p.cpp )
-
-kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
-
-target_link_libraries(kdecorations ${KDE4_KDEUI_LIBS} kephal)
-target_link_libraries(kdecorations LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS})
-
-set_target_properties(kdecorations PROPERTIES 
-   VERSION ${GENERIC_LIB_VERSION}
-   SOVERSION ${GENERIC_LIB_SOVERSION}
-   )
-install(TARGETS kdecorations EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
-
-########### install files ###############
-
-install( FILES
-    kdecoration.h
-    kdecorationfactory.h
-    kcommondecoration.h
-    kdecorationbridge.h
-    DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
-
 ###  effects lib  ###
 set(kwin_EFFECTSLIB_SRCS
     kwinglobals.cpp

libkdecorations/CMakeLists.txt

@@ -0,0 +1,28 @@
+# kdecorations library
+set(kdecorations_LIB_SRCS
+   kdecoration.cpp
+   kdecoration_p.cpp
+   kdecoration_plugins_p.cpp
+   kdecorationfactory.cpp
+   kcommondecoration.cpp
+   kcommondecoration_p.cpp )
+
+kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
+
+target_link_libraries(kdecorations ${KDE4_KDEUI_LIBS} kephal)
+target_link_libraries(kdecorations LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS})
+
+set_target_properties(kdecorations PROPERTIES
+   VERSION ${GENERIC_LIB_VERSION}
+   SOVERSION ${GENERIC_LIB_SOVERSION}
+   )
+install(TARGETS kdecorations EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+########### install files ###############
+
+install( FILES
+    kdecoration.h
+    kdecorationfactory.h
+    kcommondecoration.h
+    kdecorationbridge.h
+    DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )

libkdecorations/Mainpage.dox

@@ -0,0 +1,19 @@
+/** @mainpage KWin Decoration Library
+
+<p>
+@ref kdecoration is a library for implementing window decoration plugins
+for KWin.
+
+@authors
+Lubos Lunak \<l.lunak@kde.org\><br>
+Sandro Giessl \<sandro@giessl.com\>
+
+@maintainers
+Martin Gräßlin \<mgraesslin@kde.org\>
+
+@licences
+libkdecorations: @bsd
+
+*/
+
+// DOXYGEN_SET_PROJECT_NAME = KWin Decoration Library

libkdecorations/Messages.sh

@@ -0,0 +1,2 @@
+#! /usr/bin/env bash
+$XGETTEXT `find . -name \*.cpp` -o $podir/kwin_lib.pot

rules.h

@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 
 #include "placement.h"
-#include "lib/kdecoration.h"
+#include <kdecoration.h>
 #include "options.h"
 #include "utils.h"
 

tiling.cpp

@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <klocale.h>
 #include <kwindowinfo.h>
 #include <kwindowsystem.h>
-#include "lib/kdecoration.h"
 
 
 namespace KWin

tilinglayout.h

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QRect>
 #include <QList>
 
-#include "lib/kdecoration.h"
+#include <kdecoration.h>
 
 namespace KWin
 {

tilinglayouts/columns/columns.cpp

@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "client.h"
 #include "tile.h"
 
-#include "lib/kdecoration.h"
+#include <kdecoration.h>
 
 namespace KWin
 {