From 4cd2af066ba9527ce22a8059a47f072273b758f9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:28:00 -0600 Subject: Additional kde to tde renaming --- kscreensaver/kdesavers/CMakeLists.txt | 2 +- kscreensaver/kdesavers/Makefile.am | 2 +- kscreensaver/kpartsaver/Makefile.am | 2 +- kscreensaver/kxsconfig/Makefile.am | 4 ++-- kscreensaver/xsavers/CMakeLists.txt | 4 ++-- kscreensaver/xsavers/Makefile.am | 2 +- kwin-styles/cde/CMakeLists.txt | 2 +- kwin-styles/cde/Makefile.am | 4 ++-- kwin-styles/cde/config/CMakeLists.txt | 2 +- kwin-styles/cde/config/Makefile.am | 2 +- kwin-styles/glow/CMakeLists.txt | 2 +- kwin-styles/glow/Makefile.am | 4 ++-- kwin-styles/glow/config/CMakeLists.txt | 2 +- kwin-styles/glow/config/Makefile.am | 2 +- kwin-styles/icewm/CMakeLists.txt | 2 +- kwin-styles/icewm/Makefile.am | 4 ++-- kwin-styles/icewm/config/CMakeLists.txt | 2 +- kwin-styles/icewm/config/Makefile.am | 2 +- kwin-styles/kde1/CMakeLists.txt | 2 +- kwin-styles/kde1/Makefile.am | 4 ++-- kwin-styles/kstep/CMakeLists.txt | 2 +- kwin-styles/kstep/Makefile.am | 4 ++-- kwin-styles/openlook/CMakeLists.txt | 2 +- kwin-styles/openlook/Makefile.am | 4 ++-- kwin-styles/riscos/CMakeLists.txt | 2 +- kwin-styles/riscos/Makefile.am | 4 ++-- kwin-styles/smooth-blend/client/CMakeLists.txt | 2 +- kwin-styles/smooth-blend/client/Makefile.am | 4 ++-- kwin-styles/smooth-blend/client/config/CMakeLists.txt | 2 +- kwin-styles/smooth-blend/client/config/Makefile.am | 2 +- kwin-styles/system/CMakeLists.txt | 2 +- kwin-styles/system/Makefile.am | 4 ++-- styles/dotnet/CMakeLists.txt | 2 +- styles/dotnet/Makefile.am | 4 ++-- styles/phase/CMakeLists.txt | 2 +- styles/phase/Makefile.am | 4 ++-- styles/phase/config/CMakeLists.txt | 2 +- styles/phase/config/Makefile.am | 2 +- 38 files changed, 51 insertions(+), 51 deletions(-) diff --git a/kscreensaver/kdesavers/CMakeLists.txt b/kscreensaver/kdesavers/CMakeLists.txt index 3a74df96..6cfcf03b 100644 --- a/kscreensaver/kdesavers/CMakeLists.txt +++ b/kscreensaver/kdesavers/CMakeLists.txt @@ -129,7 +129,7 @@ list( APPEND SCREENSAVERS ${NORMAL_SCREENSAVERS} ) foreach( saver ${SCREENSAVERS} ) tde_add_executable( ${saver}.kss AUTOMOC SOURCES ${${saver}_SOURCES} - LINK kscreensaver-shared kdeui-shared ${${saver}_LINK} + LINK kscreensaver-shared tdeui-shared ${${saver}_LINK} DESTINATION ${BIN_INSTALL_DIR} ) install( FILES ${${saver}_DESKTOP} diff --git a/kscreensaver/kdesavers/Makefile.am b/kscreensaver/kdesavers/Makefile.am index 23063e63..33418784 100644 --- a/kscreensaver/kdesavers/Makefile.am +++ b/kscreensaver/kdesavers/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = . data AM_CPPFLAGS = -UQT_NO_ASCII_CAST INCLUDES = $(all_includes) $(GLINC) $(LIBART_CFLAGS) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor AM_LDADD = $(LIB_KDEUI) -lkscreensaver if COMPILE_X11_KSAVERS diff --git a/kscreensaver/kpartsaver/Makefile.am b/kscreensaver/kpartsaver/Makefile.am index 25f48039..2d1ca6eb 100644 --- a/kscreensaver/kpartsaver/Makefile.am +++ b/kscreensaver/kpartsaver/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = kpartsaver.kss INCLUDES = $(all_includes) kpartsaver_kss_SOURCES = kpartsaver.cpp configwidget.ui -kpartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kpartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpartsaver_kss_LDADD = $(LIB_KFILE) $(LIB_KPARTS) -lkscreensaver METASOURCES = AUTO diff --git a/kscreensaver/kxsconfig/Makefile.am b/kscreensaver/kxsconfig/Makefile.am index d446ec3f..81c4a3a7 100644 --- a/kscreensaver/kxsconfig/Makefile.am +++ b/kscreensaver/kxsconfig/Makefile.am @@ -1,10 +1,10 @@ ## Makefile.am of kdebase/kscreensaver/kxsconfig INCLUDES = $(all_includes) -kxsconfig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kxsconfig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kxsconfig_LDADD = $(LIB_KIO) -lXt -kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kxsrun_LDADD = $(LIB_KIO) EXTRA_DIST = ScreenSavers hacks.pot diff --git a/kscreensaver/xsavers/CMakeLists.txt b/kscreensaver/xsavers/CMakeLists.txt index 8cbd8fac..e636ac18 100644 --- a/kscreensaver/xsavers/CMakeLists.txt +++ b/kscreensaver/xsavers/CMakeLists.txt @@ -29,7 +29,7 @@ set( XL_SRCS xlock.cpp ) tde_add_executable( kswarm.kss AUTOMOC SOURCES swarm.cpp ${BASE_SRCS} ${XL_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -42,7 +42,7 @@ if( WITH_OPENGL ) link_directories( ${OPENGL_LIBRARY_DIRS} ) tde_add_executable( kspace.kss AUTOMOC SOURCES space.cpp ${BASE_SRCS} ${XL_SRCS} - LINK kdeui-shared ${OPENGL_LIBRARIES} + LINK tdeui-shared ${OPENGL_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kscreensaver/xsavers/Makefile.am b/kscreensaver/xsavers/Makefile.am index b6fb2584..d9543878 100644 --- a/kscreensaver/xsavers/Makefile.am +++ b/kscreensaver/xsavers/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -UQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE INCLUDES = $(all_includes) $(GLINC) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor if COMPILE_GL_XSAVERS GL_XSAVERS=kspace.kss diff --git a/kwin-styles/cde/CMakeLists.txt b/kwin-styles/cde/CMakeLists.txt index cc24e732..ed7aa565 100644 --- a/kwin-styles/cde/CMakeLists.txt +++ b/kwin-styles/cde/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES cde.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_cde AUTOMOC SOURCES cdeclient.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/cde/Makefile.am b/kwin-styles/cde/Makefile.am index f5ecdfed..afa6fe3e 100644 --- a/kwin-styles/cde/Makefile.am +++ b/kwin-styles/cde/Makefile.am @@ -6,8 +6,8 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin3_cde.la kwin3_cde_la_SOURCES = cdeclient.cpp -kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -kwin3_cde_la_LIBADD = -lkdecorations +kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx +kwin3_cde_la_LIBADD = -ltdecorations METASOURCES = AUTO noinst_HEADERS = cdeclient.h diff --git a/kwin-styles/cde/config/CMakeLists.txt b/kwin-styles/cde/config/CMakeLists.txt index 5c5427b1..9064c2bd 100644 --- a/kwin-styles/cde/config/CMakeLists.txt +++ b/kwin-styles/cde/config/CMakeLists.txt @@ -23,6 +23,6 @@ link_directories( tde_add_kpart( kwin_cde_config AUTOMOC SOURCES config.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/cde/config/Makefile.am b/kwin-styles/cde/config/Makefile.am index a1aa27ce..c84eebab 100644 --- a/kwin-styles/cde/config/Makefile.am +++ b/kwin-styles/cde/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_cde_config.la kwin_cde_config_la_SOURCES = config.cpp -kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx +kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx kwin_cde_config_la_LIBADD = $(LIB_KDEUI) METASOURCES = AUTO diff --git a/kwin-styles/glow/CMakeLists.txt b/kwin-styles/glow/CMakeLists.txt index 50b2330e..f7d776be 100644 --- a/kwin-styles/glow/CMakeLists.txt +++ b/kwin-styles/glow/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES glow.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_glow AUTOMOC SOURCES glowbutton.cpp glowclient.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/glow/Makefile.am b/kwin-styles/glow/Makefile.am index e63c4ef8..53a6448f 100644 --- a/kwin-styles/glow/Makefile.am +++ b/kwin-styles/glow/Makefile.am @@ -6,8 +6,8 @@ SUBDIRS = . config themes kde_module_LTLIBRARIES = kwin3_glow.la kwin3_glow_la_SOURCES = glowclient.cpp glowbutton.cpp -kwin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -kwin3_glow_la_LIBADD = $(LIB_KDECORE) -lkdecorations +kwin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx +kwin3_glow_la_LIBADD = $(LIB_KDECORE) -ltdecorations METASOURCES = AUTO noinst_HEADERS = glowclient.h glowbutton.h resources.h diff --git a/kwin-styles/glow/config/CMakeLists.txt b/kwin-styles/glow/config/CMakeLists.txt index d40532a7..dffdbaa5 100644 --- a/kwin-styles/glow/config/CMakeLists.txt +++ b/kwin-styles/glow/config/CMakeLists.txt @@ -23,6 +23,6 @@ link_directories( tde_add_kpart( kwin_glow_config AUTOMOC SOURCES glowconfigdialog.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/glow/config/Makefile.am b/kwin-styles/glow/config/Makefile.am index c1721d1e..c59217c0 100644 --- a/kwin-styles/glow/config/Makefile.am +++ b/kwin-styles/glow/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_glow_config.la kwin_glow_config_la_SOURCES = glowconfigdialog.cpp -kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx +kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx kwin_glow_config_la_LIBADD = $(LIB_KDEUI) METASOURCES = AUTO diff --git a/kwin-styles/icewm/CMakeLists.txt b/kwin-styles/icewm/CMakeLists.txt index 0766fd51..a156cb68 100644 --- a/kwin-styles/icewm/CMakeLists.txt +++ b/kwin-styles/icewm/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES icewm.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_icewm AUTOMOC SOURCES icewm.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/icewm/Makefile.am b/kwin-styles/icewm/Makefile.am index f5e240f1..97b5e751 100644 --- a/kwin-styles/icewm/Makefile.am +++ b/kwin-styles/icewm/Makefile.am @@ -5,8 +5,8 @@ SUBDIRS = . config icewm-themes kde_module_LTLIBRARIES = kwin3_icewm.la kwin3_icewm_la_SOURCES = icewm.cpp -kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -kwin3_icewm_la_LIBADD = $(LIB_KDEUI) -lkdecorations +kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx +kwin3_icewm_la_LIBADD = $(LIB_KDEUI) -ltdecorations METASOURCES = AUTO noinst_HEADERS = icewm.h diff --git a/kwin-styles/icewm/config/CMakeLists.txt b/kwin-styles/icewm/config/CMakeLists.txt index 479c84a4..f13613d0 100644 --- a/kwin-styles/icewm/config/CMakeLists.txt +++ b/kwin-styles/icewm/config/CMakeLists.txt @@ -23,6 +23,6 @@ link_directories( tde_add_kpart( kwin_icewm_config AUTOMOC SOURCES config.cpp - LINK kdeui-shared kio-shared + LINK tdeui-shared kio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/icewm/config/Makefile.am b/kwin-styles/icewm/config/Makefile.am index 9189f18f..c3888a59 100644 --- a/kwin-styles/icewm/config/Makefile.am +++ b/kwin-styles/icewm/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_icewm_config.la kwin_icewm_config_la_SOURCES = config.cpp -kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx +kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx kwin_icewm_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) METASOURCES = AUTO diff --git a/kwin-styles/kde1/CMakeLists.txt b/kwin-styles/kde1/CMakeLists.txt index dec7a69b..0fdd3cf0 100644 --- a/kwin-styles/kde1/CMakeLists.txt +++ b/kwin-styles/kde1/CMakeLists.txt @@ -27,6 +27,6 @@ install( FILES kde1.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_kde1 AUTOMOC SOURCES kde1client.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/kde1/Makefile.am b/kwin-styles/kde1/Makefile.am index c47be9c8..e831ed7a 100644 --- a/kwin-styles/kde1/Makefile.am +++ b/kwin-styles/kde1/Makefile.am @@ -4,8 +4,8 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_kde1.la kwin3_kde1_la_SOURCES = kde1client.cpp -kwin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -kwin3_kde1_la_LIBADD = -lkdecorations +kwin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx +kwin3_kde1_la_LIBADD = -ltdecorations METASOURCES = AUTO noinst_HEADERS = kde1client.h diff --git a/kwin-styles/kstep/CMakeLists.txt b/kwin-styles/kstep/CMakeLists.txt index 0344dd47..ae3d135a 100644 --- a/kwin-styles/kstep/CMakeLists.txt +++ b/kwin-styles/kstep/CMakeLists.txt @@ -27,6 +27,6 @@ install( FILES kstep.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_kstep AUTOMOC SOURCES nextclient.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/kstep/Makefile.am b/kwin-styles/kstep/Makefile.am index 1294e533..0d62e272 100644 --- a/kwin-styles/kstep/Makefile.am +++ b/kwin-styles/kstep/Makefile.am @@ -4,9 +4,9 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_kstep.la kwin3_kstep_la_SOURCES = nextclient.cpp -kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx +kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx #kwin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) -kwin3_kstep_la_LIBADD = $(LIB_KDEUI) -lkdecorations +kwin3_kstep_la_LIBADD = $(LIB_KDEUI) -ltdecorations METASOURCES = AUTO noinst_HEADERS = nextclient.h diff --git a/kwin-styles/openlook/CMakeLists.txt b/kwin-styles/openlook/CMakeLists.txt index 6727bb48..851ec25f 100644 --- a/kwin-styles/openlook/CMakeLists.txt +++ b/kwin-styles/openlook/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES openlook.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_openlook AUTOMOC SOURCES OpenLook.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/openlook/Makefile.am b/kwin-styles/openlook/Makefile.am index abf08664..b034ee40 100644 --- a/kwin-styles/openlook/Makefile.am +++ b/kwin-styles/openlook/Makefile.am @@ -3,8 +3,8 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_openlook.la kwin3_openlook_la_SOURCES = OpenLook.cpp -kwin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -kwin3_openlook_la_LIBADD = -lkdecorations +kwin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx +kwin3_openlook_la_LIBADD = -ltdecorations noinst_HEADERS = OpenLook.h METASOURCES = AUTO diff --git a/kwin-styles/riscos/CMakeLists.txt b/kwin-styles/riscos/CMakeLists.txt index 470b6f9f..cba21db4 100644 --- a/kwin-styles/riscos/CMakeLists.txt +++ b/kwin-styles/riscos/CMakeLists.txt @@ -47,6 +47,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/riscos/Makefile.am b/kwin-styles/riscos/Makefile.am index 3f81820d..15f9d657 100644 --- a/kwin-styles/riscos/Makefile.am +++ b/kwin-styles/riscos/Makefile.am @@ -31,8 +31,8 @@ kwin3_riscos_la_SOURCES = AboveButton.cpp \ Static.cpp \ StickyButton.cpp -kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -kwin3_riscos_la_LIBADD = $(LIB_KDEUI) -lkdecorations +kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx +kwin3_riscos_la_LIBADD = $(LIB_KDEUI) -ltdecorations kwin3_riscos_la_METASOURCES = AUTO EXTRA_DIST = $(kwin_DATA) diff --git a/kwin-styles/smooth-blend/client/CMakeLists.txt b/kwin-styles/smooth-blend/client/CMakeLists.txt index 09011c41..5b75b64a 100644 --- a/kwin-styles/smooth-blend/client/CMakeLists.txt +++ b/kwin-styles/smooth-blend/client/CMakeLists.txt @@ -33,6 +33,6 @@ install( FILES smoothblend.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_smoothblend AUTOMOC SOURCES smoothblend.cc - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/smooth-blend/client/Makefile.am b/kwin-styles/smooth-blend/client/Makefile.am index d9ace4d7..0dbad400 100644 --- a/kwin-styles/smooth-blend/client/Makefile.am +++ b/kwin-styles/smooth-blend/client/Makefile.am @@ -13,8 +13,8 @@ noinst_HEADERS = smoothblend.h buttons.h kde_module_LTLIBRARIES = kwin3_smoothblend.la kwin3_smoothblend_la_SOURCES = smoothblend.cc -kwin3_smoothblend_la_LIBADD = -lkdecorations -kwin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx +kwin3_smoothblend_la_LIBADD = -ltdecorations +kwin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx kwin3_smoothblend_la_METASOURCES = AUTO DISTCLEANFILES = $(kwin3_smoothblend_la_METASOURCES) diff --git a/kwin-styles/smooth-blend/client/config/CMakeLists.txt b/kwin-styles/smooth-blend/client/config/CMakeLists.txt index 6f858e92..51502659 100644 --- a/kwin-styles/smooth-blend/client/config/CMakeLists.txt +++ b/kwin-styles/smooth-blend/client/config/CMakeLists.txt @@ -27,6 +27,6 @@ link_directories( tde_add_kpart( kwin_smoothblend_config AUTOMOC SOURCES configdialog.ui smoothblendconfig.cc - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/smooth-blend/client/config/Makefile.am b/kwin-styles/smooth-blend/client/config/Makefile.am index f50eb0fa..60f26078 100644 --- a/kwin-styles/smooth-blend/client/config/Makefile.am +++ b/kwin-styles/smooth-blend/client/config/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = smoothblendconfig.h kde_module_LTLIBRARIES = kwin_smoothblend_config.la kwin_smoothblend_config_la_SOURCES = configdialog.ui smoothblendconfig.cc -kwin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx +kwin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx kwin_smoothblend_config_la_LIBADD = $(LIB_KDEUI) kwin_smoothblend_config_la_METASOURCES = AUTO diff --git a/kwin-styles/system/CMakeLists.txt b/kwin-styles/system/CMakeLists.txt index cc795673..bc78b14c 100644 --- a/kwin-styles/system/CMakeLists.txt +++ b/kwin-styles/system/CMakeLists.txt @@ -27,6 +27,6 @@ install( FILES system.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) tde_add_kpart( kwin3_system AUTOMOC SOURCES systemclient.cpp - LINK kdecorations-shared + LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin-styles/system/Makefile.am b/kwin-styles/system/Makefile.am index d94361f6..2514fe79 100644 --- a/kwin-styles/system/Makefile.am +++ b/kwin-styles/system/Makefile.am @@ -4,9 +4,9 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_system.la kwin3_system_la_SOURCES = systemclient.cpp -kwin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx +kwin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx #kwin_system_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) -kwin3_system_la_LIBADD = $(LIB_KDEUI) -lkdecorations +kwin3_system_la_LIBADD = $(LIB_KDEUI) -ltdecorations METASOURCES = AUTO noinst_HEADERS = systemclient.h diff --git a/styles/dotnet/CMakeLists.txt b/styles/dotnet/CMakeLists.txt index cd006941..ca13ae7b 100644 --- a/styles/dotnet/CMakeLists.txt +++ b/styles/dotnet/CMakeLists.txt @@ -38,6 +38,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/styles/dotnet/Makefile.am b/styles/dotnet/Makefile.am index 513221e8..4dfc95b7 100644 --- a/styles/dotnet/Makefile.am +++ b/styles/dotnet/Makefile.am @@ -24,8 +24,8 @@ METASOURCES = AUTO INCLUDES = $(all_includes) noinst_HEADERS = dotnet.h kde_style_LTLIBRARIES = dotnet.la -dotnet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -dotnet_la_LIBADD = -lkdefx +dotnet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx +dotnet_la_LIBADD = -ltdefx dotnet_la_SOURCES = dotnet.cpp themercdir = $(kde_datadir)/kstyle/themes diff --git a/styles/phase/CMakeLists.txt b/styles/phase/CMakeLists.txt index c3c96bd4..8f2d6d66 100644 --- a/styles/phase/CMakeLists.txt +++ b/styles/phase/CMakeLists.txt @@ -40,6 +40,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared + LINK tdefx-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/styles/phase/Makefile.am b/styles/phase/Makefile.am index ae98c9e0..d0931776 100644 --- a/styles/phase/Makefile.am +++ b/styles/phase/Makefile.am @@ -15,8 +15,8 @@ noinst_HEADERS = phasestyle.h bitmaps.h kde_style_LTLIBRARIES = phasestyle.la phasestyle_la_SOURCES = phasestyle.cpp -phasestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -phasestyle_la_LIBADD = -lkdefx -lkdecore +phasestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx +phasestyle_la_LIBADD = -ltdefx -ltdecore phasestyle_la_METASOURCES = AUTO DISTCLEANFILES = $(phasestyle_la_METASOURCES) diff --git a/styles/phase/config/CMakeLists.txt b/styles/phase/config/CMakeLists.txt index fefcc9f2..926bb0b5 100644 --- a/styles/phase/config/CMakeLists.txt +++ b/styles/phase/config/CMakeLists.txt @@ -30,6 +30,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/styles/phase/config/Makefile.am b/styles/phase/config/Makefile.am index 1c09e305..e560f89f 100644 --- a/styles/phase/config/Makefile.am +++ b/styles/phase/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) noinst_HEADERS = phasestyleconfig.h kde_module_LTLIBRARIES = kstyle_phase_config.la -kstyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx +kstyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx kstyle_phase_config_la_LIBADD = $(LIB_KDEUI) kstyle_phase_config_la_SOURCES = phasestyleconfig.cpp styledialog.ui kstyle_phase_config_la_METASOURCES = AUTO -- cgit v1.2.3