Rename a number of libraries and executables to avoid conflicts with KDE4

11 years ago · bf50ae9e4b
parent cf5724ec85
commit bf50ae9e4b
2 changed files with 2 additions and 2 deletions
--- 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
--- 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>