summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/Makefile.am2
-rw-r--r--kdesktop/kwebdesktop/Makefile.am2
-rw-r--r--kdesktop/lock/Makefile.am2
-rw-r--r--kdesktop/minicli.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index 6c7b869f8..4d0c273e1 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -14,7 +14,7 @@ tdeinit_LTLIBRARIES = kdesktop.la
noinst_LTLIBRARIES = libkdesktopsettings.la
libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined
-libkdesktopsettings_la_LIBADD = $(LIB_KDECORE)
+libkdesktopsettings_la_LIBADD = $(LIB_TDECORE)
libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc klaunchsettings.kcfgc
kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am
index eb8d759cf..45634b174 100644
--- a/kdesktop/kwebdesktop/Makefile.am
+++ b/kdesktop/kwebdesktop/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = kwebdesktop
METASOURCES = AUTO
kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index b2d886e50..270f9e35c 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am of kdebase/kdesktop/lock
INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
-kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
####### Files
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 17d636b01..542c2b7e7 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -73,7 +73,7 @@
#include "minicli_ui.h"
#include "kdesktopsettings.h"
-#define KDESU_ERR strerror(errno)
+#define TDESU_ERR strerror(errno)
Minicli::Minicli( TQWidget *parent, const char *name)
:KDialog( parent, name, false, (WFlags)WType_TopLevel ),
@@ -495,7 +495,7 @@ int Minicli::runCommand()
if (pid < 0)
{
- kdError(1207) << "fork(): " << KDESU_ERR << "\n";
+ kdError(1207) << "fork(): " << TDESU_ERR << "\n";
return -1;
}