Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 11 years ago
parent 88cc3a9b4b
commit 64346aa68f

@ -2018,30 +2018,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

18
aclocal.m4 vendored

@ -2030,30 +2030,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -1 +1 @@
Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

@ -17,7 +17,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = knetload bin_PROGRAMS = knetload
knetload_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor knetload_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
knetload_LDADD = $(LIB_TDEUI) knetload_LDADD = $(LIB_TDEUI)

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2004-07-02 01:27+0200\n" "POT-Creation-Date: 2004-07-02 01:27+0200\n"
"PO-Revision-Date: 2004-07-04 18:07+0200\n" "PO-Revision-Date: 2004-07-04 18:07+0200\n"
"Last-Translator: Albert Astals Cid <astals11@terra.es>\n" "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
"Language-Team: Catalan <tde-i18n-ca@kde.org>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2004-07-02 01:27+0200\n" "POT-Creation-Date: 2004-07-02 01:27+0200\n"
"PO-Revision-Date: 2003-12-03 17:58+0100\n" "PO-Revision-Date: 2003-12-03 17:58+0100\n"
"Last-Translator: Thomas Diehl <thd@kde.org>\n" "Last-Translator: Thomas Diehl <thd@kde.org>\n"
"Language-Team: Deutsch <tde-i18n-de@kde.org>\n" "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2004-07-02 01:27+0200\n" "POT-Creation-Date: 2004-07-02 01:27+0200\n"
"PO-Revision-Date: 2004-07-03 02:15+0200\n" "PO-Revision-Date: 2004-07-03 02:15+0200\n"
"Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n" "Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
"Language-Team: Italian <tde-i18n-it@kde.org>\n" "Language-Team: Italian <kde-i18n-it@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -7,7 +7,7 @@ msgstr ""
"POT-Creation-Date: 2004-07-02 01:27+0200\n" "POT-Creation-Date: 2004-07-02 01:27+0200\n"
"PO-Revision-Date: 2004-07-07 13:28+0200\n" "PO-Revision-Date: 2004-07-07 13:28+0200\n"
"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n" "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
"Language-Team: Nederlands <tde-i18n-nl@kde.org>\n" "Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -4,7 +4,7 @@ msgstr ""
"POT-Creation-Date: 2004-07-02 01:27+0200\n" "POT-Creation-Date: 2004-07-02 01:27+0200\n"
"PO-Revision-Date: 2004-07-05 13:36+0100\n" "PO-Revision-Date: 2004-07-05 13:36+0100\n"
"Last-Translator: Pedro Morais <morais@kde.org>\n" "Last-Translator: Pedro Morais <morais@kde.org>\n"
"Language-Team: pt <tde-i18n-pt@kde.org>\n" "Language-Team: pt <kde-i18n-pt@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -11,7 +11,7 @@ msgstr ""
"POT-Creation-Date: 2004-07-02 01:27+0200\n" "POT-Creation-Date: 2004-07-02 01:27+0200\n"
"PO-Revision-Date: 2004-07-15 13:58-0300\n" "PO-Revision-Date: 2004-07-15 13:58-0300\n"
"Last-Translator: Lisiane Sztoltz Teixeira <lisiane@conectiva.com.br>\n" "Last-Translator: Lisiane Sztoltz Teixeira <lisiane@conectiva.com.br>\n"
"Language-Team: Brazilian Portuguese <tde-i18n-pt_BR@mail.kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_BR@mail.kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2004-07-02 01:27+0200\n" "POT-Creation-Date: 2004-07-02 01:27+0200\n"
"PO-Revision-Date: 2003-11-21 19:28+0200\n" "PO-Revision-Date: 2003-11-21 19:28+0200\n"
"Last-Translator: YILDIZ KARDEŞLER <turkishprogram@xposta.com>\n" "Last-Translator: YILDIZ KARDEŞLER <turkishprogram@xposta.com>\n"
"Language-Team: Turkish <tde-i18n-tr@kde.org>\n" "Language-Team: Turkish <kde-i18n-tr@kde.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

Loading…
Cancel
Save