summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m424
-rw-r--r--lib/kio-msits/Makefile.am2
-rw-r--r--src/Makefile.am4
3 files changed, 15 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 3f06506..9c4876a 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/lib/kio-msits/Makefile.am b/lib/kio-msits/Makefile.am
index 8688db4..6602be2 100644
--- a/lib/kio-msits/Makefile.am
+++ b/lib/kio-msits/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kio_msits.la
kio_msits_la_SOURCES = msits.cpp
kio_msits_la_LIBADD = -lkio $(CHM_LIBS)
-kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) $(KDE_PLUGIN)
+kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_TDECORE) $(KDE_PLUGIN)
protocol_DATA = msits.protocol
protocoldir = $(kde_servicesdir)
diff --git a/src/Makefile.am b/src/Makefile.am
index b09692b..c853ef9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,8 @@ SUBDIRS = $(LIB_KDEEXTRADIR) . pics
# the library search path.
kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a $(LIB_KDEEXTRA) \
- $(CHM_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
-kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(LIB_KDECORE) -lDCOP $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KIO) -L../lib/chmlib/
+ $(CHM_LIBS) $(LIB_QT) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
+kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO) -L../lib/chmlib/
METASOURCES = AUTO
KDE_OPTIONS = qtonly