diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:33 -0600 |
| commit | 38186d26cbe84c9d749bfc77ca41b103d58d4734 (patch) | |
| tree | b21b42297e5441bddb70f6e185f2b2aec44bb8eb | |
| parent | fa87d9547e08f454958e947ccca37863798e9ccf (diff) | |
| download | kbookreader-38186d26cbe84c9d749bfc77ca41b103d58d4734.tar.gz kbookreader-38186d26cbe84c9d749bfc77ca41b103d58d4734.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/README | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index dd9f7b7..8dc59c6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2014,11 +2014,11 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") @@ -2027,13 +2027,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2450,7 +2450,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then diff --git a/src/Makefile.am b/src/Makefile.am index b260f3b..01bd9cc 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) -lktexteditor +bookreader_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. bookreader_LDADD = $(LIB_KFILE) $(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) -lktexteditor +bookreader_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor bookreader_client_LDADD = $(LIB_TDECORE) bookreader_client_SOURCES = bookreader_client.cpp @@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play in your app. For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ +http://www-106.ibm.com/developerworks/library/l-tdeparts/ http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html |