Merged with trunk.

(bzr r2791.8.2)

1 files changed, 4 insertions, 3 deletions

diff --git a/unity-shared/CMakeLists.txt b/unity-shared/CMakeLists.txt
index 41af501be..27b8ceef5 100644
--- a/unity-shared/CMakeLists.txt
+++ b/unity-shared/CMakeLists.txt
@@ -35,7 +35,6 @@ set (UNITY_SHARED_SOURCES
 DashStyle.cpp
 DefaultThumbnailProvider.cpp
 FontSettings.cpp
- KeyboardUtil.cpp
 IMTextEntry.cpp
 IconLoader.cpp
 IconRenderer.cpp
@@ -65,6 +64,8 @@ set (UNITY_SHARED_SOURCES
 UnityWindowView.cpp
 UserThumbnailProvider.cpp
 WindowManager.cpp
+ XKeyboardUtil.cpp
+ XWindowManager.cpp
 ubus-server.cpp
 )
 
@@ -78,7 +79,7 @@ add_dependencies (unity-shared unity-core-${UNITY_API_VERSION})
 
 # compiz
 set (UNITY_SHARED_COMPIZ_SOURCES
- PluginAdapterCompiz.cpp
+ PluginAdapter.cpp
 )
 add_library (unity-shared-compiz STATIC ${UNITY_SHARED_COMPIZ_SOURCES})
 target_link_libraries (unity-shared-compiz ${LIBS})
@@ -87,7 +88,7 @@ add_dependencies (unity-shared-compiz unity-shared)
 
 # standalone
 set (UNITY_SHARED_STANDALONE_SOURCES
- PluginAdapterStandalone.cpp
+ StandaloneWindowManager.cpp
 )
 add_library (unity-shared-standalone STATIC ${UNITY_SHARED_STANDALONE_SOURCES})
 target_link_libraries (unity-shared-standalone ${LIBS})