summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-11 19:39:08 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-11 19:39:08 +0000
commit0e494bc7f469009bb5cd3c20ddc3d0bd74ca372b (patch)
tree04eb1524c9280364cbf405388d5191b5b4a511b4
parentd05fb8e2eb9d7b301f0c94844d3f0468e6ea465a (diff)
downloadtdeutils-0e494bc7f469009bb5cd3c20ddc3d0bd74ca372b.tar.gz
tdeutils-0e494bc7f469009bb5cd3c20ddc3d0bd74ca372b.zip
Fix kdeutils FTBFS under Oneiricv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1258494 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kfloppy/Makefile.am2
-rw-r--r--klaptopdaemon/Makefile.am8
-rw-r--r--superkaramba/src/Makefile.am2
3 files changed, 6 insertions, 6 deletions
diff --git a/kfloppy/Makefile.am b/kfloppy/Makefile.am
index 83b0411..c034214 100644
--- a/kfloppy/Makefile.am
+++ b/kfloppy/Makefile.am
@@ -1,4 +1,4 @@
-kfloppy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kfloppy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kfloppy_LDADD = $(LIB_KDEUI) -lm
INCLUDES = $(all_includes)
diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am
index 404a069..f36a324 100644
--- a/klaptopdaemon/Makefile.am
+++ b/klaptopdaemon/Makefile.am
@@ -4,24 +4,24 @@ lib_LTLIBRARIES = libkcmlaptop.la
SUBDIRS = pics applnk
libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp
-libkcmlaptop_la_LDFLAGS = $(all_libraries)
+libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libkcmlaptop_la_LIBADD = $(LIB_KDEUI)
MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel
-kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst
+kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kded_klaptopdaemon_la_LIBADD = $(LIB_KDEUI) $(LIB_XSS) libkcmlaptop.la
klaptop_acpi_helper_SOURCES = acpi_helper.cpp
klaptop_acpi_helper_LDADD = $(LIB_QT)
klaptop_check_SOURCES = laptop_check.cpp
-klaptop_check_LDFLAGS = $(all_libraries)
+klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
klaptop_check_LDADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp
-kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -module
kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) libkcmlaptop.la
kcm_laptop_la_COMPILE_FIRST = crcresult.h
diff --git a/superkaramba/src/Makefile.am b/superkaramba/src/Makefile.am
index 81858e7..a01bbc0 100644
--- a/superkaramba/src/Makefile.am
+++ b/superkaramba/src/Makefile.am
@@ -40,7 +40,7 @@ superkaramba_SOURCES = main.cpp karamba.cpp meter.cpp bar.cpp sensor.cpp \
# kde_cfg_DATA = superkaramba.kcfg
-superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB)
+superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
superkaramba_LDADD = -lkio $(LIB_KDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)