summaryrefslogtreecommitdiffstats
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
commit98909bff33122d6b2c43c219450f93f8a3daa39e (patch)
treedf2aa0aa6f1435fcefca2c154825fd3561bbf62f
parent17991a4623884b2fed475724124aae541ea10040 (diff)
downloadtdegraphics-98909bff33122d6b2c43c219450f93f8a3daa39e.tar.gz
tdegraphics-98909bff33122d6b2c43c219450f93f8a3daa39e.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/kdegraphics@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kcoloredit/Makefile.am4
-rw-r--r--kdvi/Makefile.am2
-rw-r--r--kfax/Makefile.am2
-rw-r--r--kfaxview/Makefile.am2
-rw-r--r--kghostview/Makefile.am2
-rw-r--r--kiconedit/Makefile.am2
-rw-r--r--kolourpaint/Makefile.am2
-rw-r--r--kooka/Makefile.am2
-rw-r--r--kpdf/shell/Makefile.am2
-rw-r--r--kpovmodeler/Makefile.am2
-rw-r--r--kruler/Makefile.am2
-rw-r--r--ksnapshot/Makefile.am2
-rw-r--r--ksvg/test/external/Makefile.am4
-rw-r--r--kview/kviewcanvas/test/Makefile.am2
-rw-r--r--kview/kviewviewer/test/Makefile.am2
-rw-r--r--kviewshell/Makefile.am2
16 files changed, 18 insertions, 18 deletions
diff --git a/kcoloredit/Makefile.am b/kcoloredit/Makefile.am
index 1f377635..a5df457b 100644
--- a/kcoloredit/Makefile.am
+++ b/kcoloredit/Makefile.am
@@ -7,7 +7,7 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \
kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
kcoloredit_METASOURCES = AUTO
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
rc_DATA = kcoloreditui.rc
@@ -15,7 +15,7 @@ rc_DATA = kcoloreditui.rc
bin_PROGRAMS = kcoloredit kcolorchooser
kcolorchooser_SOURCES = kcolorchooser.cpp
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 \
gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \
diff --git a/kdvi/Makefile.am b/kdvi/Makefile.am
index 20ec2862..9a3d8ede 100644
--- a/kdvi/Makefile.am
+++ b/kdvi/Makefile.am
@@ -39,7 +39,7 @@ squeeze_SOURCES = squeeze.c
KDE_OPTIONS = nofinal
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
## this option you can leave out. Just, if you use "make dist", you need it
diff --git a/kfax/Makefile.am b/kfax/Makefile.am
index fd3e478c..5981250e 100644
--- a/kfax/Makefile.am
+++ b/kfax/Makefile.am
@@ -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
INCLUDES = $(all_includes)
diff --git a/kfaxview/Makefile.am b/kfaxview/Makefile.am
index 669fcd9b..f0cfb19a 100644
--- a/kfaxview/Makefile.am
+++ b/kfaxview/Makefile.am
@@ -12,7 +12,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kfaxview
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
# this is where the desktop file will go
diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am
index e087a0f0..500d290e 100644
--- a/kghostview/Makefile.am
+++ b/kghostview/Makefile.am
@@ -28,7 +28,7 @@ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
libkghostviewpart_la_SOURCES = part_init.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
libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
diff --git a/kiconedit/Makefile.am b/kiconedit/Makefile.am
index c2536935..b0ec8a42 100644
--- a/kiconedit/Makefile.am
+++ b/kiconedit/Makefile.am
@@ -11,7 +11,7 @@ kiconedit_SOURCES = utils.cpp main.cpp kiconedit.cpp kicongrid.cpp \
kiconedit_METASOURCES = AUTO
# 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
DISTCLEANFILES = *~ .deps/* .libs/*
diff --git a/kolourpaint/Makefile.am b/kolourpaint/Makefile.am
index 35da2859..a8045c5c 100644
--- a/kolourpaint/Makefile.am
+++ b/kolourpaint/Makefile.am
@@ -39,7 +39,7 @@ kolourpaint_SOURCES = kolourpaint.cpp \
kpviewmanager.cpp \
kpviewscrollablecontainer.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) \
cursors/libkolourpaintcursors.la \
pixmapfx/libkolourpaintpixmapfx.la \
diff --git a/kooka/Makefile.am b/kooka/Makefile.am
index 6fec098e..ec4adf29 100644
--- a/kooka/Makefile.am
+++ b/kooka/Makefile.am
@@ -17,7 +17,7 @@ kooka_SOURCES = main.cpp kooka.cpp kookaview.cpp kookapref.cpp \
# pagesetup.cpp
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)
diff --git a/kpdf/shell/Makefile.am b/kpdf/shell/Makefile.am
index e8416ef1..d5fcc83f 100644
--- a/kpdf/shell/Makefile.am
+++ b/kpdf/shell/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kpdf
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)
EXTRA_DIST = kpdf.desktop
diff --git a/kpovmodeler/Makefile.am b/kpovmodeler/Makefile.am
index 4e1f3ef9..717b80b3 100644
--- a/kpovmodeler/Makefile.am
+++ b/kpovmodeler/Makefile.am
@@ -227,7 +227,7 @@ libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
bin_PROGRAMS = kpovmodeler
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
dummy.cpp:
diff --git a/kruler/Makefile.am b/kruler/Makefile.am
index d2b8f278..cf12df74 100644
--- a/kruler/Makefile.am
+++ b/kruler/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = kruler
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_SOURCES = klineal.cpp main.cpp
diff --git a/ksnapshot/Makefile.am b/ksnapshot/Makefile.am
index a9dae435..26707695 100644
--- a/ksnapshot/Makefile.am
+++ b/ksnapshot/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS= ksnapshot
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_SOURCES = ksnapshotiface.skel main.cpp ksnapshot.cpp \
diff --git a/ksvg/test/external/Makefile.am b/ksvg/test/external/Makefile.am
index 77f763ac..3b7530c7 100644
--- a/ksvg/test/external/Makefile.am
+++ b/ksvg/test/external/Makefile.am
@@ -6,8 +6,8 @@ bin_PROGRAMS = svgdisplay printnodetest
svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc
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_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
diff --git a/kview/kviewcanvas/test/Makefile.am b/kview/kviewcanvas/test/Makefile.am
index 1fc3e92c..7188a518 100644
--- a/kview/kviewcanvas/test/Makefile.am
+++ b/kview/kviewcanvas/test/Makefile.am
@@ -5,5 +5,5 @@ METASOURCES = AUTO
check_PROGRAMS = test
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
diff --git a/kview/kviewviewer/test/Makefile.am b/kview/kviewviewer/test/Makefile.am
index 605435cc..688efb30 100644
--- a/kview/kviewviewer/test/Makefile.am
+++ b/kview/kviewviewer/test/Makefile.am
@@ -5,5 +5,5 @@ METASOURCES = AUTO
check_PROGRAMS = test
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)
diff --git a/kviewshell/Makefile.am b/kviewshell/Makefile.am
index ccde5b59..3cf71a7b 100644
--- a/kviewshell/Makefile.am
+++ b/kviewshell/Makefile.am
@@ -39,7 +39,7 @@ emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la
libkviewshell_la_SOURCES = kviewshell.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
kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \