diff options
| author | Timothy Pearson <[email protected]> | 2011-11-06 21:43:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-11-06 21:43:35 -0600 |
| commit | 99e082a03ed2e3801b96755c2e3045514567731b (patch) | |
| tree | db1e14b128726a17ec705be90416794e390f6348 | |
| parent | a20592124daa48e6216dbd3143dfdf43d9fd91de (diff) | |
| download | tdebase-99e082a03ed2e3801b96755c2e3045514567731b.tar.gz tdebase-99e082a03ed2e3801b96755c2e3045514567731b.zip | |
Rename additional instances of KDE to TDE
163 files changed, 237 insertions, 237 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2144bd402..d4ca7c799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ option( WITH_XDAMAGE "Enable xdamage support" OFF ) option( WITH_XEXT "Enable xext support" OFF ) option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF ) option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF ) -option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF ) +option( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF ) option( WITH_PAM "kdm should use PAM" OFF ) option( WITH_SHADOW "kdm should use shadow passwords" OFF ) option( WITH_XDMCP "xdmcp support for kdm" OFF ) @@ -96,14 +96,14 @@ option( BUILD_KDESKTOP "Build kdesktop" ${BUILD_ALL} ) option( BUILD_KONSOLE "Build konsole" ${BUILD_ALL} ) option( BUILD_KLIPPER "Build klipper" ${BUILD_ALL} ) option( BUILD_KMENUEDIT "Build kmenuedit" ${BUILD_ALL} ) -option( BUILD_KDEPRINT "Build tdeprint" ${BUILD_ALL} ) +option( BUILD_TDEPRINT "Build tdeprint" ${BUILD_ALL} ) option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} ) option( BUILD_KDEPASSWD "Build kdepasswd" ${BUILD_ALL} ) option( BUILD_KTIP "Build ktip" ${BUILD_ALL} ) option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} ) option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} ) option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} ) -option( BUILD_KDESU "Build tdesu" ${BUILD_ALL} ) +option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} ) option( BUILD_KDM "Build kdm" ${BUILD_ALL} ) option( BUILD_KSMSERVER "Build ksmserver" ${BUILD_ALL} ) option( BUILD_KSPLASHML "Build ksplashml" ${BUILD_ALL} ) @@ -170,14 +170,14 @@ tde_conditional_add_subdirectory( BUILD_KDESKTOP kdesktop ) tde_conditional_add_subdirectory( BUILD_KONSOLE konsole ) tde_conditional_add_subdirectory( BUILD_KLIPPER klipper ) tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit ) -tde_conditional_add_subdirectory( BUILD_KDEPRINT tdeprint ) +tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint ) tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer ) tde_conditional_add_subdirectory( BUILD_KDEPASSWD kdepasswd ) tde_conditional_add_subdirectory( BUILD_KTIP ktip ) tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject ) tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog ) tde_conditional_add_subdirectory( BUILD_KREADCONFIG kreadconfig ) -tde_conditional_add_subdirectory( BUILD_KDESU tdesu ) +tde_conditional_add_subdirectory( BUILD_TDESU tdesu ) tde_conditional_add_subdirectory( BUILD_KDM kdm ) tde_conditional_add_subdirectory( BUILD_KSMSERVER ksmserver ) tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml ) diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook index b64c2816c..82f6968be 100644 --- a/doc/ksplashml/index.docbook +++ b/doc/ksplashml/index.docbook @@ -974,7 +974,7 @@ kde_module_LTLIBRARIES = ksplash2k.la ksplash2k_la_SOURCES = theme2k.cpp rotwidget.cpp ksplash2k_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ksplash2k_la_LIBADD = $(LIB_KDEUI) -lksplashthemes +ksplash2k_la_LIBADD = $(LIB_TDEUI) -lksplashthemes METASOURCES = AUTO diff --git a/drkonqi/Makefile.am b/drkonqi/Makefile.am index 362079094..ad04f8132 100644 --- a/drkonqi/Makefile.am +++ b/drkonqi/Makefile.am @@ -11,8 +11,8 @@ EXTRA_DIST = LICENSE bin_PROGRAMS = drkonqi # Libraries: -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -LDADD = $(LIB_KDEUI) $(LIB_KIO) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +LDADD = $(LIB_TDEUI) $(LIB_KIO) # toplevel.cpp must be last in row due to X-headers being included. (--enable-final) # Did I mention already that X header files really suck? diff --git a/kappfinder/Makefile.am b/kappfinder/Makefile.am index 52d00e455..50d1ea628 100644 --- a/kappfinder/Makefile.am +++ b/kappfinder/Makefile.am @@ -2,13 +2,13 @@ SUBDIRS = apps bin_PROGRAMS = kappfinder kappfinder_SOURCES = main.cpp toplevel.cpp common.cpp -kappfinder_LDADD = $(LIB_KDEUI) $(LIB_KIO) -kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kappfinder_LDADD = $(LIB_TDEUI) $(LIB_KIO) +kappfinder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_PROGRAMS = kappfinder_install kappfinder_install_SOURCES = main_install.cpp common.cpp -kappfinder_install_LDADD = $(LIB_KDEUI) -kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kappfinder_install_LDADD = $(LIB_TDEUI) +kappfinder_install_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = $(all_includes) METASOURCES = AUTO diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am index 84a5aff33..a832c7515 100644 --- a/kate/interfaces/Makefile.am +++ b/kate/interfaces/Makefile.am @@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp libkateinterfacesprivate_la_LIBADD = -lkatepartinterfaces -libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h kateincludedir = $(includedir)/kate diff --git a/kate/utils/Makefile.am b/kate/utils/Makefile.am index eda68c724..1fcf33525 100644 --- a/kate/utils/Makefile.am +++ b/kate/utils/Makefile.am @@ -8,7 +8,7 @@ libkateutils_la_SOURCES = dockviewbase.cpp messageview.cpp listboxview.cpp libkateutils_la_LDFLAGS = $(all_libraries) -no-undefined -libkateutils_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) +libkateutils_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) libkateutils_la_METASOURCES = AUTO diff --git a/kcminit/Makefile.am b/kcminit/Makefile.am index c64cf1ea2..07f4d694c 100644 --- a/kcminit/Makefile.am +++ b/kcminit/Makefile.am @@ -22,11 +22,11 @@ bin_PROGRAMS= lib_LTLIBRARIES= kcminit_la_SOURCES = main.cpp main.skel -kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) +kcminit_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version kcminit_startup_la_SOURCES = main.cpp main.skel -kcminit_startup_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) +kcminit_startup_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) kcminit_startup_la_LDFLAGS = $(all_libraries) -module -avoid-version AM_CPPFLAGS = $(all_includes) diff --git a/kcontrol/access/Makefile.am b/kcontrol/access/Makefile.am index dcbfab2eb..6ea38b8b9 100644 --- a/kcontrol/access/Makefile.am +++ b/kcontrol/access/Makefile.am @@ -9,7 +9,7 @@ tdeinit_LTLIBRARIES = kaccess.la kaccess_la_SOURCES = kaccess.cpp main.cpp kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version -kaccess_la_LIBADD = $(LIB_KDEUI) +kaccess_la_LIBADD = $(LIB_TDEUI) kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 6f6ef1343..9c9971a69 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -32,7 +32,7 @@ /* * QLabel */ -class KDEUI_EXPORT KRichTextLabel : public TQLabel { +class TDEUI_EXPORT KRichTextLabel : public TQLabel { Q_OBJECT public: diff --git a/kcontrol/colors/Makefile.am b/kcontrol/colors/Makefile.am index 87f4048ef..c5d813d65 100644 --- a/kcontrol/colors/Makefile.am +++ b/kcontrol/colors/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_colors.la kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined -kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la +kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la METASOURCES = colorscm.moc widgetcanvas.moc noinst_HEADERS = colorscm.h widgetcanvas.h diff --git a/kcontrol/dnssd/Makefile.am b/kcontrol/dnssd/Makefile.am index 892244300..ef6292a94 100644 --- a/kcontrol/dnssd/Makefile.am +++ b/kcontrol/dnssd/Makefile.am @@ -5,7 +5,7 @@ kcm_kdnssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) kcm_kdnssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h xdg_apps_DATA = kcm_kdnssd.desktop -kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_KDEUI) +kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI) messages: rc.cpp $(EXTRACTRC) *.ui *.rc >> rc.cpp diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 3b3f85f96..4c0689f81 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -62,7 +62,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) setQuickHelp(i18n("Setup services browsing with ZeroConf")); if (geteuid()!=0) tabs->removePage(tab_2); // normal user cannot change wide-area settings // show only global things in 'administrator mode' to prevent confusion - else if (getenv("KDESU_USER")!=0) tabs->removePage(tab); + else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); addConfig(DNSSD::Configuration::self(),this); // it is host-wide setting so it has to be in global config file domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" )); diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am index 9fbde1ecb..ac7c4b7ef 100644 --- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am +++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am @@ -9,10 +9,10 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) libkurisearchfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel \ kuriikwsfilter.cpp searchprovider.cpp diff --git a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am index cb524dd4b..164a9ce35 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am +++ b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII kde_module_LTLIBRARIES = liblocaldomainurifilter.la liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) +liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel diff --git a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am index 134881987..8eb895dee 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am +++ b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII kde_module_LTLIBRARIES = libkshorturifilter.la libkshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) libkshorturifilter_la_SOURCES = kshorturifilter.cpp kshorturifilter.skel diff --git a/kcontrol/energy/Makefile.am b/kcontrol/energy/Makefile.am index ea6578582..e7a9b24b9 100644 --- a/kcontrol/energy/Makefile.am +++ b/kcontrol/energy/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_energy.la kcm_energy_la_SOURCES = energy.cpp kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_KDEUI) $(LIB_KIO) +kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_KIO) METASOURCES = energy.moc noinst_HEADERS = energy.h diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am index 4f25b9def..21752d05c 100644 --- a/kcontrol/filetypes/Makefile.am +++ b/kcontrol/filetypes/Makefile.am @@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails keditfiletype_SOURCES = keditfiletype.cpp keditfiletype_LDADD = libfiletypes.la $(LIB_KIO) -keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor messages: $(XGETTEXT) *.cpp -o $(podir)/filetypes.pot diff --git a/kcontrol/fonts/Makefile.am b/kcontrol/fonts/Makefile.am index 5fe7aa2cf..de96e0721 100644 --- a/kcontrol/fonts/Makefile.am +++ b/kcontrol/fonts/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = kcm_fonts.la kcm_fonts_la_SOURCES = fonts.cpp kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(FREETYPE2_LDFLAGS) -module -avoid-version $(all_libraries) -no-undefined -kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS) +kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_TDEUI) $(LIBFONTCONFIG_LIBS) METASOURCES = AUTO noinst_HEADERS = fonts.h kxftconfig.h diff --git a/kcontrol/icons/Makefile.am b/kcontrol/icons/Makefile.am index 4e00a730c..6de8b72cf 100644 --- a/kcontrol/icons/Makefile.am +++ b/kcontrol/icons/Makefile.am @@ -13,7 +13,7 @@ noinst_HEADERS = icons.h iconthemes.h main.h check_PROGRAMS = testicons testicons_SOURCES = testicons.cpp testicons_LDFLAGS = $(all_libraries) -testicons_LDADD = $(LIB_KDEUI) icons.lo +testicons_LDADD = $(LIB_TDEUI) icons.lo messages: $(XGETTEXT) *.cpp -o $(podir)/kcmicons.pot diff --git a/kcontrol/info/Makefile.am b/kcontrol/info/Makefile.am index 4b65dc07f..30eb5ebe8 100644 --- a/kcontrol/info/Makefile.am +++ b/kcontrol/info/Makefile.am @@ -7,7 +7,7 @@ endif kcm_info_la_SOURCES = main.cpp memory.cpp opengl.cpp kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO) -kcm_info_la_LIBADD = $(LIBALIB) $(LIB_KDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) +kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) METASOURCES = AUTO AM_CPPFLAGS= $(all_includes) $(GLINC) diff --git a/kcontrol/joystick/Makefile.am b/kcontrol/joystick/Makefile.am index 269dec101..377b85517 100644 --- a/kcontrol/joystick/Makefile.am +++ b/kcontrol/joystick/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_joystick.la kcm_joystick_la_SOURCES = joystick.cpp joywidget.cpp poswidget.cpp joydevice.cpp caldialog.cpp -kcm_joystick_la_LIBADD = $(LIB_KDEUI) +kcm_joystick_la_LIBADD = $(LIB_TDEUI) kcm_joystick_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined xdg_apps_DATA = joystick.desktop diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am index dd20b9224..90b56fa71 100644 --- a/kcontrol/kcontrol/Makefile.am +++ b/kcontrol/kcontrol/Makefile.am @@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ moduleIface.cpp moduleIface.skel global.cpp modules.cpp \ proxywidget.cpp kcrootonly.cpp searchwidget.cpp -kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIB_KHTML) +kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_KHTML) kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version rccontroldir = $(kde_datadir)/kcontrol diff --git a/kcontrol/kfontinst/lib/Makefile.am b/kcontrol/kfontinst/lib/Makefile.am index 55349b149..59b85e0a3 100644 --- a/kcontrol/kfontinst/lib/Makefile.am +++ b/kcontrol/kfontinst/lib/Makefile.am @@ -9,6 +9,6 @@ Misc.h \ FcEngine.h \ KfiConstants.h -libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) +libkfontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE diff --git a/kcontrol/kfontinst/thumbnail/Makefile.am b/kcontrol/kfontinst/thumbnail/Makefile.am index c7608e843..49213a019 100644 --- a/kcontrol/kfontinst/thumbnail/Makefile.am +++ b/kcontrol/kfontinst/thumbnail/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = fontthumbnail.la fontthumbnail_la_SOURCES = FontThumbnail.cpp -fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) ../lib/libkfontinst.la +fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libkfontinst.la fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/kfontinst/viewpart/Makefile.am index 4379ab4f1..011f057ec 100644 --- a/kcontrol/kfontinst/viewpart/Makefile.am +++ b/kcontrol/kfontinst/viewpart/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libkfontinstprint.la libkfontinstprint_la_SOURCES = KfiPrint.cpp libkfontinstprint_la_LDFLAGS = $(all_libraries) -libkfontinstprint_la_LIBADD = $(LIB_KDEPRINT) ../lib/libkfontinst.la +libkfontinstprint_la_LIBADD = $(LIB_TDEPRINT) ../lib/libkfontinst.la kde_module_LTLIBRARIES = libkfontviewpart.la @@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR METASOURCES = AUTO kfontview_LDADD = $(LIB_KPARTS) -kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor bin_PROGRAMS = kfontview xdg_apps_DATA = kfontview.desktop diff --git a/kcontrol/konq/Makefile.am b/kcontrol/konq/Makefile.am index 80bd7591d..f9ef60055 100644 --- a/kcontrol/konq/Makefile.am +++ b/kcontrol/konq/Makefile.am @@ -11,7 +11,7 @@ kcm_konq_la_SOURCES = behaviour.cpp desktop.cpp rootopts.cpp \ desktopbehavior.ui kcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KUTILS) +kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KUTILS) kcm_konq_la_DATA = overlapping.png onlyone.png kcm_konq_ladir = $(kde_datadir)/kcontrol/pics diff --git a/kcontrol/krdb/Makefile.am b/kcontrol/krdb/Makefile.am index 6bd22e322..a478f2f83 100644 --- a/kcontrol/krdb/Makefile.am +++ b/kcontrol/krdb/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = . themes kcs ad pics noinst_LTLIBRARIES = libkrdb.la libkrdb_la_SOURCES = krdb.cpp -libkrdb_la_LIBADD = $(LIB_KDECORE) +libkrdb_la_LIBADD = $(LIB_TDECORE) libkrdb_la_LDFLAGS = -no-undefined $(all_libraries) messages: diff --git a/kcontrol/launch/Makefile.am b/kcontrol/launch/Makefile.am index ce246f3d2..ed9d14cf1 100644 --- a/kcontrol/launch/Makefile.am +++ b/kcontrol/launch/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_launch.la AM_CPPFLAGS = $(all_includes) kcm_launch_la_SOURCES = kcmlaunch.cpp kcm_launch_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kcm_launch_la_LIBADD = $(LIB_KDEUI) +kcm_launch_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = kcmlaunch.h xdg_apps_DATA = kcmlaunch.desktop diff --git a/kcontrol/privacy/Makefile.am b/kcontrol/privacy/Makefile.am index 82ac0d2a6..cff96f5e7 100644 --- a/kcontrol/privacy/Makefile.am +++ b/kcontrol/privacy/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_privacy.la kcm_privacy_la_SOURCES = privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp kcm_privacy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_privacy_la_LIBADD = $(LIB_KDEUI) -lkio +kcm_privacy_la_LIBADD = $(LIB_TDEUI) -lkio METASOURCES = AUTO diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am index cfb533eb7..fb55f8da7 100644 --- a/kcontrol/randr/Makefile.am +++ b/kcontrol/randr/Makefile.am @@ -7,7 +7,7 @@ METASOURCES = AUTO kcm_randr_la_SOURCES = krandrmodule.cpp kcm_randr_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_randr_la_LIBADD = $(LIB_KDEUI) $(LIB_XRANDR) +kcm_randr_la_LIBADD = $(LIB_TDEUI) $(LIB_XRANDR) noinst_HEADERS = krandrmodule.h krandrtray.h krandrapp.h \ krandrpassivepopup.h configdialog.h diff --git a/kcontrol/style/keramik/Makefile.am b/kcontrol/style/keramik/Makefile.am index 028585373..56fbefa6b 100644 --- a/kcontrol/style/keramik/Makefile.am +++ b/kcontrol/style/keramik/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) noinst_HEADERS = keramikconf.h kde_module_LTLIBRARIES = kstyle_keramik_config.la kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kstyle_keramik_config_la_LIBADD = $(LIB_KDEUI) +kstyle_keramik_config_la_LIBADD = $(LIB_TDEUI) kstyle_keramik_config_la_SOURCES = keramikconf.cpp METASOURCES = AUTO diff --git a/kcontrol/usbview/Makefile.am b/kcontrol/usbview/Makefile.am index e43934b70..4bc09f635 100644 --- a/kcontrol/usbview/Makefile.am +++ b/kcontrol/usbview/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_usb.la kcm_usb_la_SOURCES = kcmusb.cpp usbdevices.cpp usbdb.cpp kcm_usb_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_usb_la_LIBADD = $(LIB_KDEUI) +kcm_usb_la_LIBADD = $(LIB_TDEUI) AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/view1394/Makefile.am b/kcontrol/view1394/Makefile.am index 88f2b37c7..0a82271db 100644 --- a/kcontrol/view1394/Makefile.am +++ b/kcontrol/view1394/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_view1394.la kcm_view1394_la_SOURCES = view1394widget.ui view1394.cpp kcm_view1394_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_view1394_la_LIBADD = $(LIB_KDEUI) -lraw1394 +kcm_view1394_la_LIBADD = $(LIB_TDEUI) -lraw1394 AM_CPPFLAGS= $(all_includes) diff --git a/kdcop/Makefile.am b/kdcop/Makefile.am index 358d45549..38190652f 100644 --- a/kdcop/Makefile.am +++ b/kdcop/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kdcop kdcop_SOURCES = kdcop.cpp kdcopwindow.cpp kdcoplistview.cpp kdcopview.ui -kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) -lDCOP $(LIB_QT) +kdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) -lDCOP $(LIB_QT) noinst_HEADERS = kdcopwindow.h METASOURCES = AUTO diff --git a/kdebugdialog/Makefile.am b/kdebugdialog/Makefile.am index a301bd54b..e3ed333f2 100644 --- a/kdebugdialog/Makefile.am +++ b/kdebugdialog/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = kdebugdialog kdebugdialog_SOURCES = main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp klistdebugdialog.cpp kdebugdialog_METASOURCES = AUTO kdebugdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kdebugdialog_LDADD = $(LIB_KDEUI) +kdebugdialog_LDADD = $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp -o $(podir)/kdebugdialog.pot diff --git a/kdepasswd/Makefile.am b/kdepasswd/Makefile.am index a24c5e2e0..1459a26b6 100644 --- a/kdepasswd/Makefile.am +++ b/kdepasswd/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = kcm bin_PROGRAMS = kdepasswd kdepasswd_SOURCES = kdepasswd.cpp passwd.cpp passwddlg.cpp -kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdepasswd_LDADD = $(LIB_KIO) METASOURCES = AUTO diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am index 6c7b869f8..4d0c273e1 100644 --- a/kdesktop/Makefile.am +++ b/kdesktop/Makefile.am @@ -14,7 +14,7 @@ tdeinit_LTLIBRARIES = kdesktop.la noinst_LTLIBRARIES = libkdesktopsettings.la libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined -libkdesktopsettings_la_LIBADD = $(LIB_KDECORE) +libkdesktopsettings_la_LIBADD = $(LIB_TDECORE) libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc klaunchsettings.kcfgc kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am index eb8d759cf..45634b174 100644 --- a/kdesktop/kwebdesktop/Makefile.am +++ b/kdesktop/kwebdesktop/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = kwebdesktop METASOURCES = AUTO kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc -kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am index b2d886e50..270f9e35c 100644 --- a/kdesktop/lock/Makefile.am +++ b/kdesktop/lock/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kdesktop/lock INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes) -kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB) ####### Files diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 17d636b01..542c2b7e7 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -73,7 +73,7 @@ #include "minicli_ui.h" #include "kdesktopsettings.h" -#define KDESU_ERR strerror(errno) +#define TDESU_ERR strerror(errno) Minicli::Minicli( TQWidget *parent, const char *name) :KDialog( parent, name, false, (WFlags)WType_TopLevel ), @@ -495,7 +495,7 @@ int Minicli::runCommand() if (pid < 0) { - kdError(1207) << "fork(): " << KDESU_ERR << "\n"; + kdError(1207) << "fork(): " << TDESU_ERR << "\n"; return -1; } diff --git a/kdialog/Makefile.am b/kdialog/Makefile.am index 974228ed6..e9a784006 100644 --- a/kdialog/Makefile.am +++ b/kdialog/Makefile.am @@ -5,7 +5,7 @@ bin_PROGRAMS = kdialog kdialog_SOURCES = kdialog.cpp widgets.cpp klistboxdialog.cpp progressdialog.cpp progressdialogiface.skel kdialog_LDADD = $(LIB_KIO) -kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdialog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/kdm/kfrontend/Makefile.am b/kdm/kfrontend/Makefile.am index c1e985b99..889271292 100644 --- a/kdm/kfrontend/Makefile.am +++ b/kdm/kfrontend/Makefile.am @@ -24,11 +24,11 @@ kdm_greet_SOURCES = \ kdmadmindialog.cpp \ kgreeter.cpp \ kgapp.cpp -kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_KDEUI) $(XTESTLIB) $(LIBPOSIX4) +kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4) krootimage_SOURCES = krootimage.cpp -krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) METASOURCES = AUTO diff --git a/kdmlib/Makefile.am b/kdmlib/Makefile.am index eedb681bc..7183a8889 100644 --- a/kdmlib/Makefile.am +++ b/kdmlib/Makefile.am @@ -4,20 +4,20 @@ kde_module_LTLIBRARIES = kgreet_classic.la kgreet_pam.la kgreet_winbind.la kgreet_classic_la_SOURCES = kgreet_classic.cpp kgreet_classic_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -kgreet_classic_la_LIBADD = $(LIB_KDEUI) +kgreet_classic_la_LIBADD = $(LIB_TDEUI) kgreet_pam_la_SOURCES = kgreet_pam.cpp kgreet_pam_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -kgreet_pam_la_LIBADD = $(LIB_KDEUI) +kgreet_pam_la_LIBADD = $(LIB_TDEUI) kgreet_winbind_la_SOURCES = kgreet_winbind.cpp kgreet_winbind_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -kgreet_winbind_la_LIBADD = $(LIB_KDEUI) +kgreet_winbind_la_LIBADD = $(LIB_TDEUI) noinst_LTLIBRARIES = libdmctl.la libdmctl_la_SOURCES = dmctl.cpp libdmctl_la_LDFLAGS = $(all_libraries) -no-undefined -libdmctl_la_LIBADD = $(LIB_KDECORE) -lXau +libdmctl_la_LIBADD = $(LIB_TDECORE) -lXau METASOURCES = AUTO diff --git a/kfind/Makefile.am b/kfind/Makefile.am index 9e4867c6f..dacae8ba3 100644 --- a/kfind/Makefile.am +++ b/kfind/Makefile.am @@ -33,4 +33,4 @@ kfind_SOURCES = kfwin.cpp kfinddlg.cpp main.cpp kfind_LDADD = libkfind_common.la $(LIB_KPARTS) # the library search path. -kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am index 19c3f52b2..272a4d4e8 100644 --- a/khelpcenter/Makefile.am +++ b/khelpcenter/Makefile.am @@ -6,8 +6,8 @@ METASOURCES = AUTO bin_PROGRAMS = khc_indexbuilder lib_LTLIBRARIES = -khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -khc_indexbuilder_LDADD = $(LIB_KDECORE) +khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +khc_indexbuilder_LDADD = $(LIB_TDECORE) khc_indexbuilder_SOURCES = khc_indexbuilder.cpp tdeinit_LTLIBRARIES = khelpcenter.la @@ -34,8 +34,8 @@ khelpcenter_la_SOURCES = navigator.cpp \ EXTRA_PROGRAMS = testmetainfo -testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -testmetainfo_LDADD = $(LIB_KDECORE) docentry.lo docmetainfo.lo \ +testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testmetainfo_LDADD = $(LIB_TDECORE) docentry.lo docmetainfo.lo \ docentrytraverser.lo htmlsearch.lo testmetainfo_SOURCES = testmetainfo.cpp diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am index fc06b1ed6..f0459d339 100644 --- a/khelpcenter/htmlsearch/Makefile.am +++ b/khelpcenter/htmlsearch/Makefile.am @@ -27,8 +27,8 @@ wrapperdir = $(kde_datadir)/khelpcenter/ wrapper_SCRIPTS = meinproc_wrapper khtmlindex_SOURCES = index.cpp -khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -khtmlindex_LDADD = libhtmlsearch.la $(LIB_KDEUI) +khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +khtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI) xpm_DATA = unchecked.xpm checked.xpm xpmdir = $(kde_datadir)/khelpcenter/pics diff --git a/khotkeys/app/Makefile.am b/khotkeys/app/Makefile.am index 726b40374..e003ad0c2 100644 --- a/khotkeys/app/Makefile.am +++ b/khotkeys/app/Makefile.am @@ -4,11 +4,11 @@ tdeinit_LTLIBRARIES = khotkeys.la kde_module_LTLIBRARIES = kded_khotkeys.la khotkeys_la_SOURCES = app.cpp app.skel -khotkeys_la_LIBADD = ../shared/libkhotkeys_shared.la $(LIB_KDECORE) +khotkeys_la_LIBADD = ../shared/libkhotkeys_shared.la $(LIB_TDECORE) khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kded_khotkeys_la_SOURCES = kded.cpp kded.skel -kded_khotkeys_la_LIBADD = ../shared/libkhotkeys_shared.la $(LIB_KDECORE) +kded_khotkeys_la_LIBADD = ../shared/libkhotkeys_shared.la $(LIB_TDECORE) kded_khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version noinst_HEADERS = app.h kded.h diff --git a/khotkeys/kcontrol/Makefile.am b/khotkeys/kcontrol/Makefile.am index 81e691669..7eb3f2f6d 100644 --- a/khotkeys/kcontrol/Makefile.am +++ b/khotkeys/kcontrol/Makefile.am @@ -12,12 +12,12 @@ kcm_khotkeys_la_SOURCES = \ windowselector.cpp gestures_settings_tab.cpp general_settings_tab.cpp \ voicerecorder.cpp voicerecordpage.cpp voice_settings_tab.cpp -kcm_khotkeys_la_LIBADD = ui/libui.la $(LIB_KDEUI) $(LIB_ARTS) +kcm_khotkeys_la_LIBADD = ui/libui.la $(LIB_TDEUI) $(LIB_ARTS) kcm_khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_khotkeys_init_la_SOURCES = init.cpp -kcm_khotkeys_init_la_LIBADD = $(LIB_KDECORE) +kcm_khotkeys_init_la_LIBADD = $(LIB_TDECORE) kcm_khotkeys_init_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noinst_HEADERS = menuedit.h window_trigger_widget.h \ diff --git a/khotkeys/kcontrol/ui/Makefile.am b/khotkeys/kcontrol/ui/Makefile.am index 8242b0b75..14ea5c44d 100644 --- a/khotkeys/kcontrol/ui/Makefile.am +++ b/khotkeys/kcontrol/ui/Makefile.am @@ -7,7 +7,7 @@ libui_la_SOURCES = dummy.cpp windowdef_simple_widget_ui.ui windowdef_list_widget gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui general_settings_tab_ui.ui \ voice_input_widget_ui.ui voice_settings_tab_ui.ui -libui_la_LIBADD = ../../shared/libkhotkeys_shared.la $(LIB_KDEUI) +libui_la_LIBADD = ../../shared/libkhotkeys_shared.la $(LIB_TDEUI) libui_la_LDFLAGS = $(all_libraries) INCLUDES= -I$(srcdir)/.. -I$(top_srcdir)/khotkeys/shared $(all_includes) diff --git a/khotkeys/update/Makefile.am b/khotkeys/update/Makefile.am index ae28dde38..19e725d8a 100644 --- a/khotkeys/update/Makefile.am +++ b/khotkeys/update/Makefile.am @@ -3,7 +3,7 @@ kconfdir = $(libdir)/kconf_update_bin khotkeys_update_SOURCES = update.cpp -khotkeys_update_LDADD = ../shared/libkhotkeys_shared.la $(LIB_KDECORE) $(KDE_RPATH) +khotkeys_update_LDADD = ../shared/libkhotkeys_shared.la $(LIB_TDECORE) $(KDE_RPATH) khotkeys_update_LDFLAGS = $(all_libraries) INCLUDES = -I$(srcdir)/../shared $(all_includes) diff --git a/kicker/applets/clock/Makefile.am b/kicker/applets/clock/Makefile.am index aab460112..15bde61cf 100644 --- a/kicker/applets/clock/Makefile.am +++ b/kicker/applets/clock/Makefile.am @@ -16,7 +16,7 @@ lnk_DATA = clockapplet.desktop EXTRA_DIST = $(lnk_DATA) $(pic_DATA) clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) +clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) srcdoc: kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -lkfile diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am index cc06542b5..a0384df4f 100644 --- a/kicker/applets/launcher/Makefile.am +++ b/kicker/applets/launcher/Makefile.am @@ -16,7 +16,7 @@ EXTRA_DIST = $(lnk_DATA) launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kicker/buttons/libkicker_buttons.la \ ../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \ - $(LIB_KSYCOCA) $(LIB_KDEUI) $(LIB_KUTILS) + $(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS) kde_kcfg_DATA = launcherapplet.kcfg diff --git a/kicker/applets/media/Makefile.am b/kicker/applets/media/Makefile.am index 0b971aef2..f7d5dbee4 100644 --- a/kicker/applets/media/Makefile.am +++ b/kicker/applets/media/Makefile.am @@ -13,7 +13,7 @@ lnk_DATA = mediaapplet.desktop EXTRA_DIST = $(lnk_DATA) media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_KUTILS) +media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/mediaapplet.pot diff --git a/kicker/applets/menu/Makefile.am b/kicker/applets/menu/Makefile.am index 5bfaeee18..933fc4010 100644 --- a/kicker/applets/menu/Makefile.am +++ b/kicker/applets/menu/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = menuapplet.desktop EXTRA_DIST = $(lnk_DATA) menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -menu_panelapplet_la_LIBADD = $(LIB_KDEUI) +menu_panelapplet_la_LIBADD = $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot diff --git a/kicker/applets/minipager/Makefile.am b/kicker/applets/minipager/Makefile.am index d84f1993c..9320c30f5 100644 --- a/kicker/applets/minipager/Makefile.am +++ b/kicker/applets/minipager/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = minipagerapplet.desktop EXTRA_DIST = $(lnk_DATA) minipager_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -minipager_panelapplet_la_LIBADD = $(LIB_KDEUI) \ +minipager_panelapplet_la_LIBADD = $(LIB_TDEUI) \ ../../taskmanager/libtaskmanager.la \ ../../libkicker/libkickermain.la diff --git a/kicker/applets/naughty/Makefile.am b/kicker/applets/naughty/Makefile.am index 533df19c3..d3f87ca2f 100644 --- a/kicker/applets/naughty/Makefile.am +++ b/kicker/applets/naughty/Makefile.am @@ -23,7 +23,7 @@ lnk_DATA = naughtyapplet.desktop EXTRA_DIST = $(lnk_DATA) naughty_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -naughty_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KVM) +naughty_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KVM) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/naughtyapplet.pot diff --git a/kicker/applets/run/Makefile.am b/kicker/applets/run/Makefile.am index ec4de4984..a14c2353a 100644 --- a/kicker/applets/run/Makefile.am +++ b/kicker/applets/run/Makefile.am @@ -13,7 +13,7 @@ lnk_DATA = runapplet.desktop EXTRA_DIST = $(lnk_DATA) run_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -run_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +run_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp *.h -o $(podir)/krunapplet.pot diff --git a/kicker/applets/swallow/Makefile.am b/kicker/applets/swallow/Makefile.am index 1b88a0c10..78d70c2d3 100644 --- a/kicker/applets/swallow/Makefile.am +++ b/kicker/applets/swallow/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = swallow_panelapplet.la swallow_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -swallow_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) swallow_panelapplet_la_SOURCES = swallow.cpp prefwidgetbase.ui prefwidget.cpp diff --git a/kicker/applets/systemtray/Makefile.am b/kicker/applets/systemtray/Makefile.am index 33a0be11c..2749c7391 100644 --- a/kicker/applets/systemtray/Makefile.am +++ b/kicker/applets/systemtray/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = systemtrayapplet.desktop EXTRA_DIST = $(lnk_DATA) systemtray_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KIO) +systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) messages: diff --git a/kicker/applets/taskbar/Makefile.am b/kicker/applets/taskbar/Makefile.am index 700cf27d8..9f6914f8e 100644 --- a/kicker/applets/taskbar/Makefile.am +++ b/kicker/applets/taskbar/Makefile.am @@ -6,7 +6,7 @@ taskbar_panelapplet_la_SOURCES = taskbarapplet.cpp taskbar_panelapplet_la_METASOURCES = AUTO taskbar_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -taskbar_panelapplet_la_LIBADD = $(LIB_KDEUI) ../../taskbar/libtaskbar.la ../../libkicker/libkickermain.la +taskbar_panelapplet_la_LIBADD = $(LIB_TDEUI) ../../taskbar/libtaskbar.la ../../libkicker/libkickermain.la noinst_HEADERS = taskbarapplet.h diff --git a/kicker/applets/trash/Makefile.am b/kicker/applets/trash/Makefile.am index a34f87d1c..2da7fec68 100644 --- a/kicker/applets/trash/Makefile.am +++ b/kicker/applets/trash/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = trashapplet.desktop EXTRA_DIST = $(lnk_DATA) trash_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -trash_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la ../../../libkonq/libkonq.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_KUTILS) +trash_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la ../../../libkonq/libkonq.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/trashapplet.pot diff --git a/kicker/extensions/dockbar/Makefile.am b/kicker/extensions/dockbar/Makefile.am index 6d2f20546..a2c294862 100644 --- a/kicker/extensions/dockbar/Makefile.am +++ b/kicker/extensions/dockbar/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = dockbar_panelextension.la dockbar_panelextension_la_SOURCES = dockcontainer.cpp dockbarextension.cpp dockbar_panelextension_la_METASOURCES = AUTO dockbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -dockbar_panelextension_la_LIBADD = $(LIB_KDEUI) +dockbar_panelextension_la_LIBADD = $(LIB_TDEUI) noinst_HEADERS = dockcontainer.h dockbarextension.h diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am index 2209e3335..314f71ff1 100644 --- a/kicker/extensions/kasbar/Makefile.am +++ b/kicker/extensions/kasbar/Makefile.am @@ -14,7 +14,7 @@ libkasbar_la_SOURCES = kasbar.cpp kasitem.cpp \ kasloaditem.cpp libkasbar_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libkasbar_la_LIBADD = $(LIB_KDEUI) ../../taskmanager/libtaskmanager.la +libkasbar_la_LIBADD = $(LIB_TDEUI) ../../taskmanager/libtaskmanager.la # # Panel Extension @@ -37,9 +37,9 @@ EXTRA_DIST = $(lnk_DATA) bin_PROGRAMS = kasbar kasbar_SOURCES = kasbarapp.cpp -kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kasbar_LDADD = libkasbar.la \ - $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) + $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) messages: diff --git a/kicker/extensions/sidebar/Makefile.am b/kicker/extensions/sidebar/Makefile.am index 18f0cfbc0..0da0a7052 100644 --- a/kicker/extensions/sidebar/Makefile.am +++ b/kicker/extensions/sidebar/Makefile.am @@ -6,7 +6,7 @@ sidebar_panelextension_la_SOURCES = sidebarextension.cpp sidebar_panelextension_la_METASOURCES = AUTO sidebar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -sidebar_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KPARTS) ../../../libkonq/libkonq.la +sidebar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_KPARTS) ../../../libkonq/libkonq.la lnkdir = $(kde_datadir)/kicker/extensions diff --git a/kicker/extensions/taskbar/Makefile.am b/kicker/extensions/taskbar/Makefile.am index 4dfa1b929..d4752e321 100644 --- a/kicker/extensions/taskbar/Makefile.am +++ b/kicker/extensions/taskbar/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = taskbar_panelextension.la taskbar_panelextension_la_SOURCES = taskbarextension.cpp taskbarextension.skel taskbar_panelextension_la_METASOURCES = AUTO taskbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -taskbar_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KPARTS) \ +taskbar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_KPARTS) \ ../../libkicker/libkickermain.la \ ../../taskmanager/libtaskmanager.la \ ../../taskbar/libtaskbar.la diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am index b1a037275..cf22b5c70 100644 --- a/kicker/kicker/Makefile.am +++ b/kicker/kicker/Makefile.am @@ -32,7 +32,7 @@ kconf_PROGRAMS = kicker-3.4-reverseLayout kconfdir = $(libdir)/kconf_update_bin kicker_3_4_reverseLayout_SOURCES = kicker-3.4-reverseLayout.cpp -kicker_3_4_reverseLayout_LDADD = $(LIB_QT) $(LIB_KDECORE) +kicker_3_4_reverseLayout_LDADD = $(LIB_QT) $(LIB_TDECORE) kicker_3_4_reverseLayout_LDFLAGS = $(all_libraries) updatedir = $(kde_datadir)/kconf_update diff --git a/kicker/kicker/buttons/Makefile.am b/kicker/kicker/buttons/Makefile.am index 1ec3d42d6..4dcbbb165 100644 --- a/kicker/kicker/buttons/Makefile.am +++ b/kicker/kicker/buttons/Makefile.am @@ -10,7 +10,7 @@ libkicker_buttons_la_SOURCES = servicebutton.cpp bookmarksbutton.cpp \ windowlistbutton.cpp libkicker_buttons_la_LDFLAGS = $(all_libraries) -libkicker_buttons_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) $(XTESTLIB) +libkicker_buttons_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_TDEUI) $(XTESTLIB) libkicker_buttons_la_METASOURCES = AUTO desktopmenu_DATA = bookmarks.desktop browser.desktop desktop.desktop \ diff --git a/kicker/kicker/core/Makefile.am b/kicker/kicker/core/Makefile.am index 25e7e733a..6532157ec 100644 --- a/kicker/kicker/core/Makefile.am +++ b/kicker/kicker/core/Makefile.am @@ -17,7 +17,7 @@ libkicker_core_la_SOURCES = extensionSettings.kcfgc \ libkicker_core_la_LDFLAGS = $(all_libraries) -libkicker_core_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) +libkicker_core_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_TDEUI) libkicker_core_la_METASOURCES = AUTO libkicker_core_la_COMPILE_FIRST = ../../libkicker/kickerSettings.h diff --git a/kicker/menuext/find/Makefile.am b/kicker/menuext/find/Makefile.am index 223781dcf..70905862a 100644 --- a/kicker/menuext/find/Makefile.am +++ b/kicker/menuext/find/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_find.la kickermenu_find_la_SOURCES = findmenu.cpp kickermenu_find_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_find_la_LIBADD = $(LIB_KDEUI) +kickermenu_find_la_LIBADD = $(LIB_TDEUI) kickermenu_find_la_METASOURCES = AUTO diff --git a/kicker/menuext/kate/Makefile.am b/kicker/menuext/kate/Makefile.am index bc629e0f9..aebea34a3 100644 --- a/kicker/menuext/kate/Makefile.am +++ b/kicker/menuext/kate/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_kate.la kickermenu_kate_la_SOURCES = katesessionmenu.cpp kickermenu_kate_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_kate_la_LIBADD = $(LIB_KDEUI) +kickermenu_kate_la_LIBADD = $(LIB_TDEUI) kickermenu_kate_la_METASOURCES = AUTO diff --git a/kicker/menuext/konq-profiles/Makefile.am b/kicker/menuext/konq-profiles/Makefile.am index 07df8f9ab..a5b95da38 100644 --- a/kicker/menuext/konq-profiles/Makefile.am +++ b/kicker/menuext/konq-profiles/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konqueror.la kickermenu_konqueror_la_SOURCES = konqy_menu.cpp kickermenu_konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_konqueror_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kickermenu_konqueror_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) kickermenu_konqueror_la_METASOURCES = AUTO diff --git a/kicker/menuext/konsole/Makefile.am b/kicker/menuext/konsole/Makefile.am index 907e79769..5abdf5a24 100644 --- a/kicker/menuext/konsole/Makefile.am +++ b/kicker/menuext/konsole/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konsole.la kickermenu_konsole_la_SOURCES = konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kickermenu_konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) kickermenu_konsole_la_METASOURCES = AUTO diff --git a/kicker/menuext/prefmenu/Makefile.am b/kicker/menuext/prefmenu/Makefile.am index 2ccbb4ba2..e11ad0cdd 100644 --- a/kicker/menuext/prefmenu/Makefile.am +++ b/kicker/menuext/prefmenu/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_prefmenu.la kickermenu_prefmenu_la_SOURCES = prefmenu.cpp kickermenu_prefmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_prefmenu_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/libkicker/libkickermain.la +kickermenu_prefmenu_la_LIBADD = $(LIB_TDEUI) $(top_builddir)/kicker/libkicker/libkickermain.la kickermenu_prefmenu_la_METASOURCES = AUTO diff --git a/kicker/menuext/recentdocs/Makefile.am b/kicker/menuext/recentdocs/Makefile.am index 38f95814b..7bd91542a 100644 --- a/kicker/menuext/recentdocs/Makefile.am +++ b/kicker/menuext/recentdocs/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_recentdocs.la kickermenu_recentdocs_la_SOURCES = recentdocsmenu.cpp kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kickermenu_recentdocs_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kickermenu_recentdocs_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) kickermenu_recentdocs_la_METASOURCES = AUTO diff --git a/kicker/menuext/remote/Makefile.am b/kicker/menuext/remote/Makefile.am index 85736d0a2..bfe778eca 100644 --- a/kicker/menuext/remote/Makefile.am +++ b/kicker/menuext/remote/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_remotemenu.la kickermenu_remotemenu_la_SOURCES = remotemenu.cpp remotemenu.skel kickermenu_remotemenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_remotemenu_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/libkicker/libkickermain.la +kickermenu_remotemenu_la_LIBADD = $(LIB_TDEUI) $(top_builddir)/kicker/libkicker/libkickermain.la kickermenu_remotemenu_la_METASOURCES = AUTO diff --git a/kicker/menuext/system/Makefile.am b/kicker/menuext/system/Makefile.am index aa5d3d33f..a629970b6 100644 --- a/kicker/menuext/system/Makefile.am +++ b/kicker/menuext/system/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_systemmenu.la kickermenu_systemmenu_la_SOURCES = systemmenu.cpp kickermenu_systemmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kickermenu_systemmenu_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kicker/libkicker/libkickermain.la +kickermenu_systemmenu_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kicker/libkicker/libkickermain.la kickermenu_systemmenu_la_METASOURCES = AUTO diff --git a/kicker/menuext/tdeprint/Makefile.am b/kicker/menuext/tdeprint/Makefile.am index c8ad7858a..cd1032016 100644 --- a/kicker/menuext/tdeprint/Makefile.am +++ b/kicker/menuext/tdeprint/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_tdeprint.la kickermenu_tdeprint_la_SOURCES = print_mnu.cpp kickermenu_tdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_tdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -ltdeprint +kickermenu_tdeprint_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) -ltdeprint kickermenu_tdeprint_la_METASOURCES = AUTO diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp index dee220d80..8fd1c1c7f 100644 --- a/kicker/menuext/tdeprint/print_mnu.cpp +++ b/kicker/menuext/tdeprint/print_mnu.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. K_EXPORT_KICKER_MENUEXT(tdeprint, PrintMenu) #define ADD_PRINTER_ID 0 -#define KDEPRINT_SETTINGS_ID 1 +#define TDEPRINT_SETTINGS_ID 1 #define CONFIG_SERVER_ID 2 #define PRINT_MANAGER_ID 3 #define PRINT_BROWSER_ID 4 @@ -65,7 +65,7 @@ void PrintMenu::initialize() if ((KMManager::self()->printerOperationMask() & KMManager::PrinterCreation) && KMManager::self()->hasManagement()) insertItem(SmallIconSet("wizard"), i18n("Add Printer..."), ADD_PRINTER_ID); - insertItem(SmallIconSet("tdeprint_configmgr"), i18n("KDE Print Settings"), KDEPRINT_SETTINGS_ID); + insertItem(SmallIconSet("tdeprint_configmgr"), i18n("KDE Print Settings"), TDEPRINT_SETTINGS_ID); if (KMManager::self()->serverOperationMask() & KMManager::ServerConfigure) insertItem(SmallIconSet("tdeprint_configsrv"), i18n("Configure Server"), CONFIG_SERVER_ID); insertSeparator(); @@ -105,7 +105,7 @@ void PrintMenu::slotExec(int ID) case ADD_PRINTER_ID: kapp->tdeinitExec("kaddprinterwizard"); break; - case KDEPRINT_SETTINGS_ID: + case TDEPRINT_SETTINGS_ID: kapp->tdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig")); break; case CONFIG_SERVER_ID: diff --git a/kicker/menuext/tom/Makefile.am b/kicker/menuext/tom/Makefile.am index 4947ef77b..0f9f7c081 100644 --- a/kicker/menuext/tom/Makefile.am +++ b/kicker/menuext/tom/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_tom.la kickermenu_tom_la_SOURCES = tom.cc kickermenu_tom_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_tom_la_LIBADD = $(LIB_KDEUI) +kickermenu_tom_la_LIBADD = $(LIB_TDEUI) #$(top_builddir)/kicker/ui/libkicker_ui.la kickermenu_tom_la_METASOURCES = AUTO diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am index 698a663c1..4a7cf1e4c 100644 --- a/kicker/proxy/Makefile.am +++ b/kicker/proxy/Makefile.am @@ -7,17 +7,17 @@ tdeinit_LTLIBRARIES = appletproxy.la extensionproxy.la METASOURCES = AUTO -appletproxy_la_LIBADD = $(LIB_KDEUI) ../libkicker/libkickermain.la +appletproxy_la_LIBADD = $(LIB_TDEUI) ../libkicker/libkickermain.la appletproxy_la_SOURCES = appletproxy.cpp appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -extensionproxy_la_LIBADD = $(LIB_KDEUI) ../libkicker/libkickermain.la +extensionproxy_la_LIBADD = $(LIB_TDEUI) ../libkicker/libkickermain.la extensionproxy_la_SOURCES = extensionproxy.cpp extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version extensiondebugger_SOURCES = extensiondebugger.cpp extensiondebugger_LDADD = ../libkicker/libkickermain.la -extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot diff --git a/kicker/taskbar/Makefile.am b/kicker/taskbar/Makefile.am index 01b3af162..6cf4b9e9c 100644 --- a/kicker/taskbar/Makefile.am +++ b/kicker/taskbar/Makefile.am @@ -9,7 +9,7 @@ libtaskbar_la_SOURCES = taskbarsettings.kcfgc taskcontainer.cpp taskbar.cpp \ libtaskbar_la_METASOURCES = AUTO libtaskbar_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) -no-undefined -libtaskbar_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) ../libkicker/libkickermain.la ../taskmanager/libtaskmanager.la +libtaskbar_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) ../libkicker/libkickermain.la ../taskmanager/libtaskmanager.la messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/libtaskbar.pot diff --git a/kicker/taskmanager/Makefile.am b/kicker/taskmanager/Makefile.am index ffe7912e7..d7a508412 100644 --- a/kicker/taskmanager/Makefile.am +++ b/kicker/taskmanager/Makefile.am @@ -5,7 +5,7 @@ libtaskmanager_la_SOURCES = tasklmbmenu.cpp taskrmbmenu.cpp taskmanager.cpp libtaskmanager_la_METASOURCES = AUTO libtaskmanager_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libtaskmanager_la_LIBADD = $(LIB_KDECORE) $(LIB_XFIXES) $(LIB_XRENDER) $(LIB_XCOMPOSITE) ../libkicker/libkickermain.la +libtaskmanager_la_LIBADD = $(LIB_TDECORE) $(LIB_XFIXES) $(LIB_XRENDER) $(LIB_XCOMPOSITE) ../libkicker/libkickermain.la messages: $(XGETTEXT) *.cpp *.h -o $(podir)/libtaskmanager.pot diff --git a/kioslave/about/Makefile.am b/kioslave/about/Makefile.am index ff410f516..4eac10f69 100644 --- a/kioslave/about/Makefile.am +++ b/kioslave/about/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/about INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ####### Files diff --git a/kioslave/finger/Makefile.am b/kioslave/finger/Makefile.am index ce6413fa8..b6e0c75a7 100644 --- a/kioslave/finger/Makefile.am +++ b/kioslave/finger/Makefile.am @@ -2,7 +2,7 @@ ## Edit from Makefile.am of kdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ####### Files diff --git a/kioslave/fish/Makefile.am b/kioslave/fish/Makefile.am index 6446e8182..8a7028f5d 100644 --- a/kioslave/fish/Makefile.am +++ b/kioslave/fish/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = kio_fish.la INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kio_fish_la_SOURCES = fish.cpp kio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) diff --git a/kioslave/mac/Makefile.am b/kioslave/mac/Makefile.am index 8cf6b1fa7..d294975b0 100644 --- a/kioslave/mac/Makefile.am +++ b/kioslave/mac/Makefile.am @@ -1,7 +1,7 @@ ## Makfile.am for kio_mac INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ####### Files diff --git a/kioslave/man/Makefile.am b/kioslave/man/Makefile.am index 3c5c6c78d..949f4f04c 100644 --- a/kioslave/man/Makefile.am +++ b/kioslave/man/Makefile.am @@ -1,15 +1,15 @@ ## Makefile.am of kdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor EXTRA_PROGRAMS = kio_man_test man2html ####### just for testing ([email protected], 15.02.2001) kio_man_test_SOURCES = kio_man_test.cpp -kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +kio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kio_man_test_LDADD = man2html.lo kio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ####### Files @@ -39,7 +39,7 @@ messages: man2html_SOURCES = dummy.cpp man2html_LDADD = man2html_simple.o $(LIB_QT) -man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor dummy.cpp: echo > $@ diff --git a/kioslave/media/medianotifier/Makefile.am b/kioslave/media/medianotifier/Makefile.am index a0bff573e..b31354810 100644 --- a/kioslave/media/medianotifier/Makefile.am +++ b/kioslave/media/medianotifier/Makefile.am @@ -2,8 +2,8 @@ INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes) kde_module_LTLIBRARIES = kded_medianotifier.la kded_medianotifier_la_LDFLAGS = -module -avoid-version $(all_libraries) -kded_medianotifier_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KDECORE) \ - $(LIB_KDEUI) $(LIB_KIO) +kded_medianotifier_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDECORE) \ + $(LIB_TDEUI) $(LIB_KIO) kded_medianotifier_la_SOURCES = medianotifier.cpp medianotifier.skel \ notificationdialog.cpp notificationdialogview.ui diff --git a/kioslave/media/mounthelper/Makefile.am b/kioslave/media/mounthelper/Makefile.am index 99bba4df9..d3fb942bb 100644 --- a/kioslave/media/mounthelper/Makefile.am +++ b/kioslave/media/mounthelper/Makefile.am @@ -5,8 +5,8 @@ AM_LDFLAGS = $(all_libraries) kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp -kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_KDEUI) +kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI) METASOURCES = AUTO diff --git a/kioslave/nfs/Makefile.am b/kioslave/nfs/Makefile.am index dfa24a928..171bf43a2 100644 --- a/kioslave/nfs/Makefile.am +++ b/kioslave/nfs/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ####### Files diff --git a/kioslave/sftp/Makefile.am b/kioslave/sftp/Makefile.am index 659621d91..1690b5165 100644 --- a/kioslave/sftp/Makefile.am +++ b/kioslave/sftp/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/sftp INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO ####### Files diff --git a/kioslave/smtp/Makefile.am b/kioslave/smtp/Makefile.am index 4ebe8ddd8..a3ec64a14 100644 --- a/kioslave/smtp/Makefile.am +++ b/kioslave/smtp/Makefile.am @@ -17,11 +17,11 @@ TESTS = test_headergeneration test_responseparser test_commands check_PROGRAMS = $(TESTS) interactivesmtpserver test_headergeneration_SOURCES = test_headergeneration.cc -test_headergeneration_LDADD = $(LIB_KDECORE) +test_headergeneration_LDADD = $(LIB_TDECORE) test_headergeneration_LDFLAGS = $(all_libraries) test_responseparser_SOURCES = test_responseparser.cc -test_responseparser_LDADD = $(LIB_KDECORE) +test_responseparser_LDADD = $(LIB_TDECORE) test_responseparser_LDFLAGS = $(all_libraries) test_commands_SOURCES = test_commands.cc diff --git a/kioslave/tar/Makefile.am b/kioslave/tar/Makefile.am index acb37faca..dfe3016a6 100644 --- a/kioslave/tar/Makefile.am +++ b/kioslave/tar/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/tar INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kio_tar.la diff --git a/kioslave/thumbnail/Makefile.am b/kioslave/thumbnail/Makefile.am index 8024b2ba3..944ba2f08 100644 --- a/kioslave/thumbnail/Makefile.am +++ b/kioslave/thumbnail/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/thumbnail INCLUDES = $(all_includes) $(EXR_FLAGS) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO if have_xcursor @@ -36,15 +36,15 @@ htmlthumbnail_la_LIBADD = $(LIB_KHTML) htmlthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) djvuthumbnail_la_SOURCES = djvucreator.cpp -djvuthumbnail_la_LIBADD = $(LIB_KDECORE) +djvuthumbnail_la_LIBADD = $(LIB_TDECORE) djvuthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) cursorthumbnail_la_SOURCES = cursorcreator.cpp -cursorthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_XCURSOR) +cursorthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_XCURSOR) cursorthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) exrthumbnail_la_SOURCES = exrcreator.cpp -exrthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_EXR) +exrthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_EXR) exrthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = thumbnail.h imagecreator.h textcreator.h htmlcreator.h \ diff --git a/kioslave/trash/Makefile.am b/kioslave/trash/Makefile.am index 1ab793ce0..a3f24ed92 100644 --- a/kioslave/trash/Makefile.am +++ b/kioslave/trash/Makefile.am @@ -12,7 +12,7 @@ kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined bin_PROGRAMS = ktrash ktrash_SOURCES = ktrash.cpp ktrash_LDADD = $(LIB_KIO) -ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kde_services_DATA = trash.protocol diff --git a/klipper/Makefile.am b/klipper/Makefile.am index ea41d18fc..45ef01f8a 100644 --- a/klipper/Makefile.am +++ b/klipper/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = klipper_panelapplet.la CLEANFILES = dummy.cpp -libklipper_common_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_XFIXES) +libklipper_common_la_LIBADD = $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_XFIXES) libklipper_common_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ toplevel.skel clipboardpoll.cpp history.cpp historyitem.cpp historystringitem.cpp klipperpopup.cpp popupproxy.cpp \ historyimageitem.cpp historyurlitem.cpp diff --git a/kmenuedit/Makefile.am b/kmenuedit/Makefile.am index e97a54515..7f54096c7 100644 --- a/kmenuedit/Makefile.am +++ b/kmenuedit/Makefile.am @@ -11,7 +11,7 @@ CLEANFILES = dummy.cpp libkmenueditcommon_la_SOURCES = basictab.cpp treeview.cpp kmenuedit.cpp \ khotkeys.cpp menufile.cpp menuinfo.cpp -libkmenueditcommon_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +libkmenueditcommon_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) libkmenueditcommon_la_LDFLAGS = $(all_libraries) -module -avoid-version kmenuedit_la_SOURCES = main.cpp diff --git a/knetattach/Makefile.am b/knetattach/Makefile.am index cd794f425..07d356e06 100644 --- a/knetattach/Makefile.am +++ b/knetattach/Makefile.am @@ -2,7 +2,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = knetattach knetattach_SOURCES = knetattach.ui main.cpp -knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +knetattach_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor knetattach_LDADD = $(LIB_KIO) METASOURCES = AUTO xdg_apps_DATA = knetattach.desktop diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am index e9dd03ba1..4da0053a6 100644 --- a/konqueror/keditbookmarks/Makefile.am +++ b/konqueror/keditbookmarks/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = tdeinit_LTLIBRARIES = keditbookmarks.la kbookmarkmerger_SOURCES = kbookmarkmerger.cpp -kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kbookmarkmerger_LDADD = $(LIB_KIO) dcop_DCOPIDLNG = true diff --git a/konqueror/preloader/Makefile.am b/konqueror/preloader/Makefile.am index 8ecaba5ad..f7c6ffb9f 100644 --- a/konqueror/preloader/Makefile.am +++ b/konqueror/preloader/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kded_konqy_preloader.la INCLUDES= -I.. $(all_includes) kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_KSYCOCA) $(LIB_KDECORE) +kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_KSYCOCA) $(LIB_TDECORE) METASOURCES = AUTO diff --git a/konsole/konsole/Makefile.am b/konsole/konsole/Makefile.am index f91956e30..6139fdfe4 100644 --- a/konsole/konsole/Makefile.am +++ b/konsole/konsole/Makefile.am @@ -33,7 +33,7 @@ fontembedder_LDADD = $(LIB_QT) # kwrited kded module kded_kwrited_la_SOURCES = kwrited.cpp TEPty.cpp kwrited.skel -kded_kwrited_la_LIBADD = $(LIB_KDECORE) +kded_kwrited_la_LIBADD = $(LIB_TDECORE) kded_kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version # konsole tdeinit module @@ -42,11 +42,11 @@ konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp se konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp \ zmodem_dialog.cpp printsettings.cpp konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB) $(LIB_XRENDER) +konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIBUTIL) $(XTESTLIB) $(LIB_XRENDER) # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp -# kcmkonsole_LDADD = $(LIB_KDEUI) -# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +# kcmkonsole_LDADD = $(LIB_TDEUI) +# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \ TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \ diff --git a/kpager/Makefile.am b/kpager/Makefile.am index 650ccdc25..5cfbf0910 100644 --- a/kpager/Makefile.am +++ b/kpager/Makefile.am @@ -6,9 +6,9 @@ kpager_SOURCES = desktop.cpp kpager.cpp config.cpp windowdrag.cpp \ kpagerIface.skel main.cpp kpager_METASOURCES = AUTO -kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kpager_LDADD = $(LIB_KDEUI) +kpager_LDADD = $(LIB_TDEUI) KDE_ICON = kpager diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am index dda3e7776..dc119b63e 100644 --- a/kpersonalizer/Makefile.am +++ b/kpersonalizer/Makefile.am @@ -38,7 +38,7 @@ METASOURCES = AUTO KDE_ICON= AUTO # the library search path. -kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # 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/kreadconfig/Makefile.am b/kreadconfig/Makefile.am index 6e35673f4..aaffa73af 100644 --- a/kreadconfig/Makefile.am +++ b/kreadconfig/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -LDADD = $(LIB_KDECORE) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +LDADD = $(LIB_TDECORE) bin_PROGRAMS = kreadconfig kwriteconfig kreadconfig_SOURCES = kreadconfig.cpp diff --git a/kscreensaver/Makefile.am b/kscreensaver/Makefile.am index 9a36060c5..ff00a42b1 100644 --- a/kscreensaver/Makefile.am +++ b/kscreensaver/Makefile.am @@ -4,15 +4,15 @@ AM_CPPFLAGS = -UQT_NO_ASCII_CAST INCLUDES = $(GLINC) $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor bin_PROGRAMS = krandom.kss kblankscrn.kss krandom_kss_SOURCES = random.cpp -krandom_kss_LDADD = $(LIB_KDEUI) $(GLLIB) -lm +krandom_kss_LDADD = $(LIB_TDEUI) $(GLLIB) -lm kblankscrn_kss_SOURCES = blankscrn.cpp -kblankscrn_kss_LDADD = $(LIB_KDEUI) -lkscreensaver -lm +kblankscrn_kss_LDADD = $(LIB_TDEUI) -lkscreensaver -lm METASOURCES = AUTO diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am index 68eb5f2a8..1f1d1d817 100644 --- a/ksmserver/Makefile.am +++ b/ksmserver/Makefile.am @@ -31,7 +31,7 @@ ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \ KSMServerInterface.skel server.skel timed.ui ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module -ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI) $(HAL_LIBS) $(DBUS_LIBS) +ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_TDEUI) $(HAL_LIBS) $(DBUS_LIBS) picsdir = $(kde_datadir)/ksmserver/pics pics_DATA = shutdownkonq.png @@ -43,8 +43,8 @@ updatedir = $(kde_datadir)/kconf_update EXTRA_PROGRAMS = testsh testsh_SOURCES = test.cpp timed.ui -testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) +testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) messages: $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot diff --git a/ksplashml/Makefile.am b/ksplashml/Makefile.am index f61b18761..30639589b 100644 --- a/ksplashml/Makefile.am +++ b/ksplashml/Makefile.am @@ -6,8 +6,8 @@ METASOURCES=AUTO bin_PROGRAMS = ksplash ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp -ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ksplash_LDADD = $(LIB_KDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO) +ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksplash_LDADD = $(LIB_TDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO) noinst_HEADERS = ksplashiface.h wndmain.h diff --git a/ksplashml/themeengine/Makefile.am b/ksplashml/themeengine/Makefile.am index 411825cc9..558404e31 100644 --- a/ksplashml/themeengine/Makefile.am +++ b/ksplashml/themeengine/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libksplashthemes.la libksplashthemes_la_SOURCES = themeengine.cpp objkstheme.cpp libksplashthemes_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -libksplashthemes_la_LIBADD = $(LIB_KDEUI) $(LIB_XCURSOR) +libksplashthemes_la_LIBADD = $(LIB_TDEUI) $(LIB_XCURSOR) METASOURCES = AUTO # install this header for theme developers. diff --git a/ksplashml/themeengine/default/Makefile.am b/ksplashml/themeengine/default/Makefile.am index d343d3023..b6f14e29b 100644 --- a/ksplashml/themeengine/default/Makefile.am +++ b/ksplashml/themeengine/default/Makefile.am @@ -3,14 +3,14 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) noinst_LTLIBRARIES = libthemedefault.la libthemedefault_la_SOURCES = themelegacy.cpp -libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la +libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashdefault.la ksplashdefault_la_SOURCES = main.cpp ksplashdefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -module -ksplashdefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la libthemedefault.la +ksplashdefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la libthemedefault.la METASOURCES = AUTO servicesdir = $(kde_servicesdir) diff --git a/ksplashml/themeengine/redmond/Makefile.am b/ksplashml/themeengine/redmond/Makefile.am index 70f8cfb1c..28e1eca24 100644 --- a/ksplashml/themeengine/redmond/Makefile.am +++ b/ksplashml/themeengine/redmond/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ksplashml/themeengine $(all_includes) ksplashredmond_la_SOURCES = previewredmond.cpp themeredmond.cpp ksplashredmond_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) -ksplashredmond_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) ../libksplashthemes.la +ksplashredmond_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) ../libksplashthemes.la METASOURCES = AUTO kde_module_LTLIBRARIES = ksplashredmond.la diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am index 96e58e3a2..029e31944 100644 --- a/ksplashml/themeengine/simple/Makefile.am +++ b/ksplashml/themeengine/simple/Makefile.am @@ -3,5 +3,5 @@ INCLUDES = $(all_includes) bin_PROGRAMS = ksplashsimple ksplashsimple_SOURCES = main.cpp -ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT) diff --git a/ksplashml/themeengine/standard/Makefile.am b/ksplashml/themeengine/standard/Makefile.am index d9d09c0d5..9d275066b 100644 --- a/ksplashml/themeengine/standard/Makefile.am +++ b/ksplashml/themeengine/standard/Makefile.am @@ -4,14 +4,14 @@ INCLUDES = -I$(top_srcdir)/ksplashml/themeengine $(all_includes) noinst_LTLIBRARIES = libthemestandard.la libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp -libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -libthemestandard_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la +libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemestandard_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashstandard.la ksplashstandard_la_SOURCES = themestandardlib.cpp ksplashstandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -module -ksplashstandard_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la libthemestandard.la +ksplashstandard_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la libthemestandard.la METASOURCES = AUTO noinst_HEADERS = themestandard.h wndicon.h wndstatus.h diff --git a/ksplashml/themeengine/unified/Makefile.am b/ksplashml/themeengine/unified/Makefile.am index d343d3023..b6f14e29b 100644 --- a/ksplashml/themeengine/unified/Makefile.am +++ b/ksplashml/themeengine/unified/Makefile.am @@ -3,14 +3,14 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) noinst_LTLIBRARIES = libthemedefault.la libthemedefault_la_SOURCES = themelegacy.cpp -libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la +libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashdefault.la ksplashdefault_la_SOURCES = main.cpp ksplashdefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -module -ksplashdefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la libthemedefault.la +ksplashdefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la libthemedefault.la METASOURCES = AUTO servicesdir = $(kde_servicesdir) diff --git a/kstart/Makefile.am b/kstart/Makefile.am index e5fdebf43..718687b50 100644 --- a/kstart/Makefile.am +++ b/kstart/Makefile.am @@ -8,8 +8,8 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kstart kstart_SOURCES = kstart.cpp -kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kstart_LDADD = $(LIB_KDECORE) +kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kstart_LDADD = $(LIB_TDECORE) METASOURCES = kstart.moc noinst_HEADERS = kstart.h version.h diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am index 0ccf4c055..4479b1c38 100644 --- a/ksysguard/gui/Makefile.am +++ b/ksysguard/gui/Makefile.am @@ -31,8 +31,8 @@ ksysguard_SOURCES = \ ksysguard_LDADD = \ ksgrd/libksgrd.la \ SensorDisplayLib/libsensordisplays.la \ - $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDNSSD) -ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor + $(LIB_TDEUI) $(LIB_KIO) $(LIB_KDNSSD) +ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpm_SOURCES = kpm.c @@ -49,7 +49,7 @@ sysguard_panelapplet_la_SOURCES = \ sysguard_panelapplet_la_LIBADD = \ ksgrd/libksgrd.la \ SensorDisplayLib/libsensordisplays.la \ - $(LIB_KDEUI) $(LIB_KIO) + $(LIB_TDEUI) $(LIB_KIO) sysguard_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) EXTRA_DIST = $(lnk_DATA) diff --git a/ksysguard/gui/ksgrd/Makefile.am b/ksysguard/gui/ksgrd/Makefile.am index ff5f0aa47..52f5bfd01 100644 --- a/ksysguard/gui/ksgrd/Makefile.am +++ b/ksysguard/gui/ksgrd/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../SensorDisplayLib $(all_includes) lib_LTLIBRARIES = libksgrd.la libksgrd_la_LDFLAGS = -no-undefined -version-info 3:0:2 $(all_libraries) -libksgrd_la_LIBADD = $(LIB_KDEUI) +libksgrd_la_LIBADD = $(LIB_TDEUI) # Which sources should be compiled for ksysguard. libksgrd_la_SOURCES = \ diff --git a/ksysguard/ksysguardd/Irix/ProcessList.c b/ksysguard/ksysguardd/Irix/ProcessList.c index 3ef86684a..5bc2230b0 100644 --- a/ksysguard/ksysguardd/Irix/ProcessList.c +++ b/ksysguard/ksysguardd/Irix/ProcessList.c @@ -44,7 +44,7 @@ #include "ProcessList.h" #define BUFSIZE 1024 -#define KDEINITLEN strlen("tdeinit: ") +#define TDEINITLEN strlen("tdeinit: ") typedef struct { int alive; /* for "garbage collection" */ diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c index 1eba1f6cc..2708664bd 100644 --- a/ksysguard/ksysguardd/Linux/ProcessList.c +++ b/ksysguard/ksysguardd/Linux/ProcessList.c @@ -40,7 +40,7 @@ #define BUFSIZE 1024 #define TAGSIZE 32 -#define KDEINITLEN strlen( "tdeinit: " ) +#define TDEINITLEN strlen( "tdeinit: " ) static CONTAINER ProcessList = 0; @@ -289,18 +289,18 @@ static int updateProcess( int pid ) /* Ugly hack to "fix" program name for tdeinit launched programs. */ if ( strcmp( ps->name, "tdeinit" ) == 0 && - strncmp( ps->cmdline, "tdeinit: ", KDEINITLEN ) == 0 && - strcmp( ps->cmdline + KDEINITLEN, "Running..." ) != 0 ) { + strncmp( ps->cmdline, "tdeinit: ", TDEINITLEN ) == 0 && + strcmp( ps->cmdline + TDEINITLEN, "Running..." ) != 0 ) { size_t len; - char* end = strchr( ps->cmdline + KDEINITLEN, ' ' ); + char* end = strchr( ps->cmdline + TDEINITLEN, ' ' ); if ( end ) - len = ( end - ps->cmdline ) - KDEINITLEN; + len = ( end - ps->cmdline ) - TDEINITLEN; else - len = strlen( ps->cmdline + KDEINITLEN ); + len = strlen( ps->cmdline + TDEINITLEN ); if ( len > 0 ) { if ( len > sizeof( ps->name ) - 1 ) len = sizeof( ps->name ) - 1; - strncpy( ps->name, ps->cmdline + KDEINITLEN, len ); + strncpy( ps->name, ps->cmdline + TDEINITLEN, len ); ps->name[ len ] = '\0'; } } diff --git a/ksystraycmd/Makefile.am b/ksystraycmd/Makefile.am index a42d2fe1b..21f340bf7 100644 --- a/ksystraycmd/Makefile.am +++ b/ksystraycmd/Makefile.am @@ -1,7 +1,7 @@ ####### Fiddle here INCLUDES = $(all_includes) -LDADD = $(LIB_KDEUI) +LDADD = $(LIB_TDEUI) ####### Files @@ -10,7 +10,7 @@ METASOURCES = ksystraycmd.moc noinst_HEADERS = ksystraycmd.h ksystraycmd_SOURCES = ksystraycmd.cpp main.cpp -ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor messages: $(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot diff --git a/ktip/Makefile.am b/ktip/Makefile.am index e9157fd51..d1ae5d172 100644 --- a/ktip/Makefile.am +++ b/ktip/Makefile.am @@ -4,8 +4,8 @@ SUBDIRS = pics bin_PROGRAMS = ktip ktip_SOURCES = ktipwindow.cpp -ktip_LDADD = $(LIB_KDEUI) -ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktip_LDADD = $(LIB_TDEUI) +ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO KDE_ICON = AUTO diff --git a/kwin/Makefile.am b/kwin/Makefile.am index cedb7e423..d7bc669e9 100644 --- a/kwin/Makefile.am +++ b/kwin/Makefile.am @@ -17,7 +17,7 @@ kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ manage.cpp notifications.cpp activation.cpp useractions.cpp \ geometry.cpp rules.cpp -kwin_la_LIBADD = $(LIB_KDEUI) lib/libtdecorations.la +kwin_la_LIBADD = $(LIB_TDEUI) lib/libtdecorations.la kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h diff --git a/kwin/clients/b2/config/Makefile.am b/kwin/clients/b2/config/Makefile.am index 9ad21f7d4..0a508a3c1 100644 --- a/kwin/clients/b2/config/Makefile.am +++ b/kwin/clients/b2/config/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_b2_config.la kwin_b2_config_la_SOURCES = config.cpp kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_b2_config_la_LIBADD = $(LIB_KDEUI) +kwin_b2_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/default/Makefile.am b/kwin/clients/default/Makefile.am index 5a9ee24a0..331f87822 100644 --- a/kwin/clients/default/Makefile.am +++ b/kwin/clients/default/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwin3_default.la kwin3_default_la_SOURCES = kdedefault.cpp kwin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_default_la_LIBADD = $(LIB_KDECORE) ../../lib/libtdecorations.la +kwin3_default_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = kdedefault.h diff --git a/kwin/clients/default/config/Makefile.am b/kwin/clients/default/config/Makefile.am index a6e09522a..0c6084226 100644 --- a/kwin/clients/default/config/Makefile.am +++ b/kwin/clients/default/config/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_default_config.la kwin_default_config_la_SOURCES = config.cpp kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_default_config_la_LIBADD = $(LIB_KDEUI) +kwin_default_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/keramik/Makefile.am b/kwin/clients/keramik/Makefile.am index 8a04fe9e6..993c9d9ba 100644 --- a/kwin/clients/keramik/Makefile.am +++ b/kwin/clients/keramik/Makefile.am @@ -8,14 +8,14 @@ noinst_HEADERS = tiles.h embedtool_SOURCES = embedtool.cpp embedtool_LDADD = $(LIB_QT) -embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kde_module_LTLIBRARIES = kwin3_keramik.la kwin3_keramik_la_SOURCES = keramik.cpp kwin3_keramik_la_COMPILE_FIRST = tiles.h kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_keramik_la_LIBADD = $(LIB_KDEUI) ../../lib/libtdecorations.la +kwin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la #kwin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO diff --git a/kwin/clients/keramik/config/Makefile.am b/kwin/clients/keramik/config/Makefile.am index 3021635ca..d4ffce144 100644 --- a/kwin/clients/keramik/config/Makefile.am +++ b/kwin/clients/keramik/config/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_keramik_config.la kwin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_keramik_config_la_LIBADD = $(LIB_KDEUI) +kwin_keramik_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h keramikconfig.h diff --git a/kwin/clients/kwmtheme/cli_installer/Makefile.am b/kwin/clients/kwmtheme/cli_installer/Makefile.am index 80033222d..1541c1742 100644 --- a/kwin/clients/kwmtheme/cli_installer/Makefile.am +++ b/kwin/clients/kwmtheme/cli_installer/Makefile.am @@ -10,9 +10,9 @@ bin_PROGRAMS = kwmtheme kwmtheme_SOURCES = main.cpp # the library search path. -kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -kwmtheme_LDADD = $(LIB_KDECORE) +kwmtheme_LDADD = $(LIB_TDECORE) diff --git a/kwin/clients/modernsystem/config/Makefile.am b/kwin/clients/modernsystem/config/Makefile.am index 79bf21290..55a695684 100644 --- a/kwin/clients/modernsystem/config/Makefile.am +++ b/kwin/clients/modernsystem/config/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kwin_modernsys_config.la kwin_modernsys_config_la_SOURCES = config.cpp kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_modernsys_config_la_LIBADD = $(LIB_KDEUI) +kwin_modernsys_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/plastik/Makefile.am b/kwin/clients/plastik/Makefile.am index 3fd9b652b..cb3f5f447 100644 --- a/kwin/clients/plastik/Makefile.am +++ b/kwin/clients/plastik/Makefile.am @@ -12,7 +12,7 @@ kwin_DATA = plastik.desktop kde_module_LTLIBRARIES = kwin3_plastik.la kwin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp kwin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_plastik_la_LIBADD = $(LIB_KDEUI) ../../lib/libtdecorations.la +kwin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la kwin3_plastik_la_METASOURCES = AUTO DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES) diff --git a/kwin/clients/plastik/config/Makefile.am b/kwin/clients/plastik/config/Makefile.am index 78a4b0502..a7b50219b 100644 --- a/kwin/clients/plastik/config/Makefile.am +++ b/kwin/clients/plastik/config/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_plastik_config.la kwin_plastik_config_la_SOURCES = config.cpp configdialog.ui kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_plastik_config_la_LIBADD = $(LIB_KDEUI) +kwin_plastik_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/quartz/Makefile.am b/kwin/clients/quartz/Makefile.am index 9072d16ab..adfc59968 100644 --- a/kwin/clients/quartz/Makefile.am +++ b/kwin/clients/quartz/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwin3_quartz.la kwin3_quartz_la_SOURCES = quartz.cpp kwin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_quartz_la_LIBADD = $(LIB_KDEUI) ../../lib/libtdecorations.la +kwin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = quartz.h diff --git a/kwin/clients/quartz/config/Makefile.am b/kwin/clients/quartz/config/Makefile.am index eb64880ee..525db9fe1 100644 --- a/kwin/clients/quartz/config/Makefile.am +++ b/kwin/clients/quartz/config/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin_quartz_config.la kwin_quartz_config_la_SOURCES = config.cpp kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_quartz_config_la_LIBADD = $(LIB_KDEUI) +kwin_quartz_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h diff --git a/kwin/clients/redmond/Makefile.am b/kwin/clients/redmond/Makefile.am index ca45a3e42..7580887b8 100644 --- a/kwin/clients/redmond/Makefile.am +++ b/kwin/clients/redmond/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kwin3_redmond.la kwin3_redmond_la_SOURCES = redmond.cpp kwin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_redmond_la_LIBADD = $(LIB_KDECORE) ../../lib/libtdecorations.la +kwin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = redmond.h diff --git a/kwin/clients/test/Makefile.am b/kwin/clients/test/Makefile.am index 5ef3d0dac..b63377889 100644 --- a/kwin/clients/test/Makefile.am +++ b/kwin/clients/test/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kwin3_test.la kwin3_test_la_SOURCES = test.cpp kwin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_test_la_LIBADD = $(LIB_KDEUI) ../../lib/libtdecorations.la +kwin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la #kwin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO diff --git a/kwin/clients/web/Makefile.am b/kwin/clients/web/Makefile.am index 32c6b8d1f..bb5080889 100644 --- a/kwin/clients/web/Makefile.am +++ b/kwin/clients/web/Makefile.am @@ -6,7 +6,7 @@ kwin3_web_la_SOURCES = Web.cpp WebButton.cpp noinst_HEADERS = Web.h WebButton.h kwin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_web_la_LIBADD = $(LIB_KDEUI) ../../lib/libtdecorations.la +kwin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO linkdir = $(kde_datadir)/kwin/ diff --git a/kwin/data/Makefile.am b/kwin/data/Makefile.am index abdc244f2..3ae92fe7a 100644 --- a/kwin/data/Makefile.am +++ b/kwin/data/Makefile.am @@ -2,11 +2,11 @@ kconf_PROGRAMS = kwin_update_window_settings kwin_update_default_rules kconfdir = $(libdir)/kconf_update_bin kwin_update_window_settings_SOURCES = update_window_settings.cpp -kwin_update_window_settings_LDADD = $(LIB_KDECORE) $(KDE_RPATH) +kwin_update_window_settings_LDADD = $(LIB_TDECORE) $(KDE_RPATH) kwin_update_window_settings_LDFLAGS = $(all_libraries) kwin_update_default_rules_SOURCES = update_default_rules.cpp -kwin_update_default_rules_LDADD = $(LIB_KDECORE) $(KDE_RPATH) +kwin_update_default_rules_LDADD = $(LIB_TDECORE) $(KDE_RPATH) kwin_update_default_rules_LDFLAGS = $(all_libraries) INCLUDES = $(all_includes) diff --git a/kwin/kcmkwin/kwindecoration/Makefile.am b/kwin/kcmkwin/kwindecoration/Makefile.am index 5eb83a8f7..e7bac2af8 100644 --- a/kwin/kcmkwin/kwindecoration/Makefile.am +++ b/kwin/kcmkwin/kwindecoration/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h kcm_kwindecoration_la_LDFLAGS = \ -module -avoid-version $(all_libraries) -no-undefined -kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI) ../../lib/libtdecorations.la +kcm_kwindecoration_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO diff --git a/kwin/kcmkwin/kwinoptions/Makefile.am b/kwin/kcmkwin/kwinoptions/Makefile.am index b6abdf0e7..7dd897762 100644 --- a/kwin/kcmkwin/kwinoptions/Makefile.am +++ b/kwin/kcmkwin/kwinoptions/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_kwinoptions.la kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI) +kcm_kwinoptions_la_LIBADD = $(LIB_TDEUI) noinst_HEADERS = windows.h mouse.h diff --git a/kwin/kcmkwin/kwinrules/Makefile.am b/kwin/kcmkwin/kwinrules/Makefile.am index b4769c6bd..6fe4b8108 100644 --- a/kwin/kcmkwin/kwinrules/Makefile.am +++ b/kwin/kcmkwin/kwinrules/Makefile.am @@ -11,7 +11,7 @@ noinst_LTLIBRARIES = libkwinrules.la libkwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp \ ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui libkwinrules_la_LDFLAGS = $(all_libraries) -no-undefined -libkwinrules_la_LIBADD = $(LIB_KDEUI) +libkwinrules_la_LIBADD = $(LIB_TDEUI) kcm_kwinrules_la_SOURCES = kcm.cpp kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined diff --git a/kwin/killer/Makefile.am b/kwin/killer/Makefile.am index 620543fa0..b55ee7b8c 100644 --- a/kwin/killer/Makefile.am +++ b/kwin/killer/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kwin_killer_helper kwin_killer_helper_SOURCES = killer.cpp -kwin_killer_helper_LDADD = $(LIB_KDEUI) -kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwin_killer_helper_LDADD = $(LIB_TDEUI) +kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/kwin/lib/Makefile.am b/kwin/lib/Makefile.am index 79e3f04ac..1ded5c5d8 100644 --- a/kwin/lib/Makefile.am +++ b/kwin/lib/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES = libtdecorations.la libtdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \ kdecorationfactory.cpp kcommondecoration.cpp -libtdecorations_la_LIBADD = $(LIB_KDECORE) +libtdecorations_la_LIBADD = $(LIB_TDECORE) libtdecorations_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined # FRAME diff --git a/kwin/tools/Makefile.am b/kwin/tools/Makefile.am index 8d223282a..7bc1284a5 100644 --- a/kwin/tools/Makefile.am +++ b/kwin/tools/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = decobenchmark INCLUDES = $(all_includes) test_gravity_SOURCES = test_gravity.cpp -test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_gravity_LDADD = $(LIB_X11) METASOURCES = AUTO diff --git a/kxkb/Makefile.am b/kxkb/Makefile.am index 60208b065..8e7719563 100644 --- a/kxkb/Makefile.am +++ b/kxkb/Makefile.am @@ -20,7 +20,7 @@ kcm_keyboard_la_LIBADD = -lxkbfile $(XTESTLIB) $(LIB_KIO) kxkb_la_SOURCES = extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp \ layoutmap.cpp kxkb.cpp kxkbtraywindow.cpp kxkb.skel kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version -kxkb_la_LIBADD = -lxkbfile -lX11 -lXext $(LIB_KDEUI) +kxkb_la_LIBADD = -lxkbfile -lX11 -lXext $(LIB_TDEUI) xdg_apps_DATA = keyboard.desktop keyboard_layout.desktop diff --git a/nsplugins/Makefile.am b/nsplugins/Makefile.am index 71c23d69f..7a01b759a 100644 --- a/nsplugins/Makefile.am +++ b/nsplugins/Makefile.am @@ -16,11 +16,11 @@ libnsplugin_la_LIBADD = -lkparts bin_PROGRAMS = nspluginscan nspluginscan_SOURCES = pluginscan.cpp nspluginscan_LDFLAGS = $(KDE_RPATH) $(all_libraries) -export-dynamic -nspluginscan_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lXt libpluginpaths.la +nspluginscan_LDADD = $(LIB_TDEUI) $(LIB_KSYCOCA) -lXt libpluginpaths.la kcm_nsplugins_la_SOURCES = kcm_nsplugins.cpp kcm_nsplugins_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_nsplugins_la_LIBADD = $(LIB_KDECORE) libpluginpaths.la +kcm_nsplugins_la_LIBADD = $(LIB_TDECORE) libpluginpaths.la noinst_LTLIBRARIES = libpluginpaths.la libpluginpaths_la_SOURCES = plugin_paths.cpp diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am index 06bd7e8f6..1fc99ceba 100644 --- a/nsplugins/test/Makefile.am +++ b/nsplugins/test/Makefile.am @@ -4,8 +4,8 @@ noinst_HEADERS = testnsplugin.h check_PROGRAMS = testnsplugin testnsplugin_SOURCES = testnsplugin.cpp -testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -testnsplugin_LDADD = $(LIB_KDEUI) ../libnsplugin.la +testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testnsplugin_LDADD = $(LIB_TDEUI) ../libnsplugin.la $(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h diff --git a/tdeprint/kjobviewer/CMakeLists.txt b/tdeprint/kjobviewer/CMakeLists.txt index 332fa7fc4..14ba1dfd4 100644 --- a/tdeprint/kjobviewer/CMakeLists.txt +++ b/tdeprint/kjobviewer/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -add_definitions( -D_KDEPRINT_COMPILE ) +add_definitions( -D_TDEPRINT_COMPILE ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/tdeprint/kjobviewer/Makefile.am b/tdeprint/kjobviewer/Makefile.am index 5362ad033..0af72ba5a 100644 --- a/tdeprint/kjobviewer/Makefile.am +++ b/tdeprint/kjobviewer/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -D_KDEPRINT_COMPILE +AM_CPPFLAGS = -D_TDEPRINT_COMPILE INCLUDES = $(all_includes) @@ -8,7 +8,7 @@ tdeinit_LTLIBRARIES = kjobviewer.la kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp kjobviewer_la_METASOURCES = AUTO -kjobviewer_la_LIBADD = -ltdeprint_management $(LIB_KDEUI) +kjobviewer_la_LIBADD = -ltdeprint_management $(LIB_TDEUI) kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kjobviewer.h diff --git a/tdeprint/kprinter/CMakeLists.txt b/tdeprint/kprinter/CMakeLists.txt index 0849ebe12..a5baa1285 100644 --- a/tdeprint/kprinter/CMakeLists.txt +++ b/tdeprint/kprinter/CMakeLists.txt @@ -13,7 +13,7 @@ include( CheckFunctionExists ) check_function_exists( sigset HAVE_SIGACTION ) check_function_exists( sigaction HAVE_SIGSET ) -add_definitions( -D_KDEPRINT_COMPILE ) +add_definitions( -D_TDEPRINT_COMPILE ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/tdeprint/kprinter/Makefile.am b/tdeprint/kprinter/Makefile.am index 4cab98880..67d958033 100644 --- a/tdeprint/kprinter/Makefile.am +++ b/tdeprint/kprinter/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -D_KDEPRINT_COMPILE +AM_CPPFLAGS = -D_TDEPRINT_COMPILE INCLUDES = $(all_includes) diff --git a/tdeprint/printmgr/CMakeLists.txt b/tdeprint/printmgr/CMakeLists.txt index af68abb3f..4498837b2 100644 --- a/tdeprint/printmgr/CMakeLists.txt +++ b/tdeprint/printmgr/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -add_definitions( -D_KDEPRINT_COMPILE ) +add_definitions( -D_TDEPRINT_COMPILE ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/tdeprint/printmgr/Makefile.am b/tdeprint/printmgr/Makefile.am index d0932829a..b982dcd79 100644 --- a/tdeprint/printmgr/Makefile.am +++ b/tdeprint/printmgr/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -D_KDEPRINT_COMPILE +AM_CPPFLAGS = -D_TDEPRINT_COMPILE INCLUDES = $(all_includes) diff --git a/tdeprint/slave/CMakeLists.txt b/tdeprint/slave/CMakeLists.txt index db9162a1b..fd042657e 100644 --- a/tdeprint/slave/CMakeLists.txt +++ b/tdeprint/slave/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -add_definitions( -D_KDEPRINT_COMPILE ) +add_definitions( -D_TDEPRINT_COMPILE ) add_subdirectory( mimetypes ) add_subdirectory( templates ) diff --git a/tdeprint/slave/Makefile.am b/tdeprint/slave/Makefile.am index 5e5e04123..46dbe4250 100644 --- a/tdeprint/slave/Makefile.am +++ b/tdeprint/slave/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -D_KDEPRINT_COMPILE +AM_CPPFLAGS = -D_TDEPRINT_COMPILE SUBDIRS = mimetypes templates diff --git a/tdeprint/tdeprint_part/CMakeLists.txt b/tdeprint/tdeprint_part/CMakeLists.txt index 6de7ddb91..586d134c6 100644 --- a/tdeprint/tdeprint_part/CMakeLists.txt +++ b/tdeprint/tdeprint_part/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -add_definitions( -D_KDEPRINT_COMPILE ) +add_definitions( -D_TDEPRINT_COMPILE ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/tdeprint/tdeprint_part/Makefile.am b/tdeprint/tdeprint_part/Makefile.am index e27404a0f..27422bd89 100644 --- a/tdeprint/tdeprint_part/Makefile.am +++ b/tdeprint/tdeprint_part/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -D_KDEPRINT_COMPILE +AM_CPPFLAGS = -D_TDEPRINT_COMPILE kde_module_LTLIBRARIES = libtdeprint_part.la diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am index cd0d39900..643a805b0 100644 --- a/tdeprint/tdeprintfax/Makefile.am +++ b/tdeprint/tdeprintfax/Makefile.am @@ -3,8 +3,8 @@ INCLUDES= $(all_includes) bin_PROGRAMS = tdeprintfax tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \ conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp -tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -tdeprintfax_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) -lkabc +tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdeprintfax_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) -lkabc tdeprintfax_METASOURCES = AUTO xdg_apps_DATA = tdeprintfax.desktop diff --git a/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h index fc1a02f7f..4645434ad 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.h +++ b/tdeprint/tdeprintfax/tdeprintfax.h @@ -18,8 +18,8 @@ * */ -#ifndef KDEPRINTFAX_H -#define KDEPRINTFAX_H +#ifndef TDEPRINTFAX_H +#define TDEPRINTFAX_H #include <kmainwindow.h> #include <kurl.h> diff --git a/tdesu/CMakeLists.txt b/tdesu/CMakeLists.txt index c1fef3ba8..1db531b46 100644 --- a/tdesu/CMakeLists.txt +++ b/tdesu/CMakeLists.txt @@ -43,7 +43,7 @@ check_function_exists( getpeereid HAVE_GETPEEREID ) check_include_file( "sys/select.h" HAVE_SYS_SELECT_H ) check_include_file( "sys/wait.h" HAVE_SYS_WAIT_H ) -if( WITH_SUDO_KDESU_BACKEND ) +if( WITH_SUDO_TDESU_BACKEND ) set( DEFAULT_SUPER_USER_COMMAND sudo CACHE INTERNAL "" FORCE ) else() set( DEFAULT_SUPER_USER_COMMAND su CACHE INTERNAL "" FORCE ) diff --git a/tdesu/README b/tdesu/README index caa2e0d48..27a8bc058 100644 --- a/tdesu/README +++ b/tdesu/README @@ -1,5 +1,5 @@ - KDESU: A KDE front end for `su'. + TDESU: A KDE front end for `su'. What is it? diff --git a/tdesu/tdesu/Makefile.am b/tdesu/tdesu/Makefile.am index f322f0a6f..411e6661b 100644 --- a/tdesu/tdesu/Makefile.am +++ b/tdesu/tdesu/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= $(all_includes) ## tdesu bin_PROGRAMS = tdesu tdesu_SOURCES = tdesu.cpp sudlg.cpp -tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor tdesu_LDADD = $(LIB_KIO) -ltdesu tdesu_METASOURCES = AUTO noinst_HEADERS = sudlg.h diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index d6aeebc6f..682661d54 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -298,7 +298,7 @@ static int startApp() } KUser u; - env << (TQCString) ("KDESU_USER=" + u.loginName().local8Bit()); + env << (TQCString) ("TDESU_USER=" + u.loginName().local8Bit()); if (!new_dcop) { diff --git a/tdesu/tdesud/Makefile.am b/tdesu/tdesud/Makefile.am index 140cbce06..a0973a4bb 100644 --- a/tdesu/tdesud/Makefile.am +++ b/tdesu/tdesud/Makefile.am @@ -7,7 +7,7 @@ KDE_CXXFLAGS = $(KDE_USE_FPIE) bin_PROGRAMS = tdesud tdesud_SOURCES = tdesud.cpp repo.cpp lexer.cpp handler.cpp secure.cpp tdesud_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) -tdesud_LDADD = $(LIB_KDECORE) -ltdesu $(LIBSOCKET) +tdesud_LDADD = $(LIB_TDECORE) -ltdesu $(LIBSOCKET) noinst_HEADERS = repo.h handler.h lexer.h secure.h ## tdesud needs to be suid or sgid something diff --git a/tqt3integration/utils/Makefile.am b/tqt3integration/utils/Makefile.am index f4f22e3b8..0d46eb92f 100644 --- a/tqt3integration/utils/Makefile.am +++ b/tqt3integration/utils/Makefile.am @@ -1,6 +1,6 @@ noinst_PROGRAMS = gen gen_SOURCES = gen.cpp -gen_LDADD = $(LIB_KDECORE) +gen_LDADD = $(LIB_TDECORE) gen_LDFLAGS = $(all_libraries) INCLUDES = $(all_includes) CLEANFILES = qtkde_functions.cpp module_functions.cpp module_functions.h generated |