Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 11 years ago
parent 98cc66787d
commit ed0e1551ee

@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
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_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_KABC, "-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")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-ltdeio") AC_SUBST(LIB_KFILE, "-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_KFILE, "-ltdefile") AC_SUBST(LIB_KFILE, "-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

@ -10,7 +10,7 @@ SUBDIRS = backends importers widgets dialogs exporters datablocks tests
INCLUDES = -I$(srcdir) -I$(srcdir)/backends -I$(srcdir)/backends/SQLite $(all_includes) INCLUDES = -I$(srcdir) -I$(srcdir)/backends -I$(srcdir)/backends/SQLite $(all_includes)
# the library search path. # the library search path.
krecipes_LDFLAGS = $(KDE_RPATH) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdefx -lDCOP $(LIB_QT) $(all_libraries) krecipes_LDFLAGS = $(KDE_RPATH) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdefx -lDCOP $(LIB_QT) $(all_libraries)
# Check for optional libs # Check for optional libs
@ -31,7 +31,7 @@ krecipes_LDADD = \
backends/libkrecipesdbs.la exporters/libkrecipesexporters.la \ backends/libkrecipesdbs.la exporters/libkrecipesexporters.la \
importers/libkrecipesimporters.la widgets/libkrecipeswidgets.la dialogs/libkrecipesdialogs.la \ importers/libkrecipesimporters.la widgets/libkrecipeswidgets.la dialogs/libkrecipesdialogs.la \
widgets/libkrecipeswidgets.la datablocks/libdatablocks.la \ widgets/libkrecipeswidgets.la datablocks/libdatablocks.la \
$(qsqlite_libadds) $(mysql_libadds) $(psql_libadds) $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_KPARTS) -ltdefx $(qsqlite_libadds) $(mysql_libadds) $(psql_libadds) $(LIB_TDEHTML) $(LIB_TDESPELL) $(LIB_TDEPARTS) -ltdefx
# which sources should be compiled for krecipes # which sources should be compiled for krecipes
krecipes_SOURCES = \ krecipes_SOURCES = \

@ -8,7 +8,7 @@ noinst_HEADERS = importertest.h exportertest.h
METASOURCES = AUTO METASOURCES = AUTO
LDADD = ../importers/libkrecipesimporters.la ../exporters/libkrecipesexporters.la ../backends/libkrecipesdbs.la ../datablocks/libdatablocks.la $(LIB_QT) $(LIB_TDEHTML) $(LIB_KSPELL) LDADD = ../importers/libkrecipesimporters.la ../exporters/libkrecipesexporters.la ../backends/libkrecipesdbs.la ../datablocks/libdatablocks.la $(LIB_QT) $(LIB_TDEHTML) $(LIB_TDESPELL)
kretest_SOURCES = kretest.cpp kretest_SOURCES = kretest.cpp
mmftest_SOURCES = mmftest.cpp mmftest_SOURCES = mmftest.cpp

@ -13,7 +13,7 @@ msgstr ""
"POT-Creation-Date: 2006-09-01 08:44+0200\n" "POT-Creation-Date: 2006-09-01 08:44+0200\n"
"PO-Revision-Date: 2006-07-09 10:25+0200\n" "PO-Revision-Date: 2006-07-09 10:25+0200\n"
"Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n" "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
"Language-Team: German <tde-i18n-de@kde.org>\n" "Language-Team: German <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: 2006-09-01 08:44+0200\n" "POT-Creation-Date: 2006-09-01 08:44+0200\n"
"PO-Revision-Date: 2005-10-17 20:44+0300\n" "PO-Revision-Date: 2005-10-17 20:44+0300\n"
"Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n" "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
"Language-Team: finnish <Finnish <tde-i18n-fi-discussion@lists.sourceforge.net>>" "Language-Team: finnish <Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>>"
"\n" "\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"

@ -10,7 +10,7 @@ msgstr ""
"POT-Creation-Date: 2006-09-01 08:44+0200\n" "POT-Creation-Date: 2006-09-01 08:44+0200\n"
"PO-Revision-Date: 2006-08-22 23:03+0200\n" "PO-Revision-Date: 2006-08-22 23:03+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"

@ -11,7 +11,7 @@ msgstr ""
"POT-Creation-Date: 2006-09-01 08:44+0200\n" "POT-Creation-Date: 2006-09-01 08:44+0200\n"
"PO-Revision-Date: 2006-08-24 12:44+0200\n" "PO-Revision-Date: 2006-08-24 12:44+0200\n"
"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n" "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
"Language-Team: Dutch <tde-i18n-nl@kde.org>\n" "Language-Team: Dutch <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: 2006-09-01 08:44+0200\n" "POT-Creation-Date: 2006-09-01 08:44+0200\n"
"PO-Revision-Date: 2006-08-29 02:33+0100\n" "PO-Revision-Date: 2006-08-29 02:33+0100\n"
"Last-Translator: Jose Nuno Pires <jncp@netcabo.pt>\n" "Last-Translator: Jose Nuno Pires <jncp@netcabo.pt>\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"

Loading…
Cancel
Save