From a31f2df3bb3e0c41fdd3b4b997a403324d5ee567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:36:26 -0600 Subject: [PATCH] Rename additional instances of KDE to TDE --- acinclude.m4 | 24 ++++++++++++------------ iso/Makefile.am | 2 +- krArc/Makefile.am | 4 ++-- krusader.kdevprj | 2 +- krusader/Makefile.am | 6 +++--- tar/Makefile.am | 2 +- virt/Makefile.am | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index d84fa27..fcc0ecb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2068,8 +2068,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") @@ -2078,9 +2078,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") @@ -2089,8 +2089,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") @@ -2099,13 +2099,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/iso/Makefile.am b/iso/Makefile.am index 8151bec..1e6411c 100644 --- a/iso/Makefile.am +++ b/iso/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = $(all_includes) kio_iso_la_METASOURCES=AUTO kio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp -kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) +kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/krArc/Makefile.am b/krArc/Makefile.am index adbaa42..a931c41 100644 --- a/krArc/Makefile.am +++ b/krArc/Makefile.am @@ -10,8 +10,8 @@ INCLUDES = $(all_includes) kio_krarc_la_METASOURCES=AUTO kio_krarc_la_SOURCES = krarc.cpp -kio_krarc_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) -# $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +kio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) +# $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) kio_krarc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/krusader.kdevprj b/krusader.kdevprj index 9878d07..1bef1f6 100644 --- a/krusader.kdevprj +++ b/krusader.kdevprj @@ -22,7 +22,7 @@ bin_program=krusader cflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE cppflags=-DKDE_NO_COMPAT -D_LARGEFILE64_SOURCE cxxflags=\s-O0 -Wall -ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) +ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ldflags=\s \s [General] diff --git a/krusader/Makefile.am b/krusader/Makefile.am index 76cce08..4b5e217 100644 --- a/krusader/Makefile.am +++ b/krusader/Makefile.am @@ -98,8 +98,8 @@ krusader_LDADD = \ $(LIB_KPARTS) \ $(LIB_KFILE) \ $(LIB_KHTML) \ - $(LIB_KDEUI) \ - $(LIB_KDECORE) \ + $(LIB_TDEUI) \ + $(LIB_TDECORE) \ $(LIB_QT) \ $(LIBSOCKET) \ -ltdefx \ @@ -108,7 +108,7 @@ krusader_LDADD = \ # the library search path. -krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkwalletclient +krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkwalletclient ########################################################### diff --git a/tar/Makefile.am b/tar/Makefile.am index 8f25a21..d360dba 100644 --- a/tar/Makefile.am +++ b/tar/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of kdebase/kioslave/tar INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kio_tar.la diff --git a/virt/Makefile.am b/virt/Makefile.am index 0a3e7ec..cab3bbb 100644 --- a/virt/Makefile.am +++ b/virt/Makefile.am @@ -1,14 +1,14 @@ ## Makefile.am of kdebase/kioslave/tar INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = kio_virt.la kio_virt_la_SOURCES = virt.cc kio_virt_la_LIBADD = $(LIB_KSYCOCA) -kio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) +kio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) noinst_HEADERS = virt.h