generic: build system cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kdeplasma-addons/applets/pastebin/CMakeLists.txt b/kdeplasma-addons/applets/pastebin/CMakeLists.txt
index 80591fd..28ffee9 100644 (file)
--- a/kdeplasma-addons/applets/pastebin/CMakeLists.txt
+++ b/kdeplasma-addons/applets/pastebin/CMakeLists.txt
@@ -6,7 +6,7 @@ set(pastebin_SRCS
 )
 
 kde4_add_plugin(plasma_applet_pastebin ${pastebin_SRCS})
-target_link_libraries(plasma_applet_pastebin ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
+target_link_libraries(plasma_applet_pastebin ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
 
 install(TARGETS plasma_applet_pastebin DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-pastebin.desktop DESTINATION ${SERVICES_INSTALL_DIR})

diff --git a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
index 68ed9d4..5af3a88 100644 (file)
--- a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
+++ b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
@@ -17,7 +17,7 @@ set(plasmaweather_HEADERS
 
 add_library(plasmaweather SHARED ${plasmaweather_LIB_SRCS})
 
-target_link_libraries(plasmaweather ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KUNITCONVERSION_LIBS} ${KDE4WORKSPACE_WEATHERION_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS})
+target_link_libraries(plasmaweather ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KUNITCONVERSION_LIBS} ${KDE4WORKSPACE_WEATHERION_LIBRARY})
 set_target_properties(plasmaweather PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 install(TARGETS plasmaweather ${INSTALL_TARGETS_DEFAULT_ARGS})
 # nothing outside of kdeplasma-addons uses this library, and the API is not stable -> do not install headers!

diff --git a/kdeplasma-addons/wallpapers/virus/CMakeLists.txt b/kdeplasma-addons/wallpapers/virus/CMakeLists.txt
index 27eb12a..c5b1115 100644 (file)
--- a/kdeplasma-addons/wallpapers/virus/CMakeLists.txt
+++ b/kdeplasma-addons/wallpapers/virus/CMakeLists.txt
@@ -7,14 +7,13 @@ set(virus_SRCS
     backgroundlistmodel.cpp
     alife.cpp
     itemsview.cpp
-    virusconfig.ui
 )
 
 set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
 qt4_add_dbus_interface(image_SRCS ${ksmserver_xml} ksmserver_interface)
 
 kde4_add_plugin(plasma_wallpaper_virus ${virus_SRCS})
-target_link_libraries(plasma_wallpaper_virus ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_THREADWEAVER_LIBRARY})
+target_link_libraries(plasma_wallpaper_virus ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_THREADWEAVER_LIBRARY})
 
 install(TARGETS plasma_wallpaper_virus DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma-wallpaper-virus.desktop DESTINATION ${SERVICES_INSTALL_DIR})

diff --git a/kdeplasma-addons/wallpapers/weather/CMakeLists.txt b/kdeplasma-addons/wallpapers/weather/CMakeLists.txt
index 6f8241b..87761fc 100644 (file)
--- a/kdeplasma-addons/wallpapers/weather/CMakeLists.txt
+++ b/kdeplasma-addons/wallpapers/weather/CMakeLists.txt
@@ -4,11 +4,10 @@ set(weather_SRCS
     weatherwallpaper.cpp
     backgrounddelegate.cpp
     backgroundlistmodel.cpp
-    weatherAdvanced.ui
 )
 
 kde4_add_plugin(plasma_wallpaper_weather ${weather_SRCS})
-target_link_libraries(plasma_wallpaper_weather ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_THREADWEAVER_LIBRARY} plasmaweather)
+target_link_libraries(plasma_wallpaper_weather ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} plasmaweather)
 
 install(TARGETS plasma_wallpaper_weather DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma-wallpaper-weather.desktop DESTINATION ${SERVICES_INSTALL_DIR})

diff --git a/kdevplatform/language/CMakeLists.txt b/kdevplatform/language/CMakeLists.txt
index 86782ff..d237679 100644 (file)
--- a/kdevplatform/language/CMakeLists.txt
+++ b/kdevplatform/language/CMakeLists.txt
@@ -162,7 +162,6 @@ target_link_libraries(kdevplatformlanguage LINK_PRIVATE
         ${KDE4_KPARTS_LIBS}
         ${KDE4_KTEXTEDITOR_LIBS}
         ${KDE4_THREADWEAVER_LIBS}
-        ${KDE4_KNEWSTUFF3_LIBS}
         kdevplatformutil
         ${Grantlee_CORE_LIBRARIES}
 )

diff --git a/kdevplatform/plugins/appwizard/CMakeLists.txt b/kdevplatform/plugins/appwizard/CMakeLists.txt
index 379cf47..183a42a 100644 (file)
--- a/kdevplatform/plugins/appwizard/CMakeLists.txt
+++ b/kdevplatform/plugins/appwizard/CMakeLists.txt
@@ -19,8 +19,11 @@ target_link_libraries(kdevappwizard
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KIO_LIBS}
     ${KDE4_KDEUI_LIBS}
-    ${KDE4_KNEWSTUFF3_LIBS}
-    kdevplatforminterfaces kdevplatformvcs kdevplatformlanguage kdevplatformutil)
+    kdevplatforminterfaces
+    kdevplatformvcs
+    kdevplatformlanguage
+    kdevplatformutil
+)
 
 install(TARGETS kdevappwizard DESTINATION ${PLUGIN_INSTALL_DIR} )
 

diff --git a/kdevplatform/plugins/externalscript/CMakeLists.txt b/kdevplatform/plugins/externalscript/CMakeLists.txt
index 8c059f1..b161e96 100644 (file)
--- a/kdevplatform/plugins/externalscript/CMakeLists.txt
+++ b/kdevplatform/plugins/externalscript/CMakeLists.txt
@@ -14,7 +14,7 @@ set(kdevexternalscript_PART_SRCS
 kde4_add_plugin(kdevexternalscript ${kdevexternalscript_PART_SRCS})
 
 target_link_libraries(kdevexternalscript
-    ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS}
+    ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS}
     kdevplatformlanguage kdevplatforminterfaces kdevplatformproject
     kdevplatformutil kdevplatformoutputview
 )

diff --git a/kdevplatform/plugins/filetemplates/CMakeLists.txt b/kdevplatform/plugins/filetemplates/CMakeLists.txt
index 7095d2e..dd15644 100644 (file)
--- a/kdevplatform/plugins/filetemplates/CMakeLists.txt
+++ b/kdevplatform/plugins/filetemplates/CMakeLists.txt
@@ -23,7 +23,6 @@ target_link_libraries(kdevfiletemplates
     ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
     ${KDEVPLATFORM_PROJECT_LIBRARIES}
     ${KDEVPLATFORM_UTIL_LIBRARIES}
-    ${KDE4_KNEWSTUFF3_LIBS}
 )
 
 install(TARGETS kdevfiletemplates DESTINATION ${PLUGIN_INSTALL_DIR} )
@@ -79,5 +78,4 @@ target_link_libraries(testfiletemplates
     ${KDEVPLATFORM_PROJECT_LIBRARIES}
     ${KDEVPLATFORM_UTIL_LIBRARIES}
     ${KDEVPLATFORM_TESTS_LIBRARIES}
-    ${KDE4_KNEWSTUFF3_LIBS}
 )

diff --git a/kdevplatform/plugins/snippet/CMakeLists.txt b/kdevplatform/plugins/snippet/CMakeLists.txt
index a52b0b2..bc91500 100644 (file)
--- a/kdevplatform/plugins/snippet/CMakeLists.txt
+++ b/kdevplatform/plugins/snippet/CMakeLists.txt
@@ -15,13 +15,10 @@ set(kdevsnippet_PART_SRCS
     legacy/snippet.cpp
     legacy/editrepository.cpp
     legacy/editsnippet.cpp
-    legacy/snippetview.ui
-    legacy/editrepository.ui
-    legacy/editsnippet.ui
 )
 
 kde4_add_plugin(kdevsnippet ${kdevsnippet_PART_SRCS})
-target_link_libraries(kdevsnippet ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS}
+target_link_libraries(kdevsnippet ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS}
 kdevplatformlanguage kdevplatforminterfaces)
 install( TARGETS kdevsnippet DESTINATION ${PLUGIN_INSTALL_DIR} )
 

diff --git a/kdevplatform/plugins/templatemanager/CMakeLists.txt b/kdevplatform/plugins/templatemanager/CMakeLists.txt
index 2bdcbfc..585ee39 100644 (file)
--- a/kdevplatform/plugins/templatemanager/CMakeLists.txt
+++ b/kdevplatform/plugins/templatemanager/CMakeLists.txt
@@ -2,13 +2,11 @@
 set(kdevtemplatemanager_config_SRCS
     templateconfig.cpp
     templatepage.cpp 
-    templateconfig.ui
-    templatepage.ui
 )
 
 kde4_add_plugin( kdevtemplatemanager_config ${kdevtemplatemanager_config_SRCS} )
 
-target_link_libraries( kdevtemplatemanager_config ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} kdevplatforminterfaces)
+target_link_libraries( kdevtemplatemanager_config ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS} kdevplatforminterfaces)
 
 install( TARGETS kdevtemplatemanager_config DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES kdevtemplatemanager_config.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

diff --git a/okular/part.cpp b/okular/part.cpp
index 99bc212..13699c7 100644 (file)
--- a/okular/part.cpp
+++ b/okular/part.cpp
@@ -58,9 +58,6 @@
 #include <kicon.h>
 #include <kfilterdev.h>
 #include <kfilterbase.h>
-#if 0
-#include <knewstuff2/engine.h>
-#endif
 #include <kdeprintdialog.h>
 #include <kprintpreview.h>
 #include <kbookmarkmenu.h>

diff --git a/yakuake/app/CMakeLists.txt b/yakuake/app/CMakeLists.txt
index edb37a2..8f79d6e 100644 (file)
--- a/yakuake/app/CMakeLists.txt
+++ b/yakuake/app/CMakeLists.txt
@@ -16,10 +16,6 @@ set(yakuake_SRCS
     config/windowsettings.cpp
     config/appearancesettings.cpp
     config/skinlistdelegate.cpp
-    firstrundialog.ui
-    config/windowsettings.ui
-    behaviorsettings.ui
-    config/appearancesettings.ui
 )
 
 
@@ -27,7 +23,7 @@ kde4_add_kcfg_files(yakuake_SRCS config/settings.kcfgc)
 
 add_executable(yakuake ${yakuake_SRCS})
 
-target_link_libraries(yakuake ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
+target_link_libraries(yakuake ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KPARTS_LIBS})
 
 if(Q_WS_X11)
   target_link_libraries(yakuake ${X11_X11_LIB})