From 6b55bf9cf4b98a449741046d264d0db45ce29e8e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Jan 2013 23:24:28 -0600 Subject: Rename a few build variables for overall consistency --- acinclude.m4 | 6 +++--- aclocal.m4 | 6 +++--- ksystemlog/doc/Makefile | 2 +- ksystemlog/doc/en/Makefile | 2 +- ksystemlog/po/Makefile | 2 +- ksystemlog/src/Makefile.am | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6145455..1fcf32c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2022,14 +2022,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2039,7 +2039,7 @@ else 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, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/aclocal.m4 b/aclocal.m4 index 0bbf77a..88d7d8a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2034,14 +2034,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2051,7 +2051,7 @@ else 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, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/ksystemlog/doc/Makefile b/ksystemlog/doc/Makefile index 04871da..639148a 100644 --- a/ksystemlog/doc/Makefile +++ b/ksystemlog/doc/Makefile @@ -124,7 +124,7 @@ LIB_TDECORE = -ltdecore LIB_TDEPIM = -ltdepim LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui -LIB_KFILE = -ltdeio +LIB_TDEFILE = -ltdeio LIB_KFM = LIB_TDEHTML = -ltdehtml LIB_KIO = -ltdeio diff --git a/ksystemlog/doc/en/Makefile b/ksystemlog/doc/en/Makefile index 18ea389..f7da66d 100644 --- a/ksystemlog/doc/en/Makefile +++ b/ksystemlog/doc/en/Makefile @@ -121,7 +121,7 @@ LIB_TDECORE = -ltdecore LIB_TDEPIM = -ltdepim LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui -LIB_KFILE = -ltdeio +LIB_TDEFILE = -ltdeio LIB_KFM = LIB_TDEHTML = -ltdehtml LIB_KIO = -ltdeio diff --git a/ksystemlog/po/Makefile b/ksystemlog/po/Makefile index dd0165b..9dd61a5 100644 --- a/ksystemlog/po/Makefile +++ b/ksystemlog/po/Makefile @@ -121,7 +121,7 @@ LIB_TDECORE = -ltdecore LIB_TDEPIM = -ltdepim LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui -LIB_KFILE = -ltdeio +LIB_TDEFILE = -ltdeio LIB_KFM = LIB_TDEHTML = -ltdehtml LIB_KIO = -ltdeio diff --git a/ksystemlog/src/Makefile.am b/ksystemlog/src/Makefile.am index c0bbdc3..775ee45 100644 --- a/ksystemlog/src/Makefile.am +++ b/ksystemlog/src/Makefile.am @@ -30,7 +30,7 @@ ksystemlog_LDADD = \ $(top_builddir)/ksystemlog/src/cron/libksystemlog_cron.la \ $(top_builddir)/ksystemlog/src/apache/libksystemlog_apache.la \ $(top_builddir)/ksystemlog/src/samba/libksystemlog_samba.la \ - $(LIB_KFILE) $(LIB_TDEPRINT) + $(LIB_TDEFILE) $(LIB_TDEPRINT) # which sources should be compiled for ksystemlog -- cgit v1.2.1