summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-26 13:08:38 -0600
committerTimothy Pearson <[email protected]>2013-01-26 13:08:38 -0600
commitbf50ae9e4bf255fbf4f55d65f1676be902510e25 (patch)
treead7082dde973bb062e6abcb3249bd61495c2ea3e
parentcf5724ec85944e55fa55f61c8d3a09012ff24fd9 (diff)
downloadkcmldapcontroller-bf50ae9e4bf255fbf4f55d65f1676be902510e25.tar.gz
kcmldapcontroller-bf50ae9e4bf255fbf4f55d65f1676be902510e25.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--cert-updater/Makefile.am2
-rw-r--r--src/ldapcontroller.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/cert-updater/Makefile.am b/cert-updater/Makefile.am
index f1e8bae..602ba71 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) -lktexteditor -ltdeldap
+primaryrccertupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeldap
KDE_OPTIONS = nofinal \ No newline at end of file
diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp
index b6c7a03..0f49c68 100644
--- a/src/ldapcontroller.cpp
+++ b/src/ldapcontroller.cpp
@@ -27,7 +27,7 @@
#include <klocale.h>
#include <kglobal.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include <ksimpleconfig.h>
#include <kglobalsettings.h>
#include <kstandarddirs.h>