From b5edae7536592ae7bb93855b13b0ab858840e768 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:32:22 -0600 Subject: Rename additional instances of KDE to TDE --- acinclude.m4 | 24 ++++++++++++------------ src/app/Makefile.am | 4 ++-- src/part/Makefile.am | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 114a314..7333aac 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/src/app/Makefile.am b/src/app/Makefile.am index d78357a..5476a43 100644 --- a/src/app/Makefile.am +++ b/src/app/Makefile.am @@ -4,5 +4,5 @@ METASOURCES = AUTO # Application bin_PROGRAMS = filelight filelight_SOURCES = historyAction.cpp mainWindow.cpp main.cpp -filelight_LDADD = $(LIB_KPARTS) $(LIB_KDEUI) -filelight_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +filelight_LDADD = $(LIB_KPARTS) $(LIB_TDEUI) +filelight_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/src/part/Makefile.am b/src/part/Makefile.am index 5e1934e..36055f3 100644 --- a/src/part/Makefile.am +++ b/src/part/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO #Part kde_module_LTLIBRARIES = libfilelight.la -libfilelight_la_LIBADD = ./radialMap/libradialmap.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_QT) +libfilelight_la_LIBADD = ./radialMap/libradialmap.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) libfilelight_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -lkio -ltdefx libfilelight_la_SOURCES = \ dialog.ui \ -- cgit v1.2.1