summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m424
-rw-r--r--client/Makefile.am4
-rw-r--r--client/config/Makefile.am4
3 files changed, 16 insertions, 16 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index ef873f0..1c78e85 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/client/Makefile.am b/client/Makefile.am
index c05be98..3eb3546 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -14,8 +14,8 @@ noinst_HEADERS = crystalclient.h crystalbutton.h imageholder.h buttonimage.h til
kde_module_LTLIBRARIES = kwin3_crystal.la
kwin3_crystal_la_SOURCES = crystalclient.cc myrootpixmap.cc crystalbutton.cpp \
imageholder.cpp buttonimage.cpp tiles.h overlays.h
-kwin3_crystal_la_LIBADD = $(kde_libraries)/libtdecorations.la $(LIB_QT) $(LIB_KDEUI)
-kwin3_crystal_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx -lDCOP
+kwin3_crystal_la_LIBADD = $(kde_libraries)/libtdecorations.la $(LIB_QT) $(LIB_TDEUI)
+kwin3_crystal_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -lDCOP
kwin3_crystal_la_METASOURCES = AUTO
CLEANFILES = tiles.h overlays.h
diff --git a/client/config/Makefile.am b/client/config/Makefile.am
index 3ff265b..f4025f0 100644
--- a/client/config/Makefile.am
+++ b/client/config/Makefile.am
@@ -8,8 +8,8 @@ noinst_HEADERS = crystalconfig.h
kde_module_LTLIBRARIES = kwin_crystal_config.la
kwin_crystal_config_la_SOURCES = configdialog.ui infodialog.ui crystalconfig.cc crystalconfig.h
-kwin_crystal_config_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_KDECORE)
-kwin_crystal_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT)
+kwin_crystal_config_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE)
+kwin_crystal_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT)
kwin_crystal_config_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin_crystal_config_la_METASOURCES)