Fix kdenetwork FTBFS under oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1258244 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

13 files changed, 24 insertions, 25 deletions

diff --git a/dcoprss/Makefile.am b/dcoprss/Makefile.am
index 2bc93d67..196b0fca 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)
-rssservice_LDADD = $(LIB_KIO) ../librss/librss.la
+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_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)
-rssclient_LDADD   = $(LIB_KDECORE)
+rssclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
+rssclient_LDADD   = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
 rssclient_SOURCES = client.cpp
 
-feedbrowser_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-feedbrowser_LDADD = $(LIB_KDEUI)
+feedbrowser_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
+feedbrowser_LDADD = $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
 feedbrowser_SOURCES = feedbrowser.skel feedbrowser.cpp
 
 noinst_HEADERS = service.h query.h xmlrpciface.h cache.h
diff --git a/kget/Makefile.am b/kget/Makefile.am
index 433ee66d..f05d2d03 100644
--- a/kget/Makefile.am
+++ b/kget/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS = kget
 
-kget_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT)
 kget_LDADD   = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIBSOCKET)
 kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
                transfer.cpp settings.cpp logwindow.cpp \
diff --git a/knewsticker/knewstickerstub/Makefile.am b/knewsticker/knewstickerstub/Makefile.am
index 200e2eac..bdfd22ef 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
-knewstickerstub_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+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)
 
diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am
index eb278998..3035e8a6 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
+kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_KDECORE) -lkdefx -lDCOP
 kopete_LDADD = \
 	addcontactwizard/libkopeteaddcontactwizard.la \
 	addaccountwizard/libkopeteaddaccountwizard.la \
diff --git a/kopete/kopete/contactlist/Makefile.am b/kopete/kopete/contactlist/Makefile.am
index d9544d5d..4a8c23e3 100644
--- a/kopete/kopete/contactlist/Makefile.am
+++ b/kopete/kopete/contactlist/Makefile.am
@@ -18,7 +18,7 @@ libkopetecontactlist_la_SOURCES = kopetemetacontactlvi.cpp \
 	customnotificationprops.cpp kopetegrouplistaction.cpp kabcexport.cpp \
 	kabcexport_base.ui 
 
-libkopetecontactlist_la_LDFLAGS = $(all_libraries)
+libkopetecontactlist_la_LDFLAGS = $(all_libraries) -lkdefx
 libkopetecontactlist_la_LIBADD = -lkabc ../../libkopete/libkopete.la ../addcontactwizard/libkopeteaddcontactwizard.la $(LIB_KDEUI) $(LIB_XRENDER)
 
 noinst_HEADERS = kopeteaddrbookexport.h customnotificationprops.h kabcexport.h 
diff --git a/kppp/Makefile.am b/kppp/Makefile.am
index 4548f5f7..572add89 100644
--- a/kppp/Makefile.am
+++ b/kppp/Makefile.am
@@ -51,7 +51,7 @@ kppp_SOURCES	= kpppwidget.cpp \
 		KPPPIface.skel
 
 # the library search path
-kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kppp_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_KDECORE) -lDCOP
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kppp/logview/Makefile.am b/kppp/logview/Makefile.am
index e95b7c73..3dc5c379 100644
--- a/kppp/logview/Makefile.am
+++ b/kppp/logview/Makefile.am
@@ -29,7 +29,7 @@ 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)
+kppplogview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_KDECORE)
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/krdc/Makefile.am b/krdc/Makefile.am
index bf24d823..69d76eec 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
-krdc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+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)
 
 xdg_apps_DATA = krdc.desktop
 
diff --git a/krdc/vnc/Makefile.am b/krdc/vnc/Makefile.am
index 23956297..a8e93285 100644
--- a/krdc/vnc/Makefile.am
+++ b/krdc/vnc/Makefile.am
@@ -11,6 +11,6 @@ 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_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libvnc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lz
 
 INCLUDES= -I$(top_srcdir)/krdc -I.. $(all_includes)
diff --git a/krfb/krfb/Makefile.am b/krfb/krfb/Makefile.am
index 31feb286..7d09d45d 100644
--- a/krfb/krfb/Makefile.am
+++ b/krfb/krfb/Makefile.am
@@ -12,8 +12,8 @@ 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 
-krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+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) -lkdefx
 
 appdatadir = $(kde_datadir)/krfb/pics
 appdata_DATA = eyes-open24.png eyes-closed24.png connection-side-image.png
diff --git a/ktalkd/ktalkd/Makefile.am b/ktalkd/ktalkd/Makefile.am
index 7338b06f..30f83e90 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)
-ktalkd_LDADD	=       machines/libmach.a $(LIBBSD) $(LIB_KDECORE) $(LIBSOCKET)
+ktalkd_LDFLAGS	=       $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+ktalkd_LDADD	=       machines/libmach.a $(LIBBSD) $(LIB_KDECORE) $(LIBSOCKET) -lDCOP
 
 ###########################################################
 
diff --git a/ktalkd/ktalkdlg/Makefile.am b/ktalkd/ktalkdlg/Makefile.am
index d6d9104c..4cf0ea4e 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)
-ktalkdlg_LDADD	=	$(LIB_KDEUI)
+ktalkdlg_LDFLAGS=	$(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE)
+ktalkdlg_LDADD	=	$(LIB_KDEUI) -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 22c1a4c2..b143b308 100644
--- a/wifi/Makefile.am
+++ b/wifi/Makefile.am
@@ -23,12 +23,11 @@ kwifimanager_SOURCES = 	interface_wireless.cpp \
 			strength.cpp \
 			asusled.cpp
 
-kwifimanager_LDFLAGS = $(all_libraries)
-
 if include_ARTS
-ARTS_LIBS = -lartsflow -lmcop
+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)
 
 noinst_HEADERS = 	interface_wireless.h \