Browse Source

Additional k => tde renaming and fixes

tags/r14.0.0
Slávek Banko 5 years ago
parent
commit
d1d170a165
4 changed files with 13 additions and 13 deletions
  1. 9
    9
      acinclude.m4
  2. 1
    1
      admin
  3. 1
    1
      bookreader.spec
  4. 2
    2
      src/Makefile.am

+ 9
- 9
acinclude.m4 View File

@@ -2010,30 +2010,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2010 2010
 if test $kde_qtver = 3; then
2011 2011
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2012 2012
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2013
-   AC_SUBST(LIB_KIO, "-ltdeio")
2013
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2014 2014
    AC_SUBST(LIB_SMB, "-lsmb")
2015 2015
    AC_SUBST(LIB_KAB, "-lkab")
2016 2016
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
2017 2017
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2018
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2019
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2018
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2019
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2020 2020
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2021
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2021
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2022 2022
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
2023 2023
 # these are for backward compatibility
2024
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
2024
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
2025 2025
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
2026 2026
 elif test $kde_qtver = 2; then
2027 2027
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2028 2028
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2029
-   AC_SUBST(LIB_KIO, "-ltdeio")
2030
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2029
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
2030
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
2031 2031
    AC_SUBST(LIB_SMB, "-lsmb")
2032 2032
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
2033 2033
    AC_SUBST(LIB_KAB, "-lkab")
2034 2034
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
2035
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
2036
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2035
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
2036
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
2037 2037
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2038 2038
 else
2039 2039
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

+ 1
- 1
admin

@@ -1 +1 @@
1
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
1
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

+ 1
- 1
bookreader.spec View File

@@ -1,5 +1,5 @@
1 1
 # This spec file was generated by KDevelop 
2
-# Please report any problem to KDevelop Team <tdevelop-devel@tdevelop.org> 
2
+# Please report any problem to KDevelop Team <kdevelop-devel@kdevelop.org> 
3 3
 # Thanks to Matthias Saou for his explanations on http://freshrpms.net/docs/fight.html
4 4
 
5 5
 Name: bookreader

+ 2
- 2
src/Makefile.am View File

@@ -8,7 +8,7 @@ bin_PROGRAMS = bookreader bookreader_client
8 8
 INCLUDES         = $(all_includes)
9 9
 
10 10
 # the library search path. 
11
-bookreader_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
11
+bookreader_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
12 12
 
13 13
 # the libraries to link against.
14 14
 bookreader_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)
@@ -23,7 +23,7 @@ noinst_HEADERS = bookreader.h bookwidget.h theme.h renderer.h bookmark.h \
23 23
 	bookmarksdlg.h
24 24
 
25 25
 # client stuff
26
-bookreader_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
26
+bookreader_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
27 27
 bookreader_client_LDADD   = $(LIB_TDECORE)
28 28
 bookreader_client_SOURCES = bookreader_client.cpp
29 29
 

Loading…
Cancel
Save