summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:56:53 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 19:56:53 +0200
commitd1d170a1657f04309d9f84461d8406799ed1a379 (patch)
tree08389132392ae21f8919f77dc6d475a33ea8695d
parent4e17c9285840004cc943cc92dabf139b32777378 (diff)
downloadkbookreader-d1d170a1657f04309d9f84461d8406799ed1a379.tar.gz
kbookreader-d1d170a1657f04309d9f84461d8406799ed1a379.zip
Additional k => tde renaming and fixes
-rw-r--r--acinclude.m418
m---------admin0
-rw-r--r--bookreader.spec2
-rw-r--r--src/Makefile.am4
4 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 5c4227c..8463dab 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_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")
# 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/bookreader.spec b/bookreader.spec
index 007756f..977a953 100644
--- a/bookreader.spec
+++ b/bookreader.spec
@@ -1,5 +1,5 @@
# This spec file was generated by KDevelop
-# Please report any problem to KDevelop Team <tdevelop-devel@tdevelop.org>
+# Please report any problem to KDevelop Team <kdevelop-devel@kdevelop.org>
# Thanks to Matthias Saou for his explanations on http://freshrpms.net/docs/fight.html
Name: bookreader
diff --git a/src/Makefile.am b/src/Makefile.am
index 4bb48f7..1fcaf48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = bookreader bookreader_client
INCLUDES = $(all_includes)
# the library search path.
-bookreader_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+bookreader_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
# the libraries to link against.
bookreader_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT)
@@ -23,7 +23,7 @@ noinst_HEADERS = bookreader.h bookwidget.h theme.h renderer.h bookmark.h \
bookmarksdlg.h
# client stuff
-bookreader_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+bookreader_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
bookreader_client_LDADD = $(LIB_TDECORE)
bookreader_client_SOURCES = bookreader_client.cpp