diff options
45 files changed, 59 insertions, 59 deletions
diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt index c0ea58a..329fb47 100644 --- a/ark/CMakeLists.txt +++ b/ark/CMakeLists.txt @@ -49,7 +49,7 @@ tde_add_kpart( libarkpart AUTOMOC SOURCES ark_part.cpp arkfactory.cpp zip.cpp tar.cpp filelistview.cpp arch.cpp lha.cpp compressedfile.cpp zoo.cpp rar.cpp ar.cpp - artdeutils.cpp archiveformatdlg.cpp + arkutils.cpp archiveformatdlg.cpp arkwidget.cpp searchbar.cpp addition.ui extraction.ui general.ui arkviewer.cpp sevenzip.cpp extractiondialog.cpp ace.cpp diff --git a/ark/Makefile.am b/ark/Makefile.am index bf14490..60f5fe8 100644 --- a/ark/Makefile.am +++ b/ark/Makefile.am @@ -10,24 +10,24 @@ lib_LTLIBRARIES = ark_la_SOURCES = main.cpp arkapp.cpp mainwindow.cpp ark_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(KDE_PLUGIN) -ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) libark_common.la $(LIB_KPARTS) +ark_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) libark_common.la $(LIB_TDEPARTS) ark_la_COMPILE_FIRST = settings.h noinst_LTLIBRARIES = libark_common.la libark_common_la_SOURCES = settings.kcfgc archiveformatinfo.cpp libark_common_la_LDFLAGS = $(all_libraries) -no-undefined -libark_common_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_TDEFILE) +libark_common_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) kde_module_LTLIBRARIES = libarkpart.la libarkpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) libark_common.la $(LIB_KPARTS) +libarkpart_la_LIBADD = $(LIB_KDED) -lDCOP $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) libark_common.la $(LIB_TDEPARTS) libarkpart_la_COMPILE_FIRST = settings.h libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \ filelistview.cpp arch.cpp lha.cpp \ compressedfile.cpp zoo.cpp rar.cpp \ - ar.cpp artdeutils.cpp archiveformatdlg.cpp \ + ar.cpp arkutils.cpp archiveformatdlg.cpp \ arkwidget.cpp searchbar.cpp \ addition.ui extraction.ui general.ui \ arkviewer.cpp sevenzip.cpp extractiondialog.cpp \ diff --git a/ark/arch.cpp b/ark/arch.cpp index 2ca8ec5..eb5606b 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -47,7 +47,7 @@ // ark includes #include "arch.h" #include "arkwidget.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" // the archive types diff --git a/ark/arj.cpp b/ark/arj.cpp index f081e17..4a9ab44 100644 --- a/ark/arj.cpp +++ b/ark/arj.cpp @@ -42,7 +42,7 @@ #include "arj.h" #include "arkwidget.h" #include "settings.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" ArjArch::ArjArch( ArkWidget *_gui, const TQString & _fileName ) diff --git a/ark/artdeutils.cpp b/ark/arkutils.cpp index bdfec3f..24411e8 100644 --- a/ark/artdeutils.cpp +++ b/ark/arkutils.cpp @@ -72,7 +72,7 @@ // TQt includes #include <tqfile.h> -#include "artdeutils.h" +#include "arkutils.h" TQString ArkUtils::getTimeStamp(const TQString &_month, const TQString &_day, diff --git a/ark/artdeutils.h b/ark/arkutils.h index c53791f..c53791f 100644 --- a/ark/artdeutils.h +++ b/ark/arkutils.h diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 5dacb77..9dfcf42 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -75,7 +75,7 @@ #include "extractiondialog.h" #include "arkwidget.h" #include "filelistview.h" -#include "artdeutils.h" +#include "arkutils.h" #include "archiveformatinfo.h" #include "compressedfile.h" #include "searchbar.h" diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index 0684ca1..f4b5196 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -48,7 +48,7 @@ #include <kurlpixmapprovider.h> #include <kdebug.h> -#include "artdeutils.h" +#include "arkutils.h" #include "settings.h" ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, @@ -139,7 +139,7 @@ void ExtractionDialog::accept() uc.setReplaceHome( true ); KURL p( uc.replacedPath( m_urlRequester->comboBox()->currentText() ) ); - //if p isn't local KIO and friends will complain later on + //if p isn't local TDEIO and friends will complain later on if ( p.isLocalFile() ) { TQFileInfo fi( p.path() ); diff --git a/ark/lha.cpp b/ark/lha.cpp index 18a31db..101277d 100644 --- a/ark/lha.cpp +++ b/ark/lha.cpp @@ -49,7 +49,7 @@ #include "settings.h" #include "arch.h" #include "lha.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" LhaArch::LhaArch( ArkWidget *_gui, const TQString & _fileName ) diff --git a/ark/rar.cpp b/ark/rar.cpp index 5878769..4d6a7ce 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -49,7 +49,7 @@ #include "arch.h" #include "settings.h" #include "rar.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName ) diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index 3f5fff2..287ec3b 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -39,7 +39,7 @@ #include "sevenzip.h" #include "arkwidget.h" #include "settings.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" SevenZipArch::SevenZipArch( ArkWidget *gui, const TQString &filename ) diff --git a/ark/zoo.cpp b/ark/zoo.cpp index e173415..aa96d47 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -46,7 +46,7 @@ #include "arkwidget.h" #include "arch.h" #include "zoo.h" -#include "artdeutils.h" +#include "arkutils.h" #include "filelistview.h" static TQString fixTime( const TQString &_strTime ); diff --git a/kcalc/knumber/tests/Makefile.am b/kcalc/knumber/tests/Makefile.am index faa3aa7..0ae6f8e 100644 --- a/kcalc/knumber/tests/Makefile.am +++ b/kcalc/knumber/tests/Makefile.am @@ -29,4 +29,4 @@ METASOURCES = AUTO knumbertest_SOURCES = knumbertest.cpp knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP) -knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am index 0046588..f6dcede 100644 --- a/kcharselect/Makefile.am +++ b/kcharselect/Makefile.am @@ -3,7 +3,7 @@ LDADD = $(LIB_TDEFILE) bin_PROGRAMS = kcharselect kcharselect_SOURCES = kcharselectdia.cc main.cc -kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kcharselect_METASOURCES = kcharselectdia.moc updatedir = $(kde_datadir)/tdeconf_update diff --git a/kdf/Makefile.am b/kdf/Makefile.am index 530aca1..0fd869c 100644 --- a/kdf/Makefile.am +++ b/kdf/Makefile.am @@ -9,11 +9,11 @@ libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cp disks.cpp listview.cpp optiondialog.cpp stdoption.cpp kdf_SOURCES = kdf.cpp -kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kdf_LDADD = libkdf_common.la $(LIB_TDEFILE) kwikdisk_SOURCES = kwikdisk.cpp -kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kwikdisk_LDADD = libkdf_common.la $(LIB_TDEFILE) kde_module_LTLIBRARIES = kcm_kdf.la diff --git a/kfloppy/Makefile.am b/kfloppy/Makefile.am index 57974ca..27b0bc2 100644 --- a/kfloppy/Makefile.am +++ b/kfloppy/Makefile.am @@ -1,4 +1,4 @@ -kfloppy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kfloppy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kfloppy_LDADD = $(LIB_TDEUI) -lm INCLUDES = $(all_includes) diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am index 64de0b6..780c012 100644 --- a/kgpg/Makefile.am +++ b/kgpg/Makefile.am @@ -11,7 +11,7 @@ kgpg_SOURCES = kgpgoptions.cpp listkeys.cpp popuppublic.cpp kgpgview.cpp \ keyproperties.ui conf_encryption.ui conf_decryption.ui conf_gpg.ui dcopiface.skel \ keyinfowidget.cpp groupedit.ui kgpgrevokewidget.ui newkey.ui adduid.ui keyexport.ui \ sourceselect.ui kgpgsettings.kcfgc conf_servers.ui conf_ui2.ui conf_misc.ui -kgpg_LDADD = $(LIB_KIO) $(LIB_TDEABC) -ltdeutils -ltdeprint +kgpg_LDADD = $(LIB_TDEIO) $(LIB_TDEABC) -ltdeutils -ltdeprint pics_DATA= kgpg_anim.gif kgpg_docked.png kgpg_docked.gif kgpg_blank.png kgpg_fill.png picsdir=$(kde_datadir)/kgpg/pics @@ -28,7 +28,7 @@ kde_kcfg_DATA = kgpg.kcfg METASOURCES = AUTO # the library search path. -kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor appsdir = $(kde_datadir)/kgpg apps_DATA = kgpg.rc listkeys.rc tips diff --git a/khexedit/Makefile.am b/khexedit/Makefile.am index 576c08b..557e6c7 100644 --- a/khexedit/Makefile.am +++ b/khexedit/Makefile.am @@ -20,8 +20,8 @@ draglabel.h progress.h hexeditstate.h chartabledialog.h hexdrag.h \ exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h khexedit_METASOURCES = AUTO -khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -khexedit_LDADD = $(LIB_KIO) $(LIB_TDEPRINT) +khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +khexedit_LDADD = $(LIB_TDEIO) $(LIB_TDEPRINT) xdg_apps_DATA = khexedit.desktop diff --git a/khexedit/lib/tdeselection.h b/khexedit/lib/tdeselection.h index 7e69d9b..95751e6 100644 --- a/khexedit/lib/tdeselection.h +++ b/khexedit/lib/tdeselection.h @@ -15,8 +15,8 @@ ***************************************************************************/ -#ifndef KHE_KSELECTION_H -#define KHE_KSELECTION_H +#ifndef KHE_TDESELECTION_H +#define KHE_TDESELECTION_H #include "ksection.h" diff --git a/khexedit/parts/kbytesedit/Makefile.am b/khexedit/parts/kbytesedit/Makefile.am index b8be127..17eb1ea 100644 --- a/khexedit/parts/kbytesedit/Makefile.am +++ b/khexedit/parts/kbytesedit/Makefile.am @@ -9,7 +9,7 @@ METASOURCES = AUTO libkbyteseditwidget_la_SOURCES = kbyteseditwidget.cpp libkbyteseditwidget_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -avoid-version -no-undefined -libkbyteseditwidget_la_LIBADD = ../../lib/libkhexeditcommon.la $(LIB_KPARTS) +libkbyteseditwidget_la_LIBADD = ../../lib/libkhexeditcommon.la $(LIB_TDEPARTS) service_DATA = kbyteseditwidget.desktop servicedir = $(kde_servicesdir) diff --git a/khexedit/parts/kpart/Makefile.am b/khexedit/parts/kpart/Makefile.am index 42d9c77..24c025c 100644 --- a/khexedit/parts/kpart/Makefile.am +++ b/khexedit/parts/kpart/Makefile.am @@ -9,7 +9,7 @@ METASOURCES = AUTO libkhexedit2part_la_SOURCES = khepart.cpp khebrowserextension.cpp khepartfactory.cpp libkhexedit2part_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -no-undefined -libkhexedit2part_la_LIBADD = ../../lib/libkhexeditcommon.la $(LIB_KPARTS) $(LIB_KIO) +libkhexedit2part_la_LIBADD = ../../lib/libkhexeditcommon.la $(LIB_TDEPARTS) $(LIB_TDEIO) partdesktop_DATA = khexedit2part.desktop partdesktopdir = $(kde_servicesdir) diff --git a/kjots/Makefile.am b/kjots/Makefile.am index 3289394..82b6626 100644 --- a/kjots/Makefile.am +++ b/kjots/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) bin_PROGRAMS = kjots diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am index 329ad82..da40ae6 100644 --- a/klaptopdaemon/Makefile.am +++ b/klaptopdaemon/Makefile.am @@ -4,30 +4,30 @@ 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) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkcmlaptop_la_LIBADD = $(LIB_TDEUI) 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 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kded_klaptopdaemon_la_LIBADD = $(LIB_TDEUI) $(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) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor klaptop_check_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) 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) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module +kcm_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module kcm_laptop_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) libkcmlaptop.la kcm_laptop_la_COMPILE_FIRST = crcresult.h AM_CPPFLAGS = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor KDE_OPTIONS = nofinal diff --git a/kmilo/asus/Makefile.am b/kmilo/asus/Makefile.am index 39217c0..6d5db9a 100644 --- a/kmilo/asus/Makefile.am +++ b/kmilo/asus/Makefile.am @@ -24,7 +24,7 @@ INCLUDES=-I$(srcdir)/../kmilod $(all_includes) kde_module_LTLIBRARIES = kmilo_asus.la kmilo_asus_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kmilo_asus_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) +kmilo_asus_la_LIBADD = ../kmilod/libkmilo.la $(LIB_TDEIO) kmilo_asus_la_SOURCES = asus.cpp METASOURCES = AUTO diff --git a/kmilo/delli8k/Makefile.am b/kmilo/delli8k/Makefile.am index 8b495c2..695ef83 100644 --- a/kmilo/delli8k/Makefile.am +++ b/kmilo/delli8k/Makefile.am @@ -22,7 +22,7 @@ INCLUDES=-I$(srcdir)/../kmilod $(all_includes) kde_module_LTLIBRARIES = kmilo_delli8k.la kmilo_delli8k_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kmilo_delli8k_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) +kmilo_delli8k_la_LIBADD = ../kmilod/libkmilo.la $(LIB_TDEIO) kmilo_delli8k_la_SOURCES = delli8k.cpp METASOURCES = AUTO diff --git a/kmilo/demo/Makefile.am b/kmilo/demo/Makefile.am index 8ac7a46..652a8a0 100644 --- a/kmilo/demo/Makefile.am +++ b/kmilo/demo/Makefile.am @@ -21,7 +21,7 @@ INCLUDES=-I$(srcdir)/../kmilod $(all_includes) kde_module_LTLIBRARIES = kmilo_demo.la kmilo_demo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kmilo_demo_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) +kmilo_demo_la_LIBADD = ../kmilod/libkmilo.la $(LIB_TDEIO) kmilo_demo_la_SOURCES = demo.cpp METASOURCES = AUTO diff --git a/kmilo/generic/Makefile.am b/kmilo/generic/Makefile.am index 1dd7094..1be89c4 100644 --- a/kmilo/generic/Makefile.am +++ b/kmilo/generic/Makefile.am @@ -21,7 +21,7 @@ INCLUDES=-I$(srcdir)/../kmilod $(all_includes) kde_module_LTLIBRARIES = kmilo_generic.la kmilo_generic_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kmilo_generic_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) +kmilo_generic_la_LIBADD = ../kmilod/libkmilo.la $(LIB_TDEIO) kmilo_generic_la_SOURCES = generic_monitor.cpp METASOURCES = AUTO diff --git a/kmilo/kmilo_kvaio/Makefile.am b/kmilo/kmilo_kvaio/Makefile.am index a711565..2a617e0 100644 --- a/kmilo/kmilo_kvaio/Makefile.am +++ b/kmilo/kmilo_kvaio/Makefile.am @@ -23,7 +23,7 @@ INCLUDES=-I$(srcdir)/../kmilod $(all_includes) kde_module_LTLIBRARIES = kmilo_kvaio.la kmilo_kvaio_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kmilo_kvaio_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) -lXext -lXtst +kmilo_kvaio_la_LIBADD = ../kmilod/libkmilo.la $(LIB_TDEIO) -lXext -lXtst kmilo_kvaio_la_SOURCES = kmilo_kvaio.cpp kvaiodriverinterface.cpp kvaio.cpp METASOURCES = AUTO diff --git a/kmilo/kmilod/Makefile.am b/kmilo/kmilod/Makefile.am index 72662db..cf312e2 100644 --- a/kmilo/kmilod/Makefile.am +++ b/kmilo/kmilod/Makefile.am @@ -20,7 +20,7 @@ INCLUDES=$(all_includes) kde_module_LTLIBRARIES = kded_kmilod.la kded_kmilod_la_LDFLAGS = -module -avoid-version $(all_libraries) -kded_kmilod_la_LIBADD = $(LIB_KIO) libkmilo.la +kded_kmilod_la_LIBADD = $(LIB_TDEIO) libkmilo.la kded_kmilod_la_SOURCES = kmilod.cpp kmilod.skel defaultskin.cpp \ defaultwidget.ui kmilointerface.cpp diff --git a/kmilo/powerbook/Makefile.am b/kmilo/powerbook/Makefile.am index 5c3f467..8a8ef02 100644 --- a/kmilo/powerbook/Makefile.am +++ b/kmilo/powerbook/Makefile.am @@ -21,7 +21,7 @@ INCLUDES=-I$(srcdir)/../kmilod $(all_includes) kde_module_LTLIBRARIES = kmilo_powerbook.la kmilo_powerbook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kmilo_powerbook_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) $(KEYBOARD_LIBS) +kmilo_powerbook_la_LIBADD = ../kmilod/libkmilo.la $(LIB_TDEIO) $(KEYBOARD_LIBS) kmilo_powerbook_la_SOURCES = pb_monitor.cpp METASOURCES = AUTO diff --git a/kmilo/powerbook2/Makefile.am b/kmilo/powerbook2/Makefile.am index 5c3f467..8a8ef02 100644 --- a/kmilo/powerbook2/Makefile.am +++ b/kmilo/powerbook2/Makefile.am @@ -21,7 +21,7 @@ INCLUDES=-I$(srcdir)/../kmilod $(all_includes) kde_module_LTLIBRARIES = kmilo_powerbook.la kmilo_powerbook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kmilo_powerbook_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) $(KEYBOARD_LIBS) +kmilo_powerbook_la_LIBADD = ../kmilod/libkmilo.la $(LIB_TDEIO) $(KEYBOARD_LIBS) kmilo_powerbook_la_SOURCES = pb_monitor.cpp METASOURCES = AUTO diff --git a/kmilo/thinkpad/Makefile.am b/kmilo/thinkpad/Makefile.am index e82c26b..8851248 100644 --- a/kmilo/thinkpad/Makefile.am +++ b/kmilo/thinkpad/Makefile.am @@ -23,7 +23,7 @@ INCLUDES=-I$(srcdir)/../kmilod $(all_includes) kde_module_LTLIBRARIES = kmilo_thinkpad.la kmilo_thinkpad_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kmilo_thinkpad_la_LIBADD = ../kmilod/libkmilo.la $(LIB_KIO) +kmilo_thinkpad_la_LIBADD = ../kmilod/libkmilo.la $(LIB_TDEIO) kmilo_thinkpad_la_SOURCES = thinkpad.cpp METASOURCES = AUTO diff --git a/kmilo/thinkpad/kcmthinkpad/Makefile.am b/kmilo/thinkpad/kcmthinkpad/Makefile.am index 4e70c40..acbb234 100644 --- a/kmilo/thinkpad/kcmthinkpad/Makefile.am +++ b/kmilo/thinkpad/kcmthinkpad/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_thinkpad.la kcm_thinkpad_la_SOURCES = kcmthinkpad_general.ui main.cpp kcm_thinkpad_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kcm_thinkpad_la_LIBADD = $(LIB_KIO) +kcm_thinkpad_la_LIBADD = $(LIB_TDEIO) INCLUDES= $(all_includes) -DKDE_BINDIR="\"$(bindir)\"" diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am index 22460b6..d21c7a8 100644 --- a/kregexpeditor/Makefile.am +++ b/kregexpeditor/Makefile.am @@ -29,7 +29,7 @@ libkregexpeditorcommon_la_SOURCES = \ libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libtdemultiformlistbox.la \ - KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) + KWidgetStreamer/libkwidgetstreamer.la $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) METASOURCES = AUTO @@ -46,8 +46,8 @@ libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la bin_PROGRAMS = kregexpeditor kregexpeditor_SOURCES = main.cpp -kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kregexpeditor_LDADD = libkregexpeditorcommon.la $(LIB_KIO) +kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kregexpeditor_LDADD = libkregexpeditorcommon.la $(LIB_TDEIO) kregexpeditor_INCLUDES = $(all_includes) xdg_apps_DATA = kregexpeditor.desktop diff --git a/kregexpeditor/test-without-dl/Makefile.am b/kregexpeditor/test-without-dl/Makefile.am index 2162d09..e274a92 100644 --- a/kregexpeditor/test-without-dl/Makefile.am +++ b/kregexpeditor/test-without-dl/Makefile.am @@ -1,7 +1,7 @@ check_PROGRAMS = regexptest regexptest_SOURCES = main.cpp regexptest_LDFLAGS = $(all_libraries) -regexptest_LDADD = ../libkregexpeditorgui.la $(LIB_KSYCOCA) +regexptest_LDADD = ../libkregexpeditorgui.la $(LIB_TDESYCOCA) INCLUDES = $(all_includes) KDE_CXXFLAGS = -g diff --git a/ksim/Makefile.am b/ksim/Makefile.am index d44081b..8f97249 100644 --- a/ksim/Makefile.am +++ b/ksim/Makefile.am @@ -10,7 +10,7 @@ ksim_panelextension_la_SOURCES = ksim.cpp ksimview.cpp ksimview.skel \ themeprefs.cpp ksim_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ksim_panelextension_la_LIBADD = ./library/libksimcore.la libsysteminfo.la $(LIB_KIO) $(LIB_TDEUI) +ksim_panelextension_la_LIBADD = ./library/libksimcore.la libsysteminfo.la $(LIB_TDEIO) $(LIB_TDEUI) SUBDIRS = themes library monitors pics EXTRA_DIST = ksim.desktop diff --git a/ksim/monitors/mail/Makefile.am b/ksim/monitors/mail/Makefile.am index bf89a1d..5dd9b2d 100644 --- a/ksim/monitors/mail/Makefile.am +++ b/ksim/monitors/mail/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = ksim_mail.la ksim_mail_la_SOURCES = ksimmail.cpp ksim_mail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ksim_mail_la_LIBADD = $(LIB_KIO) ../../library/libksimcore.la +ksim_mail_la_LIBADD = $(LIB_TDEIO) ../../library/libksimcore.la EXTRA_DIST = mail.desktop diff --git a/ksim/monitors/net/Makefile.am b/ksim/monitors/net/Makefile.am index 291eb71..5b68996 100644 --- a/ksim/monitors/net/Makefile.am +++ b/ksim/monitors/net/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = ksim_net.la ksim_net_la_SOURCES = ksimnet.cpp netdialog.cpp netconfig.cpp ksim_net_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ksim_net_la_LIBADD = ../../library/libksimcore.la $(LIB_KIO) +ksim_net_la_LIBADD = ../../library/libksimcore.la $(LIB_TDEIO) EXTRA_DIST = Net.desktop diff --git a/ksim/monitors/snmp/Makefile.am b/ksim/monitors/snmp/Makefile.am index 0c922c9..68bd8ee 100644 --- a/ksim/monitors/snmp/Makefile.am +++ b/ksim/monitors/snmp/Makefile.am @@ -6,7 +6,7 @@ ksim_snmp_la_SOURCES = plugin.cpp view.cpp configpage.cpp configwidget.ui snmp.c walker.cpp ksim_snmp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ksim_snmp_la_LIBADD = ../../library/libksimcore.la $(LIB_KIO) $(LIBSNMP) +ksim_snmp_la_LIBADD = ../../library/libksimcore.la $(LIB_TDEIO) $(LIBSNMP) INCLUDES= -I$(top_srcdir)/ksim/library $(all_includes) diff --git a/ktimer/Makefile.am b/ktimer/Makefile.am index d7fdb89..889af23 100644 --- a/ktimer/Makefile.am +++ b/ktimer/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor LDADD = $(LIB_TDEUI) $(LIB_TDEFILE) bin_PROGRAMS = ktimer diff --git a/superkaramba/src/Makefile.am b/superkaramba/src/Makefile.am index 47f0413..191ebc7 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) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF) diff --git a/tdelirc/irkick/Makefile.am b/tdelirc/irkick/Makefile.am index 0e753f7..c30b7bb 100644 --- a/tdelirc/irkick/Makefile.am +++ b/tdelirc/irkick/Makefile.am @@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = irkick.la CLEANFILES = dummy.cpp -libirkick_common_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KSYCOCA) ../tdelirc/libtdelirc.la +libirkick_common_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDESYCOCA) ../tdelirc/libtdelirc.la libirkick_common_la_SOURCES = main.cpp irkick.cpp irkick.skel irkick.stub klircclient.cpp libirkick_common_la_LDFLAGS = $(all_libraries) diff --git a/tdelirc/tdelirc/Makefile.am b/tdelirc/tdelirc/Makefile.am index e488f85..e65ca12 100644 --- a/tdelirc/tdelirc/Makefile.am +++ b/tdelirc/tdelirc/Makefile.am @@ -34,7 +34,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # the library search path. -libtdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libtdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE´s XML GUI builing diff --git a/tdessh/Makefile.am b/tdessh/Makefile.am index 84f1b5b..a4bc84d 100644 --- a/tdessh/Makefile.am +++ b/tdessh/Makefile.am @@ -6,7 +6,7 @@ INCLUDES= $(all_includes) ## tdessh bin_PROGRAMS = tdessh tdessh_SOURCES = tdessh.cpp sshdlg.cpp -tdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor tdessh_LDADD = $(LIB_TDEUI) -ltdesu tdessh_METASOURCES = AUTO noinst_HEADERS = sshdlg.h diff --git a/tdewallet/Makefile.am b/tdewallet/Makefile.am index d3d62cd..2ca96d9 100644 --- a/tdewallet/Makefile.am +++ b/tdewallet/Makefile.am @@ -7,8 +7,8 @@ tdewalletmanager_SOURCES = walletwidget.ui tdewalletmanager.cpp \ tdewalletmanager.skel main.cpp tdewalletpopup.cpp \ tdewalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \ kbetterthankdialogbase.ui -tdewalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -tdewalletmanager_LDADD = $(LIB_KIO) -ltdewalletclient +tdewalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdewalletmanager_LDADD = $(LIB_TDEIO) -ltdewalletclient METASOURCES = AUTO noinst_HEADERS = tdewalletmanager.h tdewalletpopup.h walletwidget.h tdewalleteditor.h\ allyourbase.h kwmapeditor.h |