From d81f0e49aa19d9a3b627e140306abb10e3b26026 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 18 Nov 2011 10:52:13 -0600 Subject: Update kdenetwork Autotools for new DSO linkage style --- kopete/protocols/gadu/Makefile.am | 2 +- kopete/protocols/groupwise/Makefile.am | 2 +- kopete/protocols/irc/Makefile.am | 2 +- kopete/protocols/jabber/Makefile.am | 2 +- kopete/protocols/jabber/kioslave/Makefile.am | 2 +- kopete/protocols/jabber/ui/dlgchatroomslist.ui | 12 ++++++------ kopete/protocols/meanwhile/Makefile.am | 2 +- kopete/protocols/msn/Makefile.am | 4 ++-- kopete/protocols/msn/config/Makefile.am | 2 +- kopete/protocols/oscar/aim/Makefile.am | 2 +- kopete/protocols/oscar/icq/Makefile.am | 2 +- kopete/protocols/testbed/Makefile.am | 2 +- kopete/protocols/winpopup/Makefile.am | 2 +- kopete/protocols/yahoo/Makefile.am | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kopete/protocols') diff --git a/kopete/protocols/gadu/Makefile.am b/kopete/protocols/gadu/Makefile.am index 8d63dd80..0bf17f76 100644 --- a/kopete/protocols/gadu/Makefile.am +++ b/kopete/protocols/gadu/Makefile.am @@ -22,7 +22,7 @@ kopete_gadu_la_SOURCES = gaduaway.cpp gadueditcontact.cpp gaducommands.cpp \ gaducontactlist.cpp gadurichtextformat.cpp \ gadudccserver.cpp gadudcctransaction.cpp gadudcc.cpp -kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) +kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lgadu kopete_gadu_la_LIBADD = ./ui/libgaduui.la \ $(top_builddir)/kopete/libkopete/libkopete.la \ $(GG_LIBS) diff --git a/kopete/protocols/groupwise/Makefile.am b/kopete/protocols/groupwise/Makefile.am index 0c8a38fc..3e44ad06 100644 --- a/kopete/protocols/groupwise/Makefile.am +++ b/kopete/protocols/groupwise/Makefile.am @@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kopete_groupwise.la kopete_groupwise_la_SOURCES = gwprotocol.cpp gwcontact.cpp gwaccount.cpp \ gwbytestream.cpp gwconnector.cpp gwmessagemanager.cpp gwcontactlist.cpp kopete_groupwise_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \ - $(all_libraries) + $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_groupwise_la_LIBADD = ui/libkopetegroupwiseui.la \ libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_KIO) diff --git a/kopete/protocols/irc/Makefile.am b/kopete/protocols/irc/Makefile.am index 7bd37813..730e5352 100644 --- a/kopete/protocols/irc/Makefile.am +++ b/kopete/protocols/irc/Makefile.am @@ -22,7 +22,7 @@ kopete_irc_la_SOURCES = \ kcodecaction.cpp \ ksparser.cpp -kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML) kopete_irc_la_LIBADD = ../../libkopete/libkopete.la \ ./ui/libkopeteircui.la \ ./libkirc/libkirc.la \ diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am index ce462f74..f0c6486d 100644 --- a/kopete/protocols/jabber/Makefile.am +++ b/kopete/protocols/jabber/Makefile.am @@ -44,7 +44,7 @@ kopete_jabber_la_SOURCES = \ jabbertransport.cpp\ jabberbookmarks.cpp -kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) +kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_jabber_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \ ui/libkopetejabberui.la \ libiris/iris/include/libiris.la \ diff --git a/kopete/protocols/jabber/kioslave/Makefile.am b/kopete/protocols/jabber/kioslave/Makefile.am index 7fe4d3d6..3f3c0345 100644 --- a/kopete/protocols/jabber/kioslave/Makefile.am +++ b/kopete/protocols/jabber/kioslave/Makefile.am @@ -14,7 +14,7 @@ kde_module_LTLIBRARIES = kio_jabberdisco.la kio_jabberdisco_la_SOURCES = jabberdisco.cpp kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO) -kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) +kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = jabberdisco.h diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index 5feefbb7..31f5b201 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -161,22 +161,22 @@ tblChatRoomsList - clicked(int,int,int,const QPoint&) + clicked(int,int,int,const TQPoint&) dlgChatRoomsList - slotClick(int,int,int,const QPoint&) + slotClick(int,int,int,const TQPoint&) tblChatRoomsList - doubleClicked(int,int,int,const QPoint&) + doubleClicked(int,int,int,const TQPoint&) dlgChatRoomsList - slotDoubleClick(int,int,int,const QPoint&) + slotDoubleClick(int,int,int,const TQPoint&) slotQuery() slotJoin() - slotClick(int row, int col, int button, const QPoint& mousePos) - slotDoubleClick(int row, int col, int button, const QPoint& mousePos) + slotClick(int row, int col, int button, const TQPoint& mousePos) + slotDoubleClick(int row, int col, int button, const TQPoint& mousePos) diff --git a/kopete/protocols/meanwhile/Makefile.am b/kopete/protocols/meanwhile/Makefile.am index e161fac3..760200e3 100644 --- a/kopete/protocols/meanwhile/Makefile.am +++ b/kopete/protocols/meanwhile/Makefile.am @@ -28,7 +28,7 @@ kopete_meanwhile_la_SOURCES = \ meanwhileplugin.cpp kopete_meanwhile_la_LDFLAGS = -no-undefined -module \ - $(KDE_PLUGIN) $(all_libraries) + $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \ ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS) diff --git a/kopete/protocols/msn/Makefile.am b/kopete/protocols/msn/Makefile.am index d4fe5bec..29f25337 100644 --- a/kopete/protocols/msn/Makefile.am +++ b/kopete/protocols/msn/Makefile.am @@ -26,12 +26,12 @@ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp \ webcam.cpp libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la $(LIB_KIO) -libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) +libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkopete_videodevice -L../../libkopete/avdevice/ kopete_msn_la_SOURCES = dummy.cpp webcam.cpp kopete_msn_la_LIBADD = libkopete_msn_shared.la -kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) +kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkopete_videodevice -L../../libkopete/avdevice/ dummy.cpp: $(srcdir)/Makefile.am echo '#include "kdemacros.h"' > $@ diff --git a/kopete/protocols/msn/config/Makefile.am b/kopete/protocols/msn/config/Makefile.am index ab29db48..c136b6ef 100644 --- a/kopete/protocols/msn/config/Makefile.am +++ b/kopete/protocols/msn/config/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kcm_kopete_msn.la kcm_kopete_msn_la_SOURCES = msnprefs.ui msnpreferences.cpp -kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) +kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_msn_config.desktop diff --git a/kopete/protocols/oscar/aim/Makefile.am b/kopete/protocols/oscar/aim/Makefile.am index 91d12552..1ecf5fe5 100644 --- a/kopete/protocols/oscar/aim/Makefile.am +++ b/kopete/protocols/oscar/aim/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = kopete_aim.la kopete_aim_la_SOURCES = aimprotocol.cpp aimaccount.cpp aimcontact.cpp aimuserinfo.cpp aimjoinchat.cpp aimchatsession.cpp -kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) +kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_aim_la_LIBADD = ../libkopete_oscar.la ui/libkopeteaimui.la \ $(top_builddir)/kopete/libkopete/libkopete.la diff --git a/kopete/protocols/oscar/icq/Makefile.am b/kopete/protocols/oscar/icq/Makefile.am index defadf37..3505909c 100644 --- a/kopete/protocols/oscar/icq/Makefile.am +++ b/kopete/protocols/oscar/icq/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_icq.la kopete_icq_la_SOURCES = icqpresence.cpp icqaccount.cpp icqcontact.cpp icqprotocol.cpp # icquserinfo.cpp icqreadaway.cpp icqsendsmsdialog.cpp -kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) +kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_icq_la_LIBADD = ../libkopete_oscar.la \ $(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteicqui.la diff --git a/kopete/protocols/testbed/Makefile.am b/kopete/protocols/testbed/Makefile.am index b414547a..e68fe392 100644 --- a/kopete/protocols/testbed/Makefile.am +++ b/kopete/protocols/testbed/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(srcdir)/ui -Iui $(all_includes) noinst_HEADERS = testbedprotocol.h testbedcontact.h testbedaccount.h testbedaddcontactpage.h testbededitaccountwidget.h testbedfakeserver.h testbedincomingmessage.h kde_module_LTLIBRARIES = kopete_testbed.la kopete_testbed_la_SOURCES = testbedprotocol.cpp testbedcontact.cpp testbedaccount.cpp testbedaddcontactpage.cpp testbedaddui.ui testbededitaccountwidget.cpp testbedaccountpreferences.ui testbedfakeserver.cpp testbedincomingmessage.cpp -kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_testbed_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \ ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_KIO) diff --git a/kopete/protocols/winpopup/Makefile.am b/kopete/protocols/winpopup/Makefile.am index 24d84fe4..e80e8265 100644 --- a/kopete/protocols/winpopup/Makefile.am +++ b/kopete/protocols/winpopup/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_wp.la noinst_HEADERS = wpprotocol.h wpeditaccount.h wpaccount.h wpuserinfo.h wpcontact.h wpaddcontact.h kopete_wp_la_SOURCES = wpprotocol.cpp wpcontact.cpp wpaddcontact.cpp wpeditaccount.cpp wpaccount.cpp wpuserinfo.cpp -kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) +kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_wp_la_LIBADD = ../../libkopete/libkopete.la ./ui/libkopetewpui.la \ ./libwinpopup/libwinpopup.la $(LIB_KIO) diff --git a/kopete/protocols/yahoo/Makefile.am b/kopete/protocols/yahoo/Makefile.am index 6815da99..ce246298 100644 --- a/kopete/protocols/yahoo/Makefile.am +++ b/kopete/protocols/yahoo/Makefile.am @@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kopete_yahoo.la kopete_yahoo_la_SOURCES = yahooprotocol.cpp yahoocontact.cpp \ yahooaddcontact.cpp yahooaccount.cpp yahooeditaccount.cpp yahooconferencemessagemanager.cpp \ yahoochatsession.cpp yahooverifyaccount.cpp yahoowebcam.cpp -kopete_yahoo_la_LDFLAGS = -module $(KDE_PLUGIN) +kopete_yahoo_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_yahoo_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \ $(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteyahooui.la libkyahoo/libkyahoo.la -- cgit v1.2.1