summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 21:39:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 21:39:56 -0600
commit3fc4d76b675becfdd2f9669eb8a799bc43537fce (patch)
tree9a125d61bfd9733f0aaad4fae1da1fca42b6ab03
parenta35ae0d3e42f6832780f5f286d0e9c297be73054 (diff)
downloadlibkexiv2-3fc4d76b675becfdd2f9669eb8a799bc43537fce.tar.gz
libkexiv2-3fc4d76b675becfdd2f9669eb8a799bc43537fce.zip
Rename additional instances of KDE to TDE
-rw-r--r--acinclude.m424
-rw-r--r--libkexiv2/libkexiv2/Makefile.am2
2 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 5861e34..c3d3129 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2092,8 +2092,8 @@ if test $kde_qtver = 3; then
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_KDECORE, "-ltdecore")
- AC_SUBST(LIB_KDEUI, "-ltdeui")
+ AC_SUBST(LIB_TDECORE, "-ltdecore")
+ AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2102,9 +2102,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+ AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
- AC_SUBST(LIB_KDEPIM, "-ltdepim")
+ AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2113,8 +2113,8 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
- AC_SUBST(LIB_KDECORE, "-ltdecore")
- AC_SUBST(LIB_KDEUI, "-ltdeui")
+ AC_SUBST(LIB_TDECORE, "-ltdecore")
+ AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2123,13 +2123,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+ AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
- AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
- AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+ AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+ AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+ AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
diff --git a/libkexiv2/libkexiv2/Makefile.am b/libkexiv2/libkexiv2/Makefile.am
index eed13ee..79ae56a 100644
--- a/libkexiv2/libkexiv2/Makefile.am
+++ b/libkexiv2/libkexiv2/Makefile.am
@@ -9,7 +9,7 @@ libkexiv2_la_SOURCES = kexiv2.cpp kexiv2private.cpp
libkexiv2_version_info = 5:0:0
libkexiv2_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info $(libkexiv2_version_info) -no-undefined
-libkexiv2_la_LIBADD = $(EXIV2_LIBS) $(LIB_KDECORE) $(LIB_QT)
+libkexiv2_la_LIBADD = $(EXIV2_LIBS) $(LIB_TDECORE) $(LIB_QT)
libkexiv2include_HEADERS = kexiv2.h libkexiv2_export.h version.h