Additional k => tde renaming and fixes

12 years ago · b78cd85dce
parent f3b70701da
commit b78cd85dce
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461
--- a/cert-updater/Makefile.am
+++ b/cert-updater/Makefile.am
@ -5,6 +5,6 @@ bin_PROGRAMS = primaryrccertupdater
 primaryrccertupdater_SOURCES = main.cpp

 primaryrccertupdater_METASOURCES = AUTO
-primaryrccertupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeldap
+primaryrccertupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdeldap

 KDE_OPTIONS = nofinal
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -6,7 +6,7 @@ SUBDIRS     = primaryrealmwizard secondaryrealmwizard
 kde_module_LTLIBRARIES = kcm_ldapcontroller.la

 kcm_ldapcontroller_la_SOURCES = ldapcontroller.cpp ldapcontrollerconfigbase.ui processingdialog.cpp sha1.cc multimasterreplicationconfigbase.ui multimasterreplicationconfigdlg.cpp
-kcm_ldapcontroller_la_LIBADD = primaryrealmwizard/libprimaryrealmwizard.la secondaryrealmwizard/libsecondaryrealmwizard.la $(LIB_KIO) $(LIB_TDEUI) -ltdeldap
+kcm_ldapcontroller_la_LIBADD = primaryrealmwizard/libprimaryrealmwizard.la secondaryrealmwizard/libsecondaryrealmwizard.la $(LIB_TDEIO) $(LIB_TDEUI) -ltdeldap
 kcm_ldapcontroller_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)