summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:19:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:19:35 -0600
commitdd49b4abbe3dba57bd3ce073949217070e9158ed (patch)
treef05a3a5d895dae0c2dbb8793701f69d53d4f2716
parentf2dff85cd9396ddf19e5e617d8b1f3ea82c6ff6a (diff)
downloadkmplayer-dd49b4ab.tar.gz
kmplayer-dd49b4ab.zip
Additional kde to tde renaming
-rw-r--r--ChangeLog2
-rw-r--r--acinclude.m426
-rw-r--r--po/lt.po10
-rw-r--r--src/Makefile.am8
4 files changed, 23 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index a207dac..b644bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -513,7 +513,7 @@ Changes since version 0.7.97
- Locale fix for filenames
- Added audio/x-ms-wma mimetype
Changes since version 0.7.96
-- Build changes, kdeinit wasn't used (speeds up loading) and an option for
+- Build changes, tdeinit wasn't used (speeds up loading) and an option for
disabling arts volume slider (eg. if you use kmix already)
use --disable-arts-volume with configure and it prevents linking agains the
arts libs (speeds up loading of kmplayer too)
diff --git a/acinclude.m4 b/acinclude.m4
index 6b6d572..aebdb63 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi
AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -2064,12 +2064,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then
case $host in
- *cygwin*) lib_kded="-lkdeinit_kded" ;;
+ *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
- AC_SUBST(LIB_KDEPIM, "-lkdepim")
+ AC_SUBST(LIB_KDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2099,10 +2099,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+ AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
- AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+ AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])
diff --git a/po/lt.po b/po/lt.po
index 295cbd6..28dac37 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -989,7 +989,7 @@ msgstr ""
"Nežinoma\n"
"#-#-#-#-# kcmusb.po (kcmusb) #-#-#-#-#\n"
"Nežinomas\n"
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Nežinoma\n"
"#-#-#-#-# kio.po (kio) #-#-#-#-#\n"
"Nežinoma\n"
@@ -1209,7 +1209,7 @@ msgstr ""
"Pavadinimas:\n"
"#-#-#-#-# kcmemail.po (kcmemail) #-#-#-#-#\n"
"Vardas:\n"
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Vardas:\n"
"#-#-#-#-# kio.po (kio) #-#-#-#-#\n"
"Vardas:\n"
@@ -1348,7 +1348,7 @@ msgstr ""
"Bendras\n"
"#-#-#-#-# kio_trash.po (kio_trash) #-#-#-#-#\n"
"Bendrieji\n"
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Bendros\n"
"#-#-#-#-# kdelibs.po (kdelibs) #-#-#-#-#\n"
"Bendros\n"
@@ -1710,7 +1710,7 @@ msgstr ""
#, fuzzy
msgid "Output"
msgstr ""
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Išvedimas\n"
"#-#-#-#-# kbabel.po (kbabel) #-#-#-#-#\n"
"Išvestis"
@@ -1876,7 +1876,7 @@ msgstr ""
"Adresas:\n"
"#-#-#-#-# kabc_net.po (kabc_net) #-#-#-#-#\n"
"Vieta:\n"
-"#-#-#-#-# kdeprint.po (kdeprint) #-#-#-#-#\n"
+"#-#-#-#-# tdeprint.po (tdeprint) #-#-#-#-#\n"
"Vieta:\n"
"#-#-#-#-# kio.po (kio) #-#-#-#-#\n"
"Vieta:\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 08f8bc0..666972c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ libkmplayerkofficepart_la_SOURCES=kmplayer_koffice_part.cpp
libkmplayerkofficepart_la_LDFLAGS= -avoid-version $(all_libraries) $(KDE_RPATH)
libkmplayerkofficepart_la_LIBADD= libkmplayercommon.la $(LIB_KOFFICE)
-kdeinit_LTLIBRARIES=kmplayer.la
+tdeinit_LTLIBRARIES=kmplayer.la
kmplayer_la_SOURCES= main.cpp kmplayerapp.cpp kmplayertvsource.cpp kmplayerbroadcast.cpp kmplayervdr.cpp
kmplayer_la_LIBADD= libkmplayercommon.la
kmplayer_la_LDFLAGS= -module $(KDE_PLUGIN) $(LIB_QT)
@@ -46,15 +46,15 @@ libkmplayerbackend_la_SOURCES = kmplayer_backend.skel kmplayer_callback.stub
kxineplayer_LDADD= libkmplayerbackend.la $(LIB_XINE) -lDCOP
kxineplayer_CFLAGS= $(CFLAGS_XINE)
-kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kxineplayer_SOURCES= xineplayer.cpp
kxvplayer_LDADD= libkmplayerbackend.la -lDCOP -lXv
-kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kxvplayer_SOURCES= xvplayer.cpp
kgstplayer_LDADD= libkmplayerbackend.la $(LIB_GST) $(LIB_GST_PLUGINS) -lgstinterfaces-0.10 -lDCOP
-kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kgstplayer_SOURCES= gstplayer.cpp
knpplayer_LDADD= $(LIBNSPR_LIBS)