diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:57:59 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:57:59 +0200 |
| commit | 291cf502dd96dbadbc6d82a7f5f48c14377c7c71 (patch) | |
| tree | 9b1a316af8f9d7ef8af4132e3674f8080b8b43ce | |
| parent | 9fe000682303e313a0fb2652bd000cececc52ad6 (diff) | |
| download | kopete-otr-291cf502dd96dbadbc6d82a7f5f48c14377c7c71.tar.gz kopete-otr-291cf502dd96dbadbc6d82a7f5f48c14377c7c71.zip | |
Additional k => tde renaming and fixes
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index fa8f294..c8e2c6b 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_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 -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/src/Makefile.am b/src/Makefile.am index 47584b4..0486258 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ kcm_kopete_otr_la_SOURCES = kopete_otr.kcfgc otrpreferences.cpp otrprefs.ui kcm_kopete_otr_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) \ $(all_libraries) -lkopete -kcm_kopete_otr_la_LIBADD = libkotr.la -lotr $(LIB_KUTILS) +kcm_kopete_otr_la_LIBADD = libkotr.la -lotr $(LIB_TDEUTILS) service_DATA = kopete_otr.desktop servicedir = $(kde_servicesdir) |