diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
| commit | 99a9c9fb9a9ce322e8b43fc101877c6a78622bca (patch) | |
| tree | 5a299fe2bd1b6126b955f6c1b66843465b8491a7 | |
| parent | 6aa4b34f3e8d228517f03f3df7cc7a1f92cf653d (diff) | |
| download | tdeartwork-99a9c9fb9a9ce322e8b43fc101877c6a78622bca.tar.gz tdeartwork-99a9c9fb9a9ce322e8b43fc101877c6a78622bca.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/kdeartwork@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kscreensaver/kdesavers/Makefile.am | 2 | ||||
| -rw-r--r-- | kscreensaver/kpartsaver/Makefile.am | 2 | ||||
| -rw-r--r-- | kscreensaver/kxsconfig/Makefile.am | 4 | ||||
| -rw-r--r-- | kscreensaver/xsavers/Makefile.am | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kscreensaver/kdesavers/Makefile.am b/kscreensaver/kdesavers/Makefile.am index 4ef77086..23063e63 100644 --- a/kscreensaver/kdesavers/Makefile.am +++ b/kscreensaver/kdesavers/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = . data AM_CPPFLAGS = -UQT_NO_ASCII_CAST INCLUDES = $(all_includes) $(GLINC) $(LIBART_CFLAGS) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor AM_LDADD = $(LIB_KDEUI) -lkscreensaver if COMPILE_X11_KSAVERS diff --git a/kscreensaver/kpartsaver/Makefile.am b/kscreensaver/kpartsaver/Makefile.am index 69dcf3fa..25f48039 100644 --- a/kscreensaver/kpartsaver/Makefile.am +++ b/kscreensaver/kpartsaver/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = kpartsaver.kss INCLUDES = $(all_includes) kpartsaver_kss_SOURCES = kpartsaver.cpp configwidget.ui -kpartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kpartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kpartsaver_kss_LDADD = $(LIB_KFILE) $(LIB_KPARTS) -lkscreensaver METASOURCES = AUTO diff --git a/kscreensaver/kxsconfig/Makefile.am b/kscreensaver/kxsconfig/Makefile.am index 8f616e16..d446ec3f 100644 --- a/kscreensaver/kxsconfig/Makefile.am +++ b/kscreensaver/kxsconfig/Makefile.am @@ -1,10 +1,10 @@ ## Makefile.am of kdebase/kscreensaver/kxsconfig INCLUDES = $(all_includes) -kxsconfig_LDFLAGS = $(KDE_RPATH) $(all_libraries) +kxsconfig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kxsconfig_LDADD = $(LIB_KIO) -lXt -kxsrun_LDFLAGS = $(KDE_RPATH) $(all_libraries) +kxsrun_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kxsrun_LDADD = $(LIB_KIO) EXTRA_DIST = ScreenSavers hacks.pot diff --git a/kscreensaver/xsavers/Makefile.am b/kscreensaver/xsavers/Makefile.am index 0d9effa4..b6fb2584 100644 --- a/kscreensaver/xsavers/Makefile.am +++ b/kscreensaver/xsavers/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -UQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE INCLUDES = $(all_includes) $(GLINC) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor if COMPILE_GL_XSAVERS GL_XSAVERS=kspace.kss |