diff options
35 files changed, 69 insertions, 69 deletions
diff --git a/dcoprss/Makefile.am b/dcoprss/Makefile.am index 196b0fca..efab9f08 100644 --- a/dcoprss/Makefile.am +++ b/dcoprss/Makefile.am @@ -1,18 +1,18 @@ bin_PROGRAMS = rssservice rssclient feedbrowser INCLUDES = -I$(top_srcdir) $(all_includes) -rssservice_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -rssservice_LDADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) ../librss/librss.la +rssservice_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) +rssservice_LDADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) ../librss/librss.la rssservice_SOURCES = main.cpp service.cpp query.cpp document.cpp article.cpp query.skel service.skel xmlrpciface.cpp cache.cpp # client stuff -rssclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -rssclient_LDADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) +rssclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) +rssclient_LDADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) rssclient_SOURCES = client.cpp -feedbrowser_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -feedbrowser_LDADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) +feedbrowser_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) +feedbrowser_LDADD = $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) feedbrowser_SOURCES = feedbrowser.skel feedbrowser.cpp noinst_HEADERS = service.h query.h xmlrpciface.h cache.h diff --git a/filesharing/simple/krichtextlabel.h b/filesharing/simple/krichtextlabel.h index e9b59d4e..1a12793e 100644 --- a/filesharing/simple/krichtextlabel.h +++ b/filesharing/simple/krichtextlabel.h @@ -32,7 +32,7 @@ /* * TQLabel */ -class KDEUI_EXPORT KRichTextLabel : public TQLabel { +class TDEUI_EXPORT KRichTextLabel : public TQLabel { Q_OBJECT TQ_OBJECT diff --git a/kdict/applet/Makefile.am b/kdict/applet/Makefile.am index db1f4bc2..ec56ed5d 100644 --- a/kdict/applet/Makefile.am +++ b/kdict/applet/Makefile.am @@ -13,7 +13,7 @@ lnk_DATA = kdictapplet.desktop EXTRA_DIST = $(lnk_DATA) kdict_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kdict_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +kdict_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kdictapplet.pot diff --git a/kget/Makefile.am b/kget/Makefile.am index f05d2d03..90f8a364 100644 --- a/kget/Makefile.am +++ b/kget/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kget kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT) -kget_LDADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIBSOCKET) +kget_LDADD = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET) kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \ transfer.cpp settings.cpp logwindow.cpp \ kmainwidget.cpp kfileio.cpp droptarget.cpp docking.cpp \ diff --git a/knewsticker/Makefile.am b/knewsticker/Makefile.am index eea97be4..9ce35000 100644 --- a/knewsticker/Makefile.am +++ b/knewsticker/Makefile.am @@ -13,7 +13,7 @@ knewsticker_panelapplet_la_SOURCES = newsscroller.cpp \ newssourcedlgimpl.cpp newssourcedlg.ui knewsticker_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module knewsticker_panelapplet_la_LIBADD = common/libknewstickercommon.la \ - $(LIB_KIO) $(LIB_KDEUI) + $(LIB_KIO) $(LIB_TDEUI) appdatadir = $(kde_datadir)/knewsticker appdata_DATA = eventsrc diff --git a/knewsticker/common/Makefile.am b/knewsticker/common/Makefile.am index 60fddef7..5e90dabb 100644 --- a/knewsticker/common/Makefile.am +++ b/knewsticker/common/Makefile.am @@ -9,5 +9,5 @@ METASOURCES = AUTO libknewstickercommon_la_SOURCES = newsiconmgr.cpp xmlnewsaccess.cpp \ configaccess.cpp newsiconmgr.skel newsengine.cpp -libknewstickercommon_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) +libknewstickercommon_la_LIBADD = $(LIB_KIO) $(LIB_TDECORE) libknewstickercommon_la_LDFLAGS = $(all_libraries) -no-undefined diff --git a/knewsticker/knewstickerstub/Makefile.am b/knewsticker/knewstickerstub/Makefile.am index bdfd22ef..c3d57871 100644 --- a/knewsticker/knewstickerstub/Makefile.am +++ b/knewsticker/knewstickerstub/Makefile.am @@ -8,6 +8,6 @@ service_DATA = knewstickerstub.desktop METASOURCES = AUTO knewstickerstub_SOURCES = knewstickerstub.cpp -knewstickerstub_LDADD = $(LIB_KIO) ../common/libknewstickercommon.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -knewstickerstub_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) +knewstickerstub_LDADD = $(LIB_KIO) ../common/libknewstickercommon.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) +knewstickerstub_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) 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 diff --git a/kppp/Makefile.am b/kppp/Makefile.am index 572add89..00c72fe3 100644 --- a/kppp/Makefile.am +++ b/kppp/Makefile.am @@ -51,11 +51,11 @@ kppp_SOURCES = kpppwidget.cpp \ KPPPIface.skel # the library search path -kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_KDECORE) -lDCOP +kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) -lDCOP # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -kppp_LDADD = -lm $(LIB_KIO) $(LIB_KDEUI) +kppp_LDADD = -lm $(LIB_KIO) $(LIB_TDEUI) # this option you can leave out. Just, if you use "make dist", you need it noinst_HEADERS = kpppwidget.h \ diff --git a/kppp/logview/Makefile.am b/kppp/logview/Makefile.am index 3dc5c379..67301cd5 100644 --- a/kppp/logview/Makefile.am +++ b/kppp/logview/Makefile.am @@ -29,11 +29,11 @@ bin_PROGRAMS = kppplogview kppplogview_SOURCES = main.cpp loginfo.cpp log.cpp monthly.cpp export.cpp # the library search path -kppplogview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_KDECORE) +kppplogview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -kppplogview_LDADD = -lm $(LIB_KDEUI) $(LIB_KFILE) +kppplogview_LDADD = -lm $(LIB_TDEUI) $(LIB_KFILE) # this option you can leave out. Just, if you use "make dist", you need it noinst_HEADERS = export.h loginfo.h log.h monthly.h main.h diff --git a/krdc/Makefile.am b/krdc/Makefile.am index 69d76eec..5ab1faff 100644 --- a/krdc/Makefile.am +++ b/krdc/Makefile.am @@ -23,8 +23,8 @@ appdata_DATA = pointcursor.png pointcursormask.png pinup.png pindown.png \ dnssddatadir = $(kde_datadir)/zeroconf dnssddata_DATA = _rfb._tcp -krdc_LDADD = vnc/libvnc.la rdp/librdp.la $(LIB_KDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_KDNSSD) $(X_LDFLAGS) $(LIB_X11) -lkwalletclient -lDCOP -krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) +krdc_LDADD = vnc/libvnc.la rdp/librdp.la $(LIB_TDEUI) $(LIBXF86VIDMODE) $(LIB_SLP) $(LIB_KDNSSD) $(X_LDFLAGS) $(LIB_X11) -lkwalletclient -lDCOP +krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) xdg_apps_DATA = krdc.desktop diff --git a/krdc/rdp/Makefile.am b/krdc/rdp/Makefile.am index 5150b855..3ee8a9b4 100644 --- a/krdc/rdp/Makefile.am +++ b/krdc/rdp/Makefile.am @@ -7,5 +7,5 @@ noinst_LTLIBRARIES = librdp.la librdp_la_SOURCES = krdpview.cpp rdphostpref.cpp rdpprefs.ui noinst_HEADERS = krdpview.h rdphostpref.h -librdp_la_LIBADD = $(LIB_KDEUI) $(LIBJPEG) -librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +librdp_la_LIBADD = $(LIB_TDEUI) $(LIBJPEG) +librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/krdc/vnc/Makefile.am b/krdc/vnc/Makefile.am index a8e93285..825f122e 100644 --- a/krdc/vnc/Makefile.am +++ b/krdc/vnc/Makefile.am @@ -10,7 +10,7 @@ libvnc_la_SOURCES = kvncview.cpp threads.cpp colour.c d3des.c desktop.c \ noinst_HEADERS = kvncview.h rfbproto.h vncviewer.h vnctypes.h vncauth.h \ pointerlatencyometer.h threads.h d3des.h vnchostpref.h -libvnc_la_LIBADD = $(LIB_KDEUI) $(LIBJPEG) +libvnc_la_LIBADD = $(LIB_TDEUI) $(LIBJPEG) libvnc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lz INCLUDES= -I$(top_srcdir)/krdc -I.. $(all_includes) diff --git a/krfb/kcm_krfb/Makefile.am b/krfb/kcm_krfb/Makefile.am index 18dede23..a841f79c 100644 --- a/krfb/kcm_krfb/Makefile.am +++ b/krfb/kcm_krfb/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_krfb.la kcm_krfb_la_SOURCES = configurationwidget.ui kcm_krfb.cpp kcm_krfb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kcm_krfb_la_LIBADD = ../krfb/libkrfbconfig.la $(LIB_KDEUI) -lkio +kcm_krfb_la_LIBADD = ../krfb/libkrfbconfig.la $(LIB_TDEUI) -lkio # Services xdg_apps_DATA = kcmkrfb.desktop diff --git a/krfb/krfb/Makefile.am b/krfb/krfb/Makefile.am index f35e935f..4546d963 100644 --- a/krfb/krfb/Makefile.am +++ b/krfb/krfb/Makefile.am @@ -6,14 +6,14 @@ noinst_LTLIBRARIES = libkrfbconfig.la libkrfbconfig_la_SOURCES = configuration.cc configuration.skel invitedialog.cc invitation.cc \ manageinvitations.ui personalinvitewidget.ui \ invitewidget.ui personalinvitedialog.cc -libkrfbconfig_la_LIBADD = ../srvloc/libsrvloc.la $(LIB_KDEUI) +libkrfbconfig_la_LIBADD = ../srvloc/libsrvloc.la $(LIB_TDEUI) bin_PROGRAMS = krfb krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \ connectionwidget.ui krfbifaceimpl.cc krfbiface.skel \ trayicon.cpp connectiondialog.cc -krfb_LDADD = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) -lkio -lDCOP -krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) -ltdefx +krfb_LDADD = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_TDEUI) $(LIBJPEG) -lkio -lDCOP +krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) -ltdefx appdatadir = $(kde_datadir)/krfb/pics appdata_DATA = eyes-open24.png eyes-closed24.png connection-side-image.png diff --git a/krfb/srvloc/Makefile.am b/krfb/srvloc/Makefile.am index 162e2062..14d2a49b 100644 --- a/krfb/srvloc/Makefile.am +++ b/krfb/srvloc/Makefile.am @@ -7,7 +7,7 @@ libsrvloc_la_SOURCES = kserviceregistry.cpp uuid.cpp \ kinetinterface.cpp kinetinterfacewatcher.cpp \ getifaddrs.cpp -libsrvloc_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_SLP) +libsrvloc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_SLP) libsrvloc_la_LDFLAGS = $(all_libraries) -no-undefined noinst_HEADERS = kserviceregistry.h uuid.h \ getifaddrs.h kinetinterface.h kinetinterfacewatcher.h diff --git a/ksirc/KSTicker/Makefile.am b/ksirc/KSTicker/Makefile.am index e97faf34..7fee0b66 100644 --- a/ksirc/KSTicker/Makefile.am +++ b/ksirc/KSTicker/Makefile.am @@ -14,7 +14,7 @@ METASOURCES = AUTO check_PROGRAMS = ksttest ksttest_SOURCES = ksttest.cpp -ksttest_LDADD = libksticker.la ../ksopts.lo ../nickColourMaker.lo $(LIB_KDEUI) -ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksttest_LDADD = libksticker.la ../ksopts.lo ../nickColourMaker.lo $(LIB_TDEUI) +ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/ksirc/Makefile.am b/ksirc/Makefile.am index 04c1067a..e0ce93fa 100644 --- a/ksirc/Makefile.am +++ b/ksirc/Makefile.am @@ -12,12 +12,12 @@ METASOURCES = AUTO check_PROGRAMS = testview dccMgrTest testview_SOURCES = kstextviewtest.cpp -testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI) -testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_TDEUI) +testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor dccMgrTest_SOURCES = dccMgrTest.cpp -dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI) -dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_TDEUI) +dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor bin_PROGRAMS = lib_LTLIBRARIES = diff --git a/ktalkd/kcmktalkd/Makefile.am b/ktalkd/kcmktalkd/Makefile.am index 21fddc81..9c828489 100644 --- a/ktalkd/kcmktalkd/Makefile.am +++ b/ktalkd/kcmktalkd/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = kcm_ktalkd.la kcm_ktalkd_la_SOURCES = main.cpp soundpage.cpp answmachpage.cpp \ forwmachpage.cpp kcm_ktalkd_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kcm_ktalkd_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kcm_ktalkd_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) #for extra warnings during compilation : # AMDEFS = -ansi -pedantic -D_POSIX_SOURCE -D_BSD_SOURCE diff --git a/ktalkd/ktalkd/Makefile.am b/ktalkd/ktalkd/Makefile.am index 30f83e90..aa27a3d4 100644 --- a/ktalkd/ktalkd/Makefile.am +++ b/ktalkd/ktalkd/Makefile.am @@ -20,8 +20,8 @@ AM_CPPFLAGS = -DHAVE_KDE ktalkd_SOURCES = print.c repairs.c \ announce.cpp process.cpp readcfg++.cpp table.cpp talkd.cpp \ find_user.cpp threads.cpp options.cpp unixsock.cpp -ktalkd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) -ktalkd_LDADD = machines/libmach.a $(LIBBSD) $(LIB_KDECORE) $(LIBSOCKET) -lDCOP +ktalkd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) +ktalkd_LDADD = machines/libmach.a $(LIBBSD) $(LIB_TDECORE) $(LIBSOCKET) -lDCOP ########################################################### diff --git a/ktalkd/ktalkdlg/Makefile.am b/ktalkd/ktalkdlg/Makefile.am index 4cf0ea4e..667dae37 100644 --- a/ktalkd/ktalkdlg/Makefile.am +++ b/ktalkd/ktalkdlg/Makefile.am @@ -7,8 +7,8 @@ bin_PROGRAMS = ktalkdlg ktalkdlg_SOURCES = ktalkdlg.cpp INCLUDES = $(all_includes) -ktalkdlg_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) -ktalkdlg_LDADD = $(LIB_KDEUI) -lDCOP +ktalkdlg_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) +ktalkdlg_LDADD = $(LIB_TDEUI) -lDCOP #for extra warnings during compilation : #AM_CXXFLAGS = -ansi -pedantic -D_POSIX_SOURCE -D_BSD_SOURCE diff --git a/wifi/Makefile.am b/wifi/Makefile.am index b143b308..1cbd9763 100644 --- a/wifi/Makefile.am +++ b/wifi/Makefile.am @@ -27,8 +27,8 @@ if include_ARTS ARTS_LIBS = -lartsflow -lmcop -lartsflow_idl endif -kwifimanager_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(ARTS_LIBS) -kwifimanager_LDADD = $(ARTS_LIBS) -liw $(LIB_KDEUI) +kwifimanager_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(ARTS_LIBS) +kwifimanager_LDADD = $(ARTS_LIBS) -liw $(LIB_TDEUI) noinst_HEADERS = interface_wireless.h \ interface_wireless_wirelessextensions.h \ diff --git a/wifi/kwireless/Makefile.am b/wifi/kwireless/Makefile.am index d5b4fcf7..6b2f0bb1 100644 --- a/wifi/kwireless/Makefile.am +++ b/wifi/kwireless/Makefile.am @@ -8,7 +8,7 @@ libkwireless_la_SOURCES = kwireless.cpp \ linuxwirelesswidget.cpp \ propertytablebase.ui propertytable.cpp libkwireless_la_LDFLAGS = -module -avoid-version $(all_libraries) -libkwireless_la_LIBADD = -liw $(LIB_KDEUI) +libkwireless_la_LIBADD = -liw $(LIB_TDEUI) kwireless_DATA = kwireless.desktop kwirelessdir = $(kde_datadir)/kicker/applets |