diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:57:14 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-03 19:57:14 +0200 |
| commit | 1c6aafac58307097f3265534b3f324f8d0568164 (patch) | |
| tree | cbf08dea8d8faebafca2b62024777424e39f5ece | |
| parent | c7bbe54236efe197d624c7f76dc8c415ab23b99b (diff) | |
| download | kkbswitch-1c6aafac.tar.gz kkbswitch-1c6aafac.zip | |
Additional k => tde renaming and fixes
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | aclocal.m4 | 18 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | kkbswitch.tdevelop (renamed from kkbswitch.kdevelop) | 0 | ||||
| -rw-r--r-- | kkbswitch/Makefile.am | 2 | ||||
| -rw-r--r-- | kkbswitch/Makefile.am.kdeinit | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2e8601b..63b3669 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2010,30 +2010,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") 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") # 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)") @@ -2022,30 +2022,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") 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") # 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 -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/kkbswitch.kdevelop b/kkbswitch.tdevelop index e328c8d..e328c8d 100644 --- a/kkbswitch.kdevelop +++ b/kkbswitch.tdevelop diff --git a/kkbswitch/Makefile.am b/kkbswitch/Makefile.am index 89e1bef..d048f46 100644 --- a/kkbswitch/Makefile.am +++ b/kkbswitch/Makefile.am @@ -7,7 +7,7 @@ kkbswitch_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdl INCLUDES = $(all_includes) -kkbswitch_LDADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lDCOP +kkbswitch_LDADD = $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lDCOP messages: $(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot diff --git a/kkbswitch/Makefile.am.kdeinit b/kkbswitch/Makefile.am.kdeinit index 918c856..4e6a687 100644 --- a/kkbswitch/Makefile.am.kdeinit +++ b/kkbswitch/Makefile.am.kdeinit @@ -9,7 +9,7 @@ kkbswitch_la_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfi INCLUDES = $(all_includes) -kkbswitch_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) +kkbswitch_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot |