diff --git a/CMakeLists.txt b/CMakeLists.txt index 17bf751119..976c831587 100644 --- a/CMakeLists.txt +++ b/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 ) diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt index ce71832419..57d77506d5 100644 --- a/kcmkwin/kwincompositing/CMakeLists.txt +++ b/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) diff --git a/kcmkwin/kwinscreenedges/CMakeLists.txt b/kcmkwin/kwinscreenedges/CMakeLists.txt index 132c938089..94e841c2c7 100644 --- a/kcmkwin/kwinscreenedges/CMakeLists.txt +++ b/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} ) diff --git a/lib/Mainpage.dox b/lib/Mainpage.dox deleted file mode 100644 index b01bf15ae9..0000000000 --- a/lib/Mainpage.dox +++ /dev/null @@ -1,25 +0,0 @@ -/** @mainpage KWin Libraries - -There are two libraries provided: -

-@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 \
-Rivo Laks \ - -@maintainers -Lubos Lunak \ - -@licences -libkdecorations: @bsd
-libkwineffects: @gpl - -*/ - -// DOXYGEN_SET_PROJECT_NAME = KWin Libraries -// vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/lib/CMakeLists.txt b/libkwineffects/CMakeLists.txt similarity index 98% rename from lib/CMakeLists.txt rename to libkwineffects/CMakeLists.txt index 1ead7f07de..32d1c209d5 100644 --- a/lib/CMakeLists.txt +++ b/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 diff --git a/libkwineffects/Mainpage.dox b/libkwineffects/Mainpage.dox new file mode 100644 index 0000000000..696ecb3428 --- /dev/null +++ b/libkwineffects/Mainpage.dox @@ -0,0 +1,22 @@ +/** @mainpage KWin Effects Library + +

+@ref kwineffects is a library for implementing window transition effect +plugins for KWin. + +@authors +Lubos Lunak \
+Rivo Laks \
+Lucas Murray \
+Fredrik Höglund \
+Martin Gräßlin \ + +@maintainers +Martin Gräßlin \ + +@licences +libkwineffects: @gpl + +*/ + +// DOXYGEN_SET_PROJECT_NAME = KWin Effects Library diff --git a/lib/Messages.sh b/libkwineffects/Messages.sh similarity index 100% rename from lib/Messages.sh rename to libkwineffects/Messages.sh diff --git a/lib/kwinconfig.h.cmake b/libkwineffects/kwinconfig.h.cmake similarity index 100% rename from lib/kwinconfig.h.cmake rename to libkwineffects/kwinconfig.h.cmake diff --git a/lib/kwineffects.cpp b/libkwineffects/kwineffects.cpp similarity index 100% rename from lib/kwineffects.cpp rename to libkwineffects/kwineffects.cpp diff --git a/lib/kwineffects.h b/libkwineffects/kwineffects.h similarity index 100% rename from lib/kwineffects.h rename to libkwineffects/kwineffects.h diff --git a/lib/kwinglobals.cpp b/libkwineffects/kwinglobals.cpp similarity index 100% rename from lib/kwinglobals.cpp rename to libkwineffects/kwinglobals.cpp diff --git a/lib/kwinglobals.h b/libkwineffects/kwinglobals.h similarity index 100% rename from lib/kwinglobals.h rename to libkwineffects/kwinglobals.h diff --git a/lib/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp similarity index 100% rename from lib/kwinglplatform.cpp rename to libkwineffects/kwinglplatform.cpp diff --git a/lib/kwinglplatform.h b/libkwineffects/kwinglplatform.h similarity index 100% rename from lib/kwinglplatform.h rename to libkwineffects/kwinglplatform.h diff --git a/lib/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp similarity index 100% rename from lib/kwinglutils.cpp rename to libkwineffects/kwinglutils.cpp diff --git a/lib/kwinglutils.h b/libkwineffects/kwinglutils.h similarity index 100% rename from lib/kwinglutils.h rename to libkwineffects/kwinglutils.h diff --git a/lib/kwinglutils_funcs.cpp b/libkwineffects/kwinglutils_funcs.cpp similarity index 100% rename from lib/kwinglutils_funcs.cpp rename to libkwineffects/kwinglutils_funcs.cpp diff --git a/lib/kwinglutils_funcs.h b/libkwineffects/kwinglutils_funcs.h similarity index 100% rename from lib/kwinglutils_funcs.h rename to libkwineffects/kwinglutils_funcs.h diff --git a/lib/kwinxrenderutils.cpp b/libkwineffects/kwinxrenderutils.cpp similarity index 100% rename from lib/kwinxrenderutils.cpp rename to libkwineffects/kwinxrenderutils.cpp diff --git a/lib/kwinxrenderutils.h b/libkwineffects/kwinxrenderutils.h similarity index 100% rename from lib/kwinxrenderutils.h rename to libkwineffects/kwinxrenderutils.h diff --git a/options.cpp b/options.cpp index eb22866b50..9caf2b1bd0 100644 --- a/options.cpp +++ b/options.cpp @@ -36,7 +36,7 @@ along with this program. If not, see . #include "client.h" #include "compositingprefs.h" -#include "lib/kwinglplatform.h" +#include #include diff --git a/scene_opengl.cpp b/scene_opengl.cpp index 635ea725bf..1070081d2e 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -70,8 +70,7 @@ Sources and other compositing managers: #include -// TODO: use <> -#include "lib/kwinglplatform.h" +#include #include "utils.h" #include "client.h"