Move kwineffects library into own directory

Second part of cleaning up the lib directory: the effects library
now lives in libkwineffects/ directory.

For existing effects nothing changes as the install path is unchanged.
The change obsoletes the lib/ directory.

As glplatform.h has not yet been exported I dared to export it and
adjust the places where it is used.
CCMAIL: kwin@kde.org

CMakeLists.txt

@@ -43,7 +43,7 @@ if(OPENGLES_FOUND AND KWIN_HAVE_OPENGLES_COMPOSITING)
 endif(OPENGLES_FOUND AND KWIN_HAVE_OPENGLES_COMPOSITING)
 
 # for things that are also used by kwin libraries
-configure_file(lib/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/lib/kwinconfig.h )
+configure_file(libkwineffects/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects/kwinconfig.h )
 # for kwin internal things
 configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h )
 
@@ -51,9 +51,9 @@ configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h )
 ########### global ###############
 
 include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}/lib
+    ${CMAKE_CURRENT_BINARY_DIR}/libkwineffects
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/libkwineffects
     ${CMAKE_CURRENT_SOURCE_DIR}/libkdecorations
     ${CMAKE_CURRENT_SOURCE_DIR}/effects
     ${CMAKE_CURRENT_SOURCE_DIR}/tabbox
@@ -62,7 +62,7 @@ include_directories(
     )
 
 add_subdirectory( libkdecorations )
-add_subdirectory( lib ) 
+add_subdirectory( libkwineffects )
 add_subdirectory( killer )
 add_subdirectory( kcmkwin )
 add_subdirectory( clients )

kcmkwin/kwincompositing/CMakeLists.txt

@@ -6,8 +6,8 @@ set(kcm_kwincompositing_PART_SRCS
     main.cpp
     ktimerdialog.cpp
     ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/compositingprefs.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib/kwinglobals.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib/kwinglplatform.cpp
+    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/libkwineffects/kwinglobals.cpp
+    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/libkwineffects/kwinglplatform.cpp
     )
 kde4_add_ui_files(kcm_kwincompositing_PART_SRCS main.ui)
 set(kwin_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/org.kde.KWin.xml)

kcmkwin/kwinscreenedges/CMakeLists.txt

@@ -5,8 +5,8 @@ set(
     main.cpp
     monitor.cpp
     ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/compositingprefs.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib/kwinglobals.cpp
-    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib/kwinglplatform.cpp
+    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/libkwineffects/kwinglobals.cpp
+    ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/libkwineffects/kwinglplatform.cpp
     )
 kde4_add_ui_files( kcm_kwinscreenedges_PART_SRCS main.ui )
 kde4_add_plugin( kcm_kwinscreenedges ${kcm_kwinscreenedges_PART_SRCS} )

lib/Mainpage.dox

@@ -1,25 +0,0 @@
-/** @mainpage KWin Libraries
-
-There are two libraries provided:
-<p>
-@ref kdecoration is a library for implementing window decoration plugins
-for KWin.
-
-@ref kwineffects is a library for implementing window transition effect
-plugins for KWin.
-
-@authors
-Lubos Lunak \<l.lunak@kde.org\><br>
-Rivo Laks \<rivolaks@hot.ee\>
-
-@maintainers
-Lubos Lunak \<l.lunak@kde.org\>
-
-@licences
-libkdecorations: @bsd<br>
-libkwineffects: @gpl
-
-*/
-
-// DOXYGEN_SET_PROJECT_NAME = KWin Libraries
-// vim:ts=4:sw=4:expandtab:filetype=doxygen

libkwineffects/CMakeLists.txt

@@ -52,6 +52,7 @@ endif (X11_Xfixes_FOUND)
 install( FILES
     kwinglobals.h
     kwineffects.h
+    kwinglplatform.h
     kwinglutils.h
     kwinglutils_funcs.h
     kwinxrenderutils.h

libkwineffects/Mainpage.dox

@@ -0,0 +1,22 @@
+/** @mainpage KWin Effects Library
+
+<p>
+@ref kwineffects is a library for implementing window transition effect
+plugins for KWin.
+
+@authors
+Lubos Lunak \<l.lunak@kde.org\><br>
+Rivo Laks \<rivolaks@hot.ee\><br>
+Lucas Murray \<lmurray@undefinedfire.com\><br>
+Fredrik Höglund \<fredrik@kde.org\><br>
+Martin Gräßlin \<mgraesslin@kde.org\>
+
+@maintainers
+Martin Gräßlin \<mgraesslin@kde.org\>
+
+@licences
+libkwineffects: @gpl
+
+*/
+
+// DOXYGEN_SET_PROJECT_NAME = KWin Effects Library

options.cpp

@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "client.h"
 #include "compositingprefs.h"
-#include "lib/kwinglplatform.h"
+#include <kwinglplatform.h>
 
 #include <kephal/screens.h>
 

scene_opengl.cpp

@@ -70,8 +70,7 @@ Sources and other compositing managers:
 
 #include <kxerrorhandler.h>
 
-// TODO: use <>
-#include "lib/kwinglplatform.h"
+#include <kwinglplatform.h>
 
 #include "utils.h"
 #include "client.h"