From f74f82b8f3bfe68ba86f3dc8060be27903016d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:57:07 +0200 Subject: Additional k => tde renaming and fixes --- kftpgrabber/configure.in.in | 12 ++++++------ kftpgrabber/src/Makefile.am | 4 ++-- kftpgrabber/src/misc/interfaces/Makefile.am | 2 +- kftpgrabber/src/misc/kftpzeroconf.h | 2 +- .../src/misc/plugins/bookmarkimport/filezilla3/Makefile.am | 2 +- kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am | 2 +- kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am | 2 +- .../src/misc/plugins/bookmarkimport/ncftp/Makefile.am | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'kftpgrabber') diff --git a/kftpgrabber/configure.in.in b/kftpgrabber/configure.in.in index 7cac83d..5fe7ac0 100644 --- a/kftpgrabber/configure.in.in +++ b/kftpgrabber/configure.in.in @@ -3,9 +3,9 @@ AM_INIT_AUTOMAKE(kftpgrabber, 0.8.0) dnl Check for the 3.4 kde version (for tdednssd) -AC_DEFUN([CHECK_KDNSSD], +AC_DEFUN([CHECK_TDEDNSSD], [ - AC_MSG_CHECKING(for KDNSSD support) + AC_MSG_CHECKING(for TDEDNSSD support) AC_CACHE_VAL(ac_cv_tdednssd, [ AC_LANG_SAVE @@ -32,13 +32,13 @@ AC_DEFUN([CHECK_KDNSSD], if test "$ac_cv_tdednssd" = "yes"; then AC_MSG_RESULT(yes) - LIB_KDNSSD="-ltdednssd" + LIB_TDEDNSSD="-ltdednssd" else AC_MSG_RESULT(no) - LIB_KDNSSD="" + LIB_TDEDNSSD="" fi - AC_SUBST(LIB_KDNSSD) + AC_SUBST(LIB_TDEDNSSD) ]) @@ -104,7 +104,7 @@ AC_CHECK_FUNCS([endpwent gethostbyaddr gethostbyname getpass memmove memset \ dnl Check for some stuff KDE_CHECK_SSL CHECK_KDEVERSION -CHECK_KDNSSD +CHECK_TDEDNSSD AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN diff --git a/kftpgrabber/src/Makefile.am b/kftpgrabber/src/Makefile.am index 077924e..b85bd2e 100644 --- a/kftpgrabber/src/Makefile.am +++ b/kftpgrabber/src/Makefile.am @@ -48,8 +48,8 @@ kftpgrabber_LDADD = \ ui/libui.a \ misc/interfaces/libkftpinterfaces.la \ misc/libs/ssh/libssh.a \ - $(LIB_KDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_KPARTS) \ - $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lz + $(LIB_TDEDNSSD) -ltdewalletclient $(LIBSSL) $(LIB_TDEPARTS) \ + $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lz # this is where the desktop file will go xdg_apps_DATA = kftpgrabber.desktop diff --git a/kftpgrabber/src/misc/interfaces/Makefile.am b/kftpgrabber/src/misc/interfaces/Makefile.am index 1706c1e..27644dd 100644 --- a/kftpgrabber/src/misc/interfaces/Makefile.am +++ b/kftpgrabber/src/misc/interfaces/Makefile.am @@ -9,7 +9,7 @@ METASOURCES = AUTO lib_LTLIBRARIES = libkftpinterfaces.la libkftpinterfaces_la_SOURCES = kftpbookmarkimportplugin.cpp libkftpinterfaces_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined -libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) +libkftpinterfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) kftpgrabberincludedir = $(includedir)/kftpgrabber kftpgrabberinclude_HEADERS = kftpbookmarkimportplugin.h diff --git a/kftpgrabber/src/misc/kftpzeroconf.h b/kftpgrabber/src/misc/kftpzeroconf.h index 36ad946..deae5c9 100644 --- a/kftpgrabber/src/misc/kftpzeroconf.h +++ b/kftpgrabber/src/misc/kftpzeroconf.h @@ -45,7 +45,7 @@ #endif /** - * This class provides an interface to KDNSSD (that is available from KDE 3.4). + * This class provides an interface to TDEDNSSD (that is available from KDE 3.4). * * @author Jernej Kos */ diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am index 570de6f..a590868 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_filezilla3.la kftpimportplugin_filezilla3_la_SOURCES = kftpimportfz3plugin.cpp -kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_filezilla3_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_filezilla3_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_filezilla3.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am index 58836d6..9d15dee 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_gftp.la kftpimportplugin_gftp_la_SOURCES = kftpimportgftpplugin.cpp -kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_gftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_gftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_gftp.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am index 7954126..a287dc2 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_kftp.la kftpimportplugin_kftp_la_SOURCES = kftpimportkftpplugin.cpp -kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_kftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_kftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_kftp.desktop diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am index a41d13a..a02c438 100644 --- a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kftpimportplugin_ncftp.la kftpimportplugin_ncftp_la_SOURCES = kftpimportncftpplugin.cpp -kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) ../../../interfaces/libkftpinterfaces.la +kftpimportplugin_ncftp_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) ../../../interfaces/libkftpinterfaces.la kftpimportplugin_ncftp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) kde_services_DATA = kftpimportplugin_ncftp.desktop -- cgit v1.2.1