summaryrefslogtreecommitdiffstats
path: root/kradio3
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:03 -0600
commitaf4a5b8fc1d6f4b06624677a9d30092e8c0007b0 (patch)
treefa59ec0cc6b83580d7c3c30e45dea9f64de7fc18 /kradio3
parentc97b553d6150c31db243502b996e1f4919628413 (diff)
downloadtderadio-af4a5b8fc1d6f4b06624677a9d30092e8c0007b0.tar.gz
tderadio-af4a5b8fc1d6f4b06624677a9d30092e8c0007b0.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kradio3')
-rw-r--r--kradio3/convert-presets/Makefile.am2
-rw-r--r--kradio3/convert-presets/po/Makefile14
-rw-r--r--kradio3/src/Makefile.am2
3 files changed, 9 insertions, 9 deletions
diff --git a/kradio3/convert-presets/Makefile.am b/kradio3/convert-presets/Makefile.am
index 5af242e..f733818 100644
--- a/kradio3/convert-presets/Makefile.am
+++ b/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
diff --git a/kradio3/convert-presets/po/Makefile b/kradio3/convert-presets/po/Makefile
index 8c3b993..b6c8d0e 100644
--- a/kradio3/convert-presets/po/Makefile
+++ b/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
diff --git a/kradio3/src/Makefile.am b/kradio3/src/Makefile.am
index 1c68416..7136127 100644
--- a/kradio3/src/Makefile.am
+++ b/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