From 865f314dd5ed55508f45a32973b709b79a541e36 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 11 Dec 2009 03:46:01 +0000 Subject: kdelibs update to Trinity v3.5.11 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kstyles/highcolor/Makefile.am | 2 +- kstyles/highcontrast/Makefile.am | 2 +- kstyles/highcontrast/config/Makefile.am | 2 +- kstyles/keramik/Makefile.am | 2 +- kstyles/kthemestyle/Makefile.am | 2 +- kstyles/plastik/Makefile.am | 2 +- kstyles/plastik/config/Makefile.am | 2 +- kstyles/utils/installtheme/Makefile.am | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kstyles') diff --git a/kstyles/highcolor/Makefile.am b/kstyles/highcolor/Makefile.am index a86199cce..76146112e 100644 --- a/kstyles/highcolor/Makefile.am +++ b/kstyles/highcolor/Makefile.am @@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir)/kdefx $(all_includes) noinst_HEADERS = highcolor.h bitmaps.h kde_style_LTLIBRARIES = highcolor.la highcolor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -highcolor_la_LIBADD = ../../kdefx/libkdefx.la +highcolor_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT) highcolor_la_SOURCES = highcolor.cpp highcolor_la_METASOURCES = AUTO diff --git a/kstyles/highcontrast/Makefile.am b/kstyles/highcontrast/Makefile.am index 9157e3488..af54fd949 100644 --- a/kstyles/highcontrast/Makefile.am +++ b/kstyles/highcontrast/Makefile.am @@ -35,7 +35,7 @@ noinst_HEADERS = highcontrast.h kde_style_LTLIBRARIES = highcontrast.la highcontrast_la_SOURCES = highcontrast.cpp highcontrast_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -highcontrast_la_LIBADD = ../../kdefx/libkdefx.la +highcontrast_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT) highcontrast_la_METASOURCES = AUTO DISTCLEANFILES = $(highcontrast_la_METASOURCES) diff --git a/kstyles/highcontrast/config/Makefile.am b/kstyles/highcontrast/config/Makefile.am index 23f9c6a81..e94d5a46c 100644 --- a/kstyles/highcontrast/config/Makefile.am +++ b/kstyles/highcontrast/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) noinst_HEADERS = highcontrastconfig.h kde_module_LTLIBRARIES = kstyle_highcontrast_config.la kstyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kstyle_highcontrast_config_la_LIBADD = $(LIB_KDEUI) +kstyle_highcontrast_config_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) kstyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp kstyle_highcontrast_config_la_METASOURCES = AUTO diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am index a649c4eb7..39482a8e0 100644 --- a/kstyles/keramik/Makefile.am +++ b/kstyles/keramik/Makefile.am @@ -6,7 +6,7 @@ KDE_CXXFLAGS = -UQT_NO_ASCII_CAST noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h kde_style_LTLIBRARIES = keramik.la keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -keramik_la_LIBADD = ../../kdefx/libkdefx.la +keramik_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT) $(LIB_XEXT) keramik_la_SOURCES = keramik.cpp pixmaploader.cpp gradients.cpp colorutil.cpp keramik_la_COMPILE_FIRST = keramikrc.h keramik_la_METASOURCES = AUTO diff --git a/kstyles/kthemestyle/Makefile.am b/kstyles/kthemestyle/Makefile.am index 0edb271b4..ccf9ad336 100644 --- a/kstyles/kthemestyle/Makefile.am +++ b/kstyles/kthemestyle/Makefile.am @@ -24,6 +24,6 @@ INCLUDES = -I$(top_srcdir)/kdefx $(all_includes) noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h kde_style_LTLIBRARIES = kthemestyle.la kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kthemestyle_la_LIBADD = ../../kdefx/libkdefx.la ../../kdecore/libkdecore.la +kthemestyle_la_LIBADD = ../../kdefx/libkdefx.la ../../kdecore/libkdecore.la -ldl $(LIB_QT) kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp kthemestyle_la_METASOURCES = AUTO diff --git a/kstyles/plastik/Makefile.am b/kstyles/plastik/Makefile.am index 5b57c7681..e74be711d 100644 --- a/kstyles/plastik/Makefile.am +++ b/kstyles/plastik/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = plastik.h misc.h kde_style_LTLIBRARIES = plastik.la plastik_la_SOURCES = plastik.cpp misc.cpp plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -plastik_la_LIBADD = ../../kdefx/libkdefx.la +plastik_la_LIBADD = ../../kdefx/libkdefx.la $(LIB_QT) plastik_la_METASOURCES = AUTO DISTCLEANFILES = $(plastik_la_METASOURCES) diff --git a/kstyles/plastik/config/Makefile.am b/kstyles/plastik/config/Makefile.am index a3b081ead..aeae1c5e5 100644 --- a/kstyles/plastik/config/Makefile.am +++ b/kstyles/plastik/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) noinst_HEADERS = plastikconf.h kde_module_LTLIBRARIES = kstyle_plastik_config.la kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kstyle_plastik_config_la_LIBADD = $(LIB_KDEUI) +kstyle_plastik_config_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) kstyle_plastik_config_la_SOURCES = plastikconf.cpp kstyle_plastik_config_la_METASOURCES = AUTO diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am index ff222bad0..a07905013 100644 --- a/kstyles/utils/installtheme/Makefile.am +++ b/kstyles/utils/installtheme/Makefile.am @@ -14,5 +14,5 @@ kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -kinstalltheme_LDADD = $(LIB_KDEUI) +kinstalltheme_LDADD = $(LIB_QT) $(LIB_KDECORE) -- cgit v1.2.1