summaryrefslogtreecommitdiffstats
path: root/ksplashml
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
commitb69a4883748e967bfd7564a7a07c0f9d9832397b (patch)
tree63c8b1dc5c7e759f101b941dbfcad3b352181679 /ksplashml
parente179f15ee723f9c4978b78a2c87cf1b0449d49b4 (diff)
downloadtdebase-b69a4883748e967bfd7564a7a07c0f9d9832397b.tar.gz
tdebase-b69a4883748e967bfd7564a7a07c0f9d9832397b.zip
Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksplashml')
-rw-r--r--ksplashml/Makefile.am2
-rw-r--r--ksplashml/themeengine/default/Makefile.am2
-rw-r--r--ksplashml/themeengine/simple/Makefile.am2
-rw-r--r--ksplashml/themeengine/standard/Makefile.am2
-rw-r--r--ksplashml/themeengine/unified/Makefile.am2
5 files changed, 5 insertions, 5 deletions
diff --git a/ksplashml/Makefile.am b/ksplashml/Makefile.am
index 8e8496db5..bf82ef67f 100644
--- a/ksplashml/Makefile.am
+++ b/ksplashml/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES=AUTO
bin_PROGRAMS = ksplash
ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp
-ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
ksplash_LDADD = $(LIB_KDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO)
noinst_HEADERS = ksplashiface.h wndmain.h
diff --git a/ksplashml/themeengine/default/Makefile.am b/ksplashml/themeengine/default/Makefile.am
index e3f522751..f8f111bdd 100644
--- a/ksplashml/themeengine/default/Makefile.am
+++ b/ksplashml/themeengine/default/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
noinst_LTLIBRARIES = libthemedefault.la
libthemedefault_la_SOURCES = themelegacy.cpp
-libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashdefault.la
diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am
index 1e7790109..1d05c8776 100644
--- a/ksplashml/themeengine/simple/Makefile.am
+++ b/ksplashml/themeengine/simple/Makefile.am
@@ -3,5 +3,5 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = ksplashsimple
ksplashsimple_SOURCES = main.cpp
-ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT)
diff --git a/ksplashml/themeengine/standard/Makefile.am b/ksplashml/themeengine/standard/Makefile.am
index c627f6d3c..37120f10f 100644
--- a/ksplashml/themeengine/standard/Makefile.am
+++ b/ksplashml/themeengine/standard/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ksplashml/themeengine $(all_includes)
noinst_LTLIBRARIES = libthemestandard.la
libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp
-libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libthemestandard_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashstandard.la
diff --git a/ksplashml/themeengine/unified/Makefile.am b/ksplashml/themeengine/unified/Makefile.am
index e3f522751..f8f111bdd 100644
--- a/ksplashml/themeengine/unified/Makefile.am
+++ b/ksplashml/themeengine/unified/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
noinst_LTLIBRARIES = libthemedefault.la
libthemedefault_la_SOURCES = themelegacy.cpp
-libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libthemedefault_la_LIBADD = $(LIB_KDEUI) ../libksplashthemes.la
kde_module_LTLIBRARIES = ksplashdefault.la