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
v3.5.13-sru
tpearson 13 years ago
parent 6aa4b34f3e
commit 99a9c9fb9a

@ -7,7 +7,7 @@ SUBDIRS = . data
AM_CPPFLAGS = -UQT_NO_ASCII_CAST AM_CPPFLAGS = -UQT_NO_ASCII_CAST
INCLUDES = $(all_includes) $(GLINC) $(LIBART_CFLAGS) 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 AM_LDADD = $(LIB_KDEUI) -lkscreensaver
if COMPILE_X11_KSAVERS if COMPILE_X11_KSAVERS

@ -2,7 +2,7 @@ bin_PROGRAMS = kpartsaver.kss
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
kpartsaver_kss_SOURCES = kpartsaver.cpp configwidget.ui 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 kpartsaver_kss_LDADD = $(LIB_KFILE) $(LIB_KPARTS) -lkscreensaver
METASOURCES = AUTO METASOURCES = AUTO

@ -1,10 +1,10 @@
## Makefile.am of kdebase/kscreensaver/kxsconfig ## Makefile.am of kdebase/kscreensaver/kxsconfig
INCLUDES = $(all_includes) 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 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) kxsrun_LDADD = $(LIB_KIO)
EXTRA_DIST = ScreenSavers hacks.pot EXTRA_DIST = ScreenSavers hacks.pot

@ -1,7 +1,7 @@
AM_CPPFLAGS = -UQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE AM_CPPFLAGS = -UQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
INCLUDES = $(all_includes) $(GLINC) 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 if COMPILE_GL_XSAVERS
GL_XSAVERS=kspace.kss GL_XSAVERS=kspace.kss

Loading…
Cancel
Save