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

kradio3/convert-presets/Makefile.am

@@ -25,7 +25,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-convert_presets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+convert_presets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o po/kradio-convert-presets.pot

kradio3/convert-presets/po/Makefile

@@ -154,19 +154,19 @@ LIB_KDED =
 LIB_TDEPIM = -ltdepim
 LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
-LIB_KDNSSD = -lkdnssd
+LIB_KDNSSD = -ltdednssd
 LIB_KFILE = -lkio
 LIB_KFM = 
-LIB_KHTML = -lkhtml
-LIB_KIMPROXY = -lkimproxy
+LIB_KHTML = -ltdehtml
+LIB_KIMPROXY = -ltdeimproxy
 LIB_KIO = -lkio
 LIB_KJS = -lkjs
 LIB_KNEWSTUFF = -lknewstuff
-LIB_KPARTS = -lkparts
-LIB_KSPELL = -lkspell
+LIB_KPARTS = -ltdeparts
+LIB_KSPELL = -ltdespell
 LIB_KSYCOCA = -lkio
-LIB_KUNITTEST = -lkunittest
-LIB_KUTILS = -lkutils
+LIB_KUNITTEST = -ltdeunittest
+LIB_KUTILS = -ltdeutils
 LIB_LAME = 
 LIB_LIRC = -llirc_client
 LIB_OGG = -logg -lvorbisenc

kradio3/src/Makefile.am

@@ -95,7 +95,7 @@ noinst_HEADERS = \
 
 kradio_LDADD =  $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
 
-kradio_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIRC) -Wl,--export-dynamic
+kradio_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIRC) -Wl,--export-dynamic
 
 xdg_apps_DATA = kradio.desktop