diff --git a/acinclude.m4 b/acinclude.m4 index b2cf885..b63c97d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,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_KABC, "-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_KFILE, "-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_KFILE, "-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/krecipes/krecipes.kdevelop b/krecipes/krecipes.tdevelop similarity index 100% rename from krecipes/krecipes.kdevelop rename to krecipes/krecipes.tdevelop diff --git a/krecipes/src/Makefile.am b/krecipes/src/Makefile.am index d8b66a2..38351fd 100644 --- a/krecipes/src/Makefile.am +++ b/krecipes/src/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = backends importers widgets dialogs exporters datablocks tests INCLUDES = -I$(srcdir) -I$(srcdir)/backends -I$(srcdir)/backends/SQLite $(all_includes) # 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 @@ -31,7 +31,7 @@ krecipes_LDADD = \ backends/libkrecipesdbs.la exporters/libkrecipesexporters.la \ importers/libkrecipesimporters.la widgets/libkrecipeswidgets.la dialogs/libkrecipesdialogs.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 krecipes_SOURCES = \ diff --git a/krecipes/src/tests/Makefile.am b/krecipes/src/tests/Makefile.am index 43dfd6d..6469c12 100644 --- a/krecipes/src/tests/Makefile.am +++ b/krecipes/src/tests/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = importertest.h exportertest.h 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 mmftest_SOURCES = mmftest.cpp diff --git a/po/de/krecipes.po b/po/de/krecipes.po index db2708a..69a84ae 100644 --- a/po/de/krecipes.po +++ b/po/de/krecipes.po @@ -13,7 +13,7 @@ msgstr "" "POT-Creation-Date: 2006-09-01 08:44+0200\n" "PO-Revision-Date: 2006-07-09 10:25+0200\n" "Last-Translator: Thomas Reitelbach \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/po/fi/krecipes.po b/po/fi/krecipes.po index 7e27e02..c25d6cc 100644 --- a/po/fi/krecipes.po +++ b/po/fi/krecipes.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2006-09-01 08:44+0200\n" "PO-Revision-Date: 2005-10-17 20:44+0300\n" "Last-Translator: Ilpo Kantonen \n" -"Language-Team: finnish >" +"Language-Team: finnish >" "\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/it/krecipes.po b/po/it/krecipes.po index e273e12..74c5b4d 100644 --- a/po/it/krecipes.po +++ b/po/it/krecipes.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2006-09-01 08:44+0200\n" "PO-Revision-Date: 2006-08-22 23:03+0200\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/po/nl/krecipes.po b/po/nl/krecipes.po index 9ddd1f1..256985d 100644 --- a/po/nl/krecipes.po +++ b/po/nl/krecipes.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2006-09-01 08:44+0200\n" "PO-Revision-Date: 2006-08-24 12:44+0200\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/po/pt/krecipes.po b/po/pt/krecipes.po index db7953e..6425d8e 100644 --- a/po/pt/krecipes.po +++ b/po/pt/krecipes.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2006-09-01 08:44+0200\n" "PO-Revision-Date: 2006-08-29 02:33+0100\n" "Last-Translator: Jose Nuno Pires \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"