summaryrefslogtreecommitdiffstats
path: root/kopete
diff options
context:
space:
mode:
Diffstat (limited to 'kopete')
-rw-r--r--kopete/kopete/Makefile.am2
-rw-r--r--kopete/kopete/addaccountwizard/Makefile.am2
-rw-r--r--kopete/kopete/addcontactwizard/Makefile.am2
-rw-r--r--kopete/kopete/chatwindow/Makefile.am8
-rw-r--r--kopete/kopete/contactlist/Makefile.am2
-rw-r--r--kopete/kopete/kconf_update/Makefile.am8
-rw-r--r--kopete/libkopete/avdevice/Makefile.am4
-rw-r--r--kopete/libkopete/compat/Makefile.am2
-rw-r--r--kopete/libkopete/private/Makefile.am2
-rw-r--r--kopete/plugins/smpppdcs/unittest/Makefile.am2
-rw-r--r--kopete/protocols/oscar/liboscar/Makefile.am2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/Makefile.am16
-rw-r--r--kopete/protocols/yahoo/libkyahoo/tests/Makefile.am4
13 files changed, 28 insertions, 28 deletions
diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am
index c5b22ac2..b9ee1df9 100644
--- a/kopete/kopete/Makefile.am
+++ b/kopete/kopete/Makefile.am
@@ -33,7 +33,7 @@ kopete_SOURCES = main.cpp kopeteapplication.cpp kopeteiface.cpp \
kimiface_DIR = $(kde_includes)
-kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_KDECORE) -ltdefx -lDCOP
+kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_TDECORE) -ltdefx -lDCOP
kopete_LDADD = \
addcontactwizard/libkopeteaddcontactwizard.la \
addaccountwizard/libkopeteaddaccountwizard.la \
diff --git a/kopete/kopete/addaccountwizard/Makefile.am b/kopete/kopete/addaccountwizard/Makefile.am
index cb491b46..1bb1c4c8 100644
--- a/kopete/kopete/addaccountwizard/Makefile.am
+++ b/kopete/kopete/addaccountwizard/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = addaccountwizard.h
libkopeteaddaccountwizard_la_SOURCES = addaccountwizardpage1.ui addaccountwizardpage2.ui addaccountwizardpage3.ui addaccountwizard.cpp
libkopeteaddaccountwizard_la_LDFLAGS = $(all_libraries) -no-undefined
-libkopeteaddaccountwizard_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KDEUI)
+libkopeteaddaccountwizard_la_LIBADD = ../../libkopete/libkopete.la $(LIB_TDEUI)
# vim: set noet:
diff --git a/kopete/kopete/addcontactwizard/Makefile.am b/kopete/kopete/addcontactwizard/Makefile.am
index 9289b747..900e55eb 100644
--- a/kopete/kopete/addcontactwizard/Makefile.am
+++ b/kopete/kopete/addcontactwizard/Makefile.am
@@ -7,6 +7,6 @@ noinst_HEADERS = addcontactwizard.h
libkopeteaddcontactwizard_la_SOURCES = addcontactwizard_base.ui addcontactwizard.cpp
libkopeteaddcontactwizard_la_LDFLAGS = $(all_libraries) -no-undefined
-libkopeteaddcontactwizard_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KDEUI) $(LIB_KABC)
+libkopeteaddcontactwizard_la_LIBADD = ../../libkopete/libkopete.la $(LIB_TDEUI) $(LIB_KABC)
# vim: set noet:
diff --git a/kopete/kopete/chatwindow/Makefile.am b/kopete/kopete/chatwindow/Makefile.am
index bcec2bed..36ec4f47 100644
--- a/kopete/kopete/chatwindow/Makefile.am
+++ b/kopete/kopete/chatwindow/Makefile.am
@@ -6,21 +6,21 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) -I$(top_srcdir)/kopet
kopete_chatwindow_la_SOURCES = chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp
kopete_chatwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_KDEUI)
+kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_TDEUI)
kopete_emailwindow_la_SOURCES = kopeteemailwindow.cpp
kopete_emailwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_KDEUI)
+kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_TDEUI)
libkrichtexteditpart_la_SOURCES = krichtexteditpart.cpp
libkrichtexteditpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
-libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_KDEPRINT)
+libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_TDEPRINT)
libkopetechatwindow_la_SOURCES = chatmessagepart.cpp emoticonselector.cpp kopeteemoticonaction.cpp \
chattexteditpart.cpp krichtexteditpart.cpp kopetechatwindowstylemanager.cpp \
kopetechatwindowstyle.cpp
libkopetechatwindow_la_LDFLAGS = $(all_libraries) -no-undefined
-libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_KDEUI)
+libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_TDEUI)
partdir = $(kde_datadir)/kopeterichtexteditpart
part_DATA = kopeterichtexteditpartfull.rc
diff --git a/kopete/kopete/contactlist/Makefile.am b/kopete/kopete/contactlist/Makefile.am
index 9061eb86..5a6036e2 100644
--- a/kopete/kopete/contactlist/Makefile.am
+++ b/kopete/kopete/contactlist/Makefile.am
@@ -19,7 +19,7 @@ libkopetecontactlist_la_SOURCES = kopetemetacontactlvi.cpp \
kabcexport_base.ui
libkopetecontactlist_la_LDFLAGS = $(all_libraries) -ltdefx
-libkopetecontactlist_la_LIBADD = -lkabc ../../libkopete/libkopete.la ../addcontactwizard/libkopeteaddcontactwizard.la $(LIB_KDEUI) $(LIB_XRENDER)
+libkopetecontactlist_la_LIBADD = -lkabc ../../libkopete/libkopete.la ../addcontactwizard/libkopeteaddcontactwizard.la $(LIB_TDEUI) $(LIB_XRENDER)
noinst_HEADERS = kopeteaddrbookexport.h customnotificationprops.h kabcexport.h
diff --git a/kopete/kopete/kconf_update/Makefile.am b/kopete/kopete/kconf_update/Makefile.am
index 6b7db7d5..8d05b1a2 100644
--- a/kopete/kopete/kconf_update/Makefile.am
+++ b/kopete/kopete/kconf_update/Makefile.am
@@ -17,16 +17,16 @@ kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \
kconfdir = $(libdir)/kconf_update_bin
kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp
-kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_account_kconf_update_LDADD = $(LIB_QT)
kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp
-kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT)
kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp
-kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_KDECORE)
+kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
# vim: set noet:
diff --git a/kopete/libkopete/avdevice/Makefile.am b/kopete/libkopete/avdevice/Makefile.am
index 5000288c..1df830a1 100644
--- a/kopete/libkopete/avdevice/Makefile.am
+++ b/kopete/libkopete/avdevice/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CA
METASOURCES = AUTO
lib_LTLIBRARIES = libkopete_videodevice.la
noinst_LTLIBRARIES = libkvideoio.la
-libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \
videodevicemodelpool.h videodevicepool.h videoinput.h \
@@ -15,4 +15,4 @@ libkopete_videodevice_la_SOURCES = videocontrol.cpp videodevice.cpp \
sonix_compress.cpp bayer.cpp
libkvideoio_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 1:0:0
libkvideoio_la_SOURCES = kxv.cpp qvideo.cpp qvideostream.cpp
-libkvideoio_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(GLLIB)
+libkvideoio_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(GLLIB)
diff --git a/kopete/libkopete/compat/Makefile.am b/kopete/libkopete/compat/Makefile.am
index 6723bcf5..27fc0805 100644
--- a/kopete/libkopete/compat/Makefile.am
+++ b/kopete/libkopete/compat/Makefile.am
@@ -4,5 +4,5 @@ noinst_LTLIBRARIES = libkopetecompat.la
libkopetecompat_la_SOURCES = kpixmapregionselectordialog.cpp kpixmapregionselectorwidget.cpp
libkopetecompat_la_LDFLAGS = -no-undefined $(all_libraries)
-libkopetecompat_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE)
+libkopetecompat_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE)
diff --git a/kopete/libkopete/private/Makefile.am b/kopete/libkopete/private/Makefile.am
index 15e930df..3dc2ca73 100644
--- a/kopete/libkopete/private/Makefile.am
+++ b/kopete/libkopete/private/Makefile.am
@@ -8,6 +8,6 @@ noinst_LTLIBRARIES = libkopeteprivate.la
libkopeteprivate_la_SOURCES = kopeteemoticons.cpp \
kopetecommand.cpp kopeteviewmanager.cpp kopeteutils_private.cpp
libkopeteprivate_la_LDFLAGS = $(all_libraries)
-libkopeteprivate_la_LIBADD = $(LIB_KDEUI)
+libkopeteprivate_la_LIBADD = $(LIB_TDEUI)
# vim: set noet:
diff --git a/kopete/plugins/smpppdcs/unittest/Makefile.am b/kopete/plugins/smpppdcs/unittest/Makefile.am
index 89718cd6..093f425d 100644
--- a/kopete/plugins/smpppdcs/unittest/Makefile.am
+++ b/kopete/plugins/smpppdcs/unittest/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
check_PROGRAMS = smpppdcstests
smpppdcstests_SOURCES = main.cpp clienttest.cpp
-smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui
noinst_HEADERS = clienttest.h
diff --git a/kopete/protocols/oscar/liboscar/Makefile.am b/kopete/protocols/oscar/liboscar/Makefile.am
index ea757b69..ab0def67 100644
--- a/kopete/protocols/oscar/liboscar/Makefile.am
+++ b/kopete/protocols/oscar/liboscar/Makefile.am
@@ -22,5 +22,5 @@ liboscar_la_SOURCES = oscarutils.cpp client.cpp task.cpp connector.cpp \
chatnavservicetask.cpp connectionhandler.cpp chatservicetask.cpp
liboscar_la_LDFLAGS = -no-undefined $(all_libraries)
-liboscar_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
+liboscar_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)
diff --git a/kopete/protocols/oscar/liboscar/tests/Makefile.am b/kopete/protocols/oscar/liboscar/tests/Makefile.am
index 14b0e3af..57f993f2 100644
--- a/kopete/protocols/oscar/liboscar/tests/Makefile.am
+++ b/kopete/protocols/oscar/liboscar/tests/Makefile.am
@@ -3,26 +3,26 @@ METASOURCES = AUTO
check_PROGRAMS = kunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest
kunittest_SOURCES = main.cpp kunittest.cpp chatnavtests.cpp
-kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kunittest_LDADD = $(LIB_KDECORE) ../liboscar.la
+kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kunittest_LDADD = $(LIB_TDECORE) ../liboscar.la
clientstream_test_SOURCES = clientstream_test.cpp
-clientstream_test_LDADD = $(LIB_QT) $(LIB_KDECORE) ../liboscar.la
+clientstream_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
logintest_SOURCES = logintest.cpp
-logintest_LDADD = $(LIB_QT) $(LIB_KDECORE) ../liboscar.la
+logintest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
userinfotest_SOURCES = userinfotest.cpp
-userinfotest_LDADD = $(LIB_QT) $(LIB_KDECORE) ../liboscar.la
+userinfotest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
ssigrouptest_SOURCES = ssigrouptest.cpp
-ssigrouptest_LDADD = $(LIB_QT) $(LIB_KDECORE) ../liboscar.la
+ssigrouptest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
redirecttest_SOURCES = redirecttest.cpp
-redirecttest_LDADD = $(LIB_QT) $(LIB_KDECORE) ../liboscar.la
+redirecttest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
ipaddrtest_SOURCES = ipaddrtest.cpp
-ipaddrtest_LDADD = $(LIB_QT) $(LIB_KDECORE) ../liboscar.la
+ipaddrtest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la
check: kunittest
@./kunittest 2>&1 | grep "tests:"
diff --git a/kopete/protocols/yahoo/libkyahoo/tests/Makefile.am b/kopete/protocols/yahoo/libkyahoo/tests/Makefile.am
index 6e644285..7f2d54a6 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/Makefile.am
+++ b/kopete/protocols/yahoo/libkyahoo/tests/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
check_PROGRAMS = clientstream_test
clientstream_test_SOURCES = clientstream_test.cpp
-clientstream_test_LDADD = $(LIB_QT) $(LIB_KDECORE) ../libkyahoo.la
+clientstream_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../libkyahoo.la
#login_test_SOURCES = logintest.cpp
-#login_test_LDADD = $(LIB_QT) $(LIB_KDECORE) ../libkyahoo.la
+#login_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../libkyahoo.la