From b78cd85dce2475adbb2e588cd54a4a40874bbfd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:56:57 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- admin | 2 +- cert-updater/Makefile.am | 2 +- src/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/cert-updater/Makefile.am b/cert-updater/Makefile.am index 602ba71..7b9c261 100644 --- 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 \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index 6265774..e0e84a3 100644 --- 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)