diff --git a/acinclude.m4 b/acinclude.m4 index 74262e6..3350488 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2090,35 +2090,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/src/kile.kdevprj b/src/kile.kdevprj index d63b03f..17fa0dc 100644 --- a/src/kile.kdevprj +++ b/src/kile.kdevprj @@ -22,7 +22,7 @@ bin_program=kile cflags=-pg -a cppflags= cxxflags=\s-O0 -g3 -Wall -ldadd=-ltdeprint $(LIB_KSPELL) $(LIB_KPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +ldadd=-ltdeprint $(LIB_TDESPELL) $(LIB_TDEPARTS) $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldflags=\s \s [General] diff --git a/src/kile/Makefile.am b/src/kile/Makefile.am index 1c6ae7b..065c98b 100644 --- a/src/kile/Makefile.am +++ b/src/kile/Makefile.am @@ -29,7 +29,7 @@ kile_SOURCES = latexcmd.cpp latexcmddialog.cpp texdocdialog.cpp userhelp.cpp \ kileversion.cpp graphicsconfigwidget.ui kilemultitabbar.cpp newdocumentwidget.ui\ symbolviewconfig.ui -kile_LDADD = -lkjs -ltdeprint -ltdetexteditor -lkatepartinterfaces $(LIB_KSPELL) $(LIB_TDEHTML) +kile_LDADD = -lkjs -ltdeprint -ltdetexteditor -lkatepartinterfaces $(LIB_TDESPELL) $(LIB_TDEHTML) SUBDIRS = icons pics symbols templates syntax complete help encodings test @@ -81,7 +81,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # the library search path. -kile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) +kile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) rcdir = $(kde_datadir)/kile rc_DATA = kileui.rc docpartui.rc kilestdtools.rc tips diff --git a/translations/de/messages/kile.po b/translations/de/messages/kile.po index 38a272e..da73447 100644 --- a/translations/de/messages/kile.po +++ b/translations/de/messages/kile.po @@ -13,7 +13,7 @@ msgstr "" "POT-Creation-Date: 2008-04-24 16:13+0200\n" "PO-Revision-Date: 2007-12-10 15:58+0100\n" "Last-Translator: Frederik Schwarzer \n" -"Language-Team: German \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/fi/messages/kile.po b/translations/fi/messages/kile.po index cb96708..7e0805a 100644 --- a/translations/fi/messages/kile.po +++ b/translations/fi/messages/kile.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2008-04-24 16:13+0200\n" "PO-Revision-Date: 2005-05-24 07:59+0300\n" "Last-Translator: Mikael Kurula \n" -"Language-Team: Suomi \n" +"Language-Team: Suomi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/it/messages/kile.po b/translations/it/messages/kile.po index b1c8a37..4c2aed8 100644 --- a/translations/it/messages/kile.po +++ b/translations/it/messages/kile.po @@ -6,7 +6,7 @@ msgstr "" "POT-Creation-Date: 2008-04-24 16:13+0200\n" "PO-Revision-Date: 2008-03-27 09:40+0100\n" "Last-Translator: Federico Zenith \n" -"Language-Team: Italian \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/nds/messages/kile.po b/translations/nds/messages/kile.po index 21e6721..816defd 100644 --- a/translations/nds/messages/kile.po +++ b/translations/nds/messages/kile.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2008-04-24 16:13+0200\n" "PO-Revision-Date: 2007-12-07 23:02+0100\n" "Last-Translator: Sönke Dibbern \n" -"Language-Team: Low Saxon \n" +"Language-Team: Low Saxon \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/nl/messages/kile.po b/translations/nl/messages/kile.po index 0552e93..a577d4b 100644 --- a/translations/nl/messages/kile.po +++ b/translations/nl/messages/kile.po @@ -23,7 +23,7 @@ msgstr "" "POT-Creation-Date: 2008-04-24 16:13+0200\n" "PO-Revision-Date: 2008-02-12 20:40+0100\n" "Last-Translator: Rinse de Vries \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/pt/messages/kile.po b/translations/pt/messages/kile.po index 2ecfb0f..493d9e2 100644 --- a/translations/pt/messages/kile.po +++ b/translations/pt/messages/kile.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2008-04-24 16:13+0200\n" "PO-Revision-Date: 2007-12-10 19:32+0000\n" "Last-Translator: Pedro Morais \n" -"Language-Team: pt \n" +"Language-Team: pt \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/pt_BR/messages/kile.po b/translations/pt_BR/messages/kile.po index 608d9af..d296985 100644 --- a/translations/pt_BR/messages/kile.po +++ b/translations/pt_BR/messages/kile.po @@ -15,7 +15,7 @@ msgstr "" "POT-Creation-Date: 2008-04-24 16:13+0200\n" "PO-Revision-Date: 2005-04-15 17:04-0300\n" "Last-Translator: Lisiane Sztoltz Teixeira \n" -"Language-Team: Brazilian portuguese \n" +"Language-Team: Brazilian portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/sr/messages/kile.po b/translations/sr/messages/kile.po index cd9db21..d416a38 100644 --- a/translations/sr/messages/kile.po +++ b/translations/sr/messages/kile.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2008-04-24 16:13+0200\n" "PO-Revision-Date: 2007-11-08 15:11+0100\n" "Last-Translator: Slobodan Simic \n" -"Language-Team: Serbian \n" +"Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"