summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kscreensaver/kdesavers/Makefile.am4
-rw-r--r--kscreensaver/kpartsaver/Makefile.am2
-rw-r--r--kscreensaver/kxsconfig/Makefile.am4
-rw-r--r--kscreensaver/xsavers/Makefile.am6
-rw-r--r--kwin-styles/cde/Makefile.am2
-rw-r--r--kwin-styles/cde/config/Makefile.am4
-rw-r--r--kwin-styles/glow/Makefile.am4
-rw-r--r--kwin-styles/glow/config/Makefile.am4
-rw-r--r--kwin-styles/icewm/Makefile.am4
-rw-r--r--kwin-styles/icewm/config/Makefile.am4
-rw-r--r--kwin-styles/kde1/Makefile.am2
-rw-r--r--kwin-styles/kstep/Makefile.am4
-rw-r--r--kwin-styles/openlook/Makefile.am2
-rw-r--r--kwin-styles/riscos/Makefile.am4
-rw-r--r--kwin-styles/smooth-blend/client/Makefile.am2
-rw-r--r--kwin-styles/smooth-blend/client/config/Makefile.am4
-rw-r--r--kwin-styles/system/Makefile.am4
-rw-r--r--styles/dotnet/Makefile.am2
-rw-r--r--styles/phase/Makefile.am2
-rw-r--r--styles/phase/config/Makefile.am4
20 files changed, 34 insertions, 34 deletions
diff --git a/kscreensaver/kdesavers/Makefile.am b/kscreensaver/kdesavers/Makefile.am
index 33418784..f5901663 100644
--- a/kscreensaver/kdesavers/Makefile.am
+++ b/kscreensaver/kdesavers/Makefile.am
@@ -7,8 +7,8 @@ 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) -ltdefx $(LIB_KIO) -lktexteditor
-AM_LDADD = $(LIB_KDEUI) -lkscreensaver
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDADD = $(LIB_TDEUI) -lkscreensaver
if COMPILE_X11_KSAVERS
X11_KSAVERS = kscience.kss
diff --git a/kscreensaver/kpartsaver/Makefile.am b/kscreensaver/kpartsaver/Makefile.am
index 2d1ca6eb..48546bac 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) -ltdefx $(LIB_KIO) -lktexteditor
+kpartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -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 81c4a3a7..d3459b01 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) -ltdefx $(LIB_KIO) -lktexteditor
+kxsconfig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kxsconfig_LDADD = $(LIB_KIO) -lXt
-kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kxsrun_LDADD = $(LIB_KIO)
EXTRA_DIST = ScreenSavers hacks.pot
diff --git a/kscreensaver/xsavers/Makefile.am b/kscreensaver/xsavers/Makefile.am
index d9543878..b5451c7a 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) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
if COMPILE_GL_XSAVERS
GL_XSAVERS=kspace.kss
@@ -15,10 +15,10 @@ XS_SRCS = xs_colors.c xs_hsv.c xs_visual.c
XL_SRCS = xlock.cpp
kswarm_kss_SOURCES = swarm.cpp $(BASE_SRCS) $(XL_SRCS)
-kswarm_kss_LDADD = $(LIB_KDEUI) -lm
+kswarm_kss_LDADD = $(LIB_TDEUI) -lm
kspace_kss_SOURCES = space.cpp $(BASE_SRCS) $(XL_SRCS)
-kspace_kss_LDADD = $(LIB_KDEUI) $(GLLIB) -lm
+kspace_kss_LDADD = $(LIB_TDEUI) $(GLLIB) -lm
METASOURCES = AUTO
diff --git a/kwin-styles/cde/Makefile.am b/kwin-styles/cde/Makefile.am
index afa6fe3e..6bf41213 100644
--- a/kwin-styles/cde/Makefile.am
+++ b/kwin-styles/cde/Makefile.am
@@ -6,7 +6,7 @@ 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) -ltdefx
+kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
kwin3_cde_la_LIBADD = -ltdecorations
METASOURCES = AUTO
diff --git a/kwin-styles/cde/config/Makefile.am b/kwin-styles/cde/config/Makefile.am
index c84eebab..d5c6da85 100644
--- a/kwin-styles/cde/config/Makefile.am
+++ b/kwin-styles/cde/config/Makefile.am
@@ -3,8 +3,8 @@ 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) -ltdefx
-kwin_cde_config_la_LIBADD = $(LIB_KDEUI)
+kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+kwin_cde_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h
diff --git a/kwin-styles/glow/Makefile.am b/kwin-styles/glow/Makefile.am
index 53a6448f..2b477594 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) -ltdefx
-kwin3_glow_la_LIBADD = $(LIB_KDECORE) -ltdecorations
+kwin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+kwin3_glow_la_LIBADD = $(LIB_TDECORE) -ltdecorations
METASOURCES = AUTO
noinst_HEADERS = glowclient.h glowbutton.h resources.h
diff --git a/kwin-styles/glow/config/Makefile.am b/kwin-styles/glow/config/Makefile.am
index c59217c0..ea82f75a 100644
--- a/kwin-styles/glow/config/Makefile.am
+++ b/kwin-styles/glow/config/Makefile.am
@@ -3,8 +3,8 @@ 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) -ltdefx
-kwin_glow_config_la_LIBADD = $(LIB_KDEUI)
+kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+kwin_glow_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO
noinst_HEADERS = glowconfigdialog.h
diff --git a/kwin-styles/icewm/Makefile.am b/kwin-styles/icewm/Makefile.am
index 97b5e751..25d4e613 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) -ltdefx
-kwin3_icewm_la_LIBADD = $(LIB_KDEUI) -ltdecorations
+kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+kwin3_icewm_la_LIBADD = $(LIB_TDEUI) -ltdecorations
METASOURCES = AUTO
noinst_HEADERS = icewm.h
diff --git a/kwin-styles/icewm/config/Makefile.am b/kwin-styles/icewm/config/Makefile.am
index c3888a59..5e026009 100644
--- a/kwin-styles/icewm/config/Makefile.am
+++ b/kwin-styles/icewm/config/Makefile.am
@@ -3,8 +3,8 @@ 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) -ltdefx
-kwin_icewm_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+kwin_icewm_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
METASOURCES = AUTO
noinst_HEADERS = config.h
diff --git a/kwin-styles/kde1/Makefile.am b/kwin-styles/kde1/Makefile.am
index e831ed7a..3e60b337 100644
--- a/kwin-styles/kde1/Makefile.am
+++ b/kwin-styles/kde1/Makefile.am
@@ -4,7 +4,7 @@ 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) -ltdefx
+kwin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
kwin3_kde1_la_LIBADD = -ltdecorations
METASOURCES = AUTO
diff --git a/kwin-styles/kstep/Makefile.am b/kwin-styles/kstep/Makefile.am
index 0d62e272..365cfe0f 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) -ltdefx
+kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
#kwin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-kwin3_kstep_la_LIBADD = $(LIB_KDEUI) -ltdecorations
+kwin3_kstep_la_LIBADD = $(LIB_TDEUI) -ltdecorations
METASOURCES = AUTO
noinst_HEADERS = nextclient.h
diff --git a/kwin-styles/openlook/Makefile.am b/kwin-styles/openlook/Makefile.am
index b034ee40..c3ec6c4a 100644
--- a/kwin-styles/openlook/Makefile.am
+++ b/kwin-styles/openlook/Makefile.am
@@ -3,7 +3,7 @@ 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) -ltdefx
+kwin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
kwin3_openlook_la_LIBADD = -ltdecorations
noinst_HEADERS = OpenLook.h
diff --git a/kwin-styles/riscos/Makefile.am b/kwin-styles/riscos/Makefile.am
index 15f9d657..abf062d3 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) -ltdefx
-kwin3_riscos_la_LIBADD = $(LIB_KDEUI) -ltdecorations
+kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+kwin3_riscos_la_LIBADD = $(LIB_TDEUI) -ltdecorations
kwin3_riscos_la_METASOURCES = AUTO
EXTRA_DIST = $(kwin_DATA)
diff --git a/kwin-styles/smooth-blend/client/Makefile.am b/kwin-styles/smooth-blend/client/Makefile.am
index 0dbad400..2309046e 100644
--- a/kwin-styles/smooth-blend/client/Makefile.am
+++ b/kwin-styles/smooth-blend/client/Makefile.am
@@ -14,7 +14,7 @@ noinst_HEADERS = smoothblend.h buttons.h
kde_module_LTLIBRARIES = kwin3_smoothblend.la
kwin3_smoothblend_la_SOURCES = smoothblend.cc
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_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
kwin3_smoothblend_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin3_smoothblend_la_METASOURCES)
diff --git a/kwin-styles/smooth-blend/client/config/Makefile.am b/kwin-styles/smooth-blend/client/config/Makefile.am
index 60f26078..2f89fd8b 100644
--- a/kwin-styles/smooth-blend/client/config/Makefile.am
+++ b/kwin-styles/smooth-blend/client/config/Makefile.am
@@ -8,8 +8,8 @@ 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) -ltdefx
-kwin_smoothblend_config_la_LIBADD = $(LIB_KDEUI)
+kwin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+kwin_smoothblend_config_la_LIBADD = $(LIB_TDEUI)
kwin_smoothblend_config_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin_smoothblend_config_la_METASOURCES)
diff --git a/kwin-styles/system/Makefile.am b/kwin-styles/system/Makefile.am
index 2514fe79..584c2d10 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) -ltdefx
+kwin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
#kwin_system_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-kwin3_system_la_LIBADD = $(LIB_KDEUI) -ltdecorations
+kwin3_system_la_LIBADD = $(LIB_TDEUI) -ltdecorations
METASOURCES = AUTO
noinst_HEADERS = systemclient.h
diff --git a/styles/dotnet/Makefile.am b/styles/dotnet/Makefile.am
index 4dfc95b7..3fe44339 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_KDECORE) $(LIB_KDEUI) -ltdefx
+dotnet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(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 d0931776..8de17fe8 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_KDECORE) $(LIB_KDEUI) -ltdefx
+phasestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(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 e560f89f..5287e822 100644
--- a/styles/phase/config/Makefile.am
+++ b/styles/phase/config/Makefile.am
@@ -3,8 +3,8 @@ 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) -ltdefx
-kstyle_phase_config_la_LIBADD = $(LIB_KDEUI)
+kstyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+kstyle_phase_config_la_LIBADD = $(LIB_TDEUI)
kstyle_phase_config_la_SOURCES = phasestyleconfig.cpp styledialog.ui
kstyle_phase_config_la_METASOURCES = AUTO