diff --git a/styles/dotnet/Makefile.am b/styles/dotnet/Makefile.am index b3820dc7..6132c562 100644 --- a/styles/dotnet/Makefile.am +++ b/styles/dotnet/Makefile.am @@ -24,7 +24,7 @@ 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_TDECORE) $(LIB_TDEUI) -ltdefx +dotnet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx dotnet_la_LIBADD = -ltdefx dotnet_la_SOURCES = dotnet.cpp diff --git a/styles/phase/Makefile.am b/styles/phase/Makefile.am index 6f2639c9..77c720c9 100644 --- a/styles/phase/Makefile.am +++ b/styles/phase/Makefile.am @@ -15,7 +15,7 @@ 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_TDECORE) $(LIB_TDEUI) -ltdefx +phasestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx phasestyle_la_LIBADD = -ltdefx -ltdecore phasestyle_la_METASOURCES = AUTO diff --git a/styles/phase/config/Makefile.am b/styles/phase/config/Makefile.am index 9de45593..ba9eb636 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 = tdestyle_phase_config.la -tdestyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +tdestyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx tdestyle_phase_config_la_LIBADD = $(LIB_TDEUI) tdestyle_phase_config_la_SOURCES = phasestyleconfig.cpp styledialog.ui tdestyle_phase_config_la_METASOURCES = AUTO diff --git a/tdescreensaver/kdesavers/Makefile.am b/tdescreensaver/kdesavers/Makefile.am index 9a2f1adb..b5ba9419 100644 --- a/tdescreensaver/kdesavers/Makefile.am +++ b/tdescreensaver/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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor AM_LDADD = $(LIB_TDEUI) -ltdescreensaver if COMPILE_X11_KSAVERS diff --git a/tdescreensaver/kxsconfig/Makefile.am b/tdescreensaver/kxsconfig/Makefile.am index 7588e80c..81bc5113 100644 --- a/tdescreensaver/kxsconfig/Makefile.am +++ b/tdescreensaver/kxsconfig/Makefile.am @@ -1,10 +1,10 @@ ## Makefile.am of tdebase/tdescreensaver/kxsconfig INCLUDES = $(all_includes) -kxsconfig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kxsconfig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kxsconfig_LDADD = $(LIB_TDEIO) -lXt -kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kxsrun_LDADD = $(LIB_TDEIO) EXTRA_DIST = ScreenSavers hacks.pot diff --git a/tdescreensaver/tdepartsaver/Makefile.am b/tdescreensaver/tdepartsaver/Makefile.am index 0a6fc981..3f142407 100644 --- a/tdescreensaver/tdepartsaver/Makefile.am +++ b/tdescreensaver/tdepartsaver/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = tdepartsaver.kss INCLUDES = $(all_includes) tdepartsaver_kss_SOURCES = tdepartsaver.cpp configwidget.ui -tdepartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdepartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor tdepartsaver_kss_LDADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) -ltdescreensaver METASOURCES = AUTO diff --git a/tdescreensaver/xsavers/Makefile.am b/tdescreensaver/xsavers/Makefile.am index 94241454..ff7cddd8 100644 --- a/tdescreensaver/xsavers/Makefile.am +++ b/tdescreensaver/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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor if COMPILE_GL_XSAVERS GL_XSAVERS=kspace.kss diff --git a/twin-styles/cde/Makefile.am b/twin-styles/cde/Makefile.am index 129a22bc..32f2c987 100644 --- a/twin-styles/cde/Makefile.am +++ b/twin-styles/cde/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = twin3_cde.la twin3_cde_la_SOURCES = cdeclient.cpp -twin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin3_cde_la_LIBADD = -ltdecorations METASOURCES = AUTO diff --git a/twin-styles/cde/config/Makefile.am b/twin-styles/cde/config/Makefile.am index 3e5bd243..56072bb4 100644 --- a/twin-styles/cde/config/Makefile.am +++ b/twin-styles/cde/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = twin_cde_config.la twin_cde_config_la_SOURCES = config.cpp -twin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin_cde_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO diff --git a/twin-styles/glow/Makefile.am b/twin-styles/glow/Makefile.am index bb624e59..ef4ae58b 100644 --- a/twin-styles/glow/Makefile.am +++ b/twin-styles/glow/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = . config themes kde_module_LTLIBRARIES = twin3_glow.la twin3_glow_la_SOURCES = glowclient.cpp glowbutton.cpp -twin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin3_glow_la_LIBADD = $(LIB_TDECORE) -ltdecorations METASOURCES = AUTO diff --git a/twin-styles/glow/config/Makefile.am b/twin-styles/glow/config/Makefile.am index bf3d334b..1f9d1f12 100644 --- a/twin-styles/glow/config/Makefile.am +++ b/twin-styles/glow/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = twin_glow_config.la twin_glow_config_la_SOURCES = glowconfigdialog.cpp -twin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin_glow_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO diff --git a/twin-styles/icewm/Makefile.am b/twin-styles/icewm/Makefile.am index e067c531..711b9088 100644 --- a/twin-styles/icewm/Makefile.am +++ b/twin-styles/icewm/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = . config icewm-themes kde_module_LTLIBRARIES = twin3_icewm.la twin3_icewm_la_SOURCES = icewm.cpp -twin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin3_icewm_la_LIBADD = $(LIB_TDEUI) -ltdecorations METASOURCES = AUTO diff --git a/twin-styles/icewm/config/Makefile.am b/twin-styles/icewm/config/Makefile.am index b2b9b857..3c208fe6 100644 --- a/twin-styles/icewm/config/Makefile.am +++ b/twin-styles/icewm/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = twin_icewm_config.la twin_icewm_config_la_SOURCES = config.cpp -twin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin_icewm_config_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) METASOURCES = AUTO diff --git a/twin-styles/kde1/Makefile.am b/twin-styles/kde1/Makefile.am index 131b71a4..16b2c0b3 100644 --- a/twin-styles/kde1/Makefile.am +++ b/twin-styles/kde1/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = twin3_kde1.la twin3_kde1_la_SOURCES = kde1client.cpp -twin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin3_kde1_la_LIBADD = -ltdecorations METASOURCES = AUTO diff --git a/twin-styles/kstep/Makefile.am b/twin-styles/kstep/Makefile.am index 3fff6355..bfda21da 100644 --- a/twin-styles/kstep/Makefile.am +++ b/twin-styles/kstep/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = twin3_kstep.la twin3_kstep_la_SOURCES = nextclient.cpp -twin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx #twin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) twin3_kstep_la_LIBADD = $(LIB_TDEUI) -ltdecorations diff --git a/twin-styles/openlook/Makefile.am b/twin-styles/openlook/Makefile.am index 32b41684..5d6c4f7a 100644 --- a/twin-styles/openlook/Makefile.am +++ b/twin-styles/openlook/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = twin3_openlook.la twin3_openlook_la_SOURCES = OpenLook.cpp -twin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin3_openlook_la_LIBADD = -ltdecorations noinst_HEADERS = OpenLook.h diff --git a/twin-styles/riscos/Makefile.am b/twin-styles/riscos/Makefile.am index 773c341b..d23ba191 100644 --- a/twin-styles/riscos/Makefile.am +++ b/twin-styles/riscos/Makefile.am @@ -31,7 +31,7 @@ twin3_riscos_la_SOURCES = AboveButton.cpp \ Static.cpp \ StickyButton.cpp -twin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin3_riscos_la_LIBADD = $(LIB_TDEUI) -ltdecorations twin3_riscos_la_METASOURCES = AUTO diff --git a/twin-styles/smooth-blend/client/Makefile.am b/twin-styles/smooth-blend/client/Makefile.am index 056765d6..4f5d32fe 100644 --- a/twin-styles/smooth-blend/client/Makefile.am +++ b/twin-styles/smooth-blend/client/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = smoothblend.h buttons.h kde_module_LTLIBRARIES = twin3_smoothblend.la twin3_smoothblend_la_SOURCES = smoothblend.cc twin3_smoothblend_la_LIBADD = -ltdecorations -twin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin3_smoothblend_la_METASOURCES = AUTO DISTCLEANFILES = $(twin3_smoothblend_la_METASOURCES) diff --git a/twin-styles/smooth-blend/client/config/Makefile.am b/twin-styles/smooth-blend/client/config/Makefile.am index ba5cd314..3358bd06 100644 --- a/twin-styles/smooth-blend/client/config/Makefile.am +++ b/twin-styles/smooth-blend/client/config/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = smoothblendconfig.h kde_module_LTLIBRARIES = twin_smoothblend_config.la twin_smoothblend_config_la_SOURCES = configdialog.ui smoothblendconfig.cc -twin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx twin_smoothblend_config_la_LIBADD = $(LIB_TDEUI) twin_smoothblend_config_la_METASOURCES = AUTO diff --git a/twin-styles/system/Makefile.am b/twin-styles/system/Makefile.am index 5b401370..c50034f4 100644 --- a/twin-styles/system/Makefile.am +++ b/twin-styles/system/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = twin3_system.la twin3_system_la_SOURCES = systemclient.cpp -twin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx +twin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx #twin_system_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) twin3_system_la_LIBADD = $(LIB_TDEUI) -ltdecorations