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/kdegraphics@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 17991a4623
commit 98909bff33

@ -7,7 +7,7 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \
kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
kcoloredit_METASOURCES = AUTO kcoloredit_METASOURCES = AUTO
kcoloredit_LDADD = $(LIB_KDEUI) $(LIB_KFILE) kcoloredit_LDADD = $(LIB_KDEUI) $(LIB_KFILE)
kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
rcdir = $(kde_datadir)/kcoloredit rcdir = $(kde_datadir)/kcoloredit
rc_DATA = kcoloreditui.rc rc_DATA = kcoloreditui.rc
@ -15,7 +15,7 @@ rc_DATA = kcoloreditui.rc
bin_PROGRAMS = kcoloredit kcolorchooser bin_PROGRAMS = kcoloredit kcolorchooser
kcolorchooser_SOURCES = kcolorchooser.cpp kcolorchooser_SOURCES = kcolorchooser.cpp
kcolorchooser_LDADD = $(LIB_KDEUI) kcolorchooser_LDADD = $(LIB_KDEUI)
kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \ noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \
gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \ gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \

@ -39,7 +39,7 @@ squeeze_SOURCES = squeeze.c
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal
kdvi_SOURCES = main.cpp kdvi_SOURCES = main.cpp
kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts
## this option you can leave out. Just, if you use "make dist", you need it ## this option you can leave out. Just, if you use "make dist", you need it

@ -1,4 +1,4 @@
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lm LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lm
INCLUDES = $(all_includes) INCLUDES = $(all_includes)

@ -12,7 +12,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kfaxview bin_PROGRAMS = kfaxview
kfaxview_SOURCES = main.cpp kfaxview_SOURCES = main.cpp
kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts
# this is where the desktop file will go # this is where the desktop file will go

@ -28,7 +28,7 @@ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
libkghostviewpart_la_SOURCES = part_init.cpp libkghostviewpart_la_SOURCES = part_init.cpp
kghostview_SOURCES = main.cpp kghostview_SOURCES = main.cpp
kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kghostview_LDADD = libkghostviewlib.la kghostview_LDADD = libkghostviewlib.la
libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined

@ -11,7 +11,7 @@ kiconedit_SOURCES = utils.cpp main.cpp kiconedit.cpp kicongrid.cpp \
kiconedit_METASOURCES = AUTO kiconedit_METASOURCES = AUTO
# the library search path. # the library search path.
kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kiconedit_LDADD = $(LIB_KFILE) -lkdeprint kiconedit_LDADD = $(LIB_KFILE) -lkdeprint
DISTCLEANFILES = *~ .deps/* .libs/* DISTCLEANFILES = *~ .deps/* .libs/*

@ -39,7 +39,7 @@ kolourpaint_SOURCES = kolourpaint.cpp \
kpviewmanager.cpp \ kpviewmanager.cpp \
kpviewscrollablecontainer.cpp \ kpviewscrollablecontainer.cpp \
kpwidgetmapper.cpp kpwidgetmapper.cpp
kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kolourpaint_LDADD = $(LIB_KDEPRINT) \ kolourpaint_LDADD = $(LIB_KDEPRINT) \
cursors/libkolourpaintcursors.la \ cursors/libkolourpaintcursors.la \
pixmapfx/libkolourpaintpixmapfx.la \ pixmapfx/libkolourpaintpixmapfx.la \

@ -17,7 +17,7 @@ kooka_SOURCES = main.cpp kooka.cpp kookaview.cpp kookapref.cpp \
# pagesetup.cpp # pagesetup.cpp
kooka_LDADD = $(LIB_KFILE) -lkdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL) kooka_LDADD = $(LIB_KFILE) -lkdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
kooka_LDFLAGS = $(KDE_RPATH) $(all_libraries) kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
INCLUDES = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC) INCLUDES = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)

@ -5,7 +5,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kpdf bin_PROGRAMS = kpdf
kpdf_SOURCES = main.cpp shell.cpp kpdf_SOURCES = main.cpp shell.cpp
kpdf_LDFLAGS = $(KDE_RPATH) $(all_libraries) kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kpdf_LDADD = $(LIB_KPARTS) kpdf_LDADD = $(LIB_KPARTS)
EXTRA_DIST = kpdf.desktop EXTRA_DIST = kpdf.desktop

@ -227,7 +227,7 @@ libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
bin_PROGRAMS = kpovmodeler bin_PROGRAMS = kpovmodeler
kpovmodeler_SOURCES = main.cpp kpovmodeler_SOURCES = main.cpp
kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kpovmodeler_LDADD = libkpovmodeler.la kpovmodeler_LDADD = libkpovmodeler.la
dummy.cpp: dummy.cpp:

@ -4,7 +4,7 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = kruler bin_PROGRAMS = kruler
kruler_METASOURCES = AUTO kruler_METASOURCES = AUTO
kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kruler_LDADD = $(LIB_KDEUI) kruler_LDADD = $(LIB_KDEUI)
kruler_SOURCES = klineal.cpp main.cpp kruler_SOURCES = klineal.cpp main.cpp

@ -2,7 +2,7 @@ bin_PROGRAMS= ksnapshot
INCLUDES = -DKSNAPVERSION="\"0.7\"" $(all_includes) INCLUDES = -DKSNAPVERSION="\"0.7\"" $(all_includes)
ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
ksnapshot_LDADD = $(LIB_KDEPRINT) ksnapshot_LDADD = $(LIB_KDEPRINT)
ksnapshot_SOURCES = ksnapshotiface.skel main.cpp ksnapshot.cpp \ ksnapshot_SOURCES = ksnapshotiface.skel main.cpp ksnapshot.cpp \

@ -6,8 +6,8 @@ bin_PROGRAMS = svgdisplay printnodetest
svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc
svgdisplay_LDADD = $(LIB_KDECORE) ../../libksvg.la svgdisplay_LDADD = $(LIB_KDECORE) ../../libksvg.la
svgdisplay_LDFLAGS = $(KDE_RPATH) $(all_libraries) svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
printnodetest_SOURCES = printnodetest.cpp printnodetest_SOURCES = printnodetest.cpp
printnodetest_LDADD = $(LIB_KDECORE) ../../libksvg.la printnodetest_LDADD = $(LIB_KDECORE) ../../libksvg.la
printnodetest_LDFLAGS = $(KDE_RPATH) $(all_libraries) printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor

@ -5,5 +5,5 @@ METASOURCES = AUTO
check_PROGRAMS = test check_PROGRAMS = test
test_SOURCES = main.cpp test.cpp test_SOURCES = main.cpp test.cpp
test_LDFLAGS = $(KDE_RPATH) $(all_libraries) test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
test_LDADD = $(LIB_KPARTS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la test_LDADD = $(LIB_KPARTS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la

@ -5,5 +5,5 @@ METASOURCES = AUTO
check_PROGRAMS = test check_PROGRAMS = test
test_SOURCES = main.cpp test.cpp test_SOURCES = main.cpp test.cpp
test_LDFLAGS = $(KDE_RPATH) $(all_libraries) test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
test_LDADD = $(LIB_KPARTS) test_LDADD = $(LIB_KPARTS)

@ -39,7 +39,7 @@ emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la
libkviewshell_la_SOURCES = kviewshell.cpp libkviewshell_la_SOURCES = kviewshell.cpp
kviewshell_SOURCES = main.cpp kviewshell_SOURCES = main.cpp
kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kviewshell_LDADD = libkviewshell.la ./libifaces.la -lkparts kviewshell_LDADD = libkviewshell.la ./libifaces.la -lkparts
kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \ kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \

Loading…
Cancel
Save