Rename a few build variables for overall consistency

pull/1/head
Timothy Pearson 12 years ago
parent 9a6ba2d38e
commit 6b55bf9cf4

@ -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
])

6
aclocal.m4 vendored

@ -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
])

@ -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

@ -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

@ -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

@ -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

Loading…
Cancel
Save