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 | 53775b8225e93598c923ba60d3770dcb5c9a2323 (patch) | |
tree | 4dacefcce3c453486f9b465e0c303c9ae006e6c0 | |
parent | 3aba493dc987d45b85edf82ec919980465a9b4ba (diff) | |
download | tdeaddons-53775b8225e93598c923ba60d3770dcb5c9a2323.tar.gz tdeaddons-53775b8225e93598c923ba60d3770dcb5c9a2323.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/kdeaddons@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r-- | atlantikdesigner/Makefile.am | 2 | ||||
-rw-r--r-- | atlantikdesigner/designer/Makefile.am | 2 | ||||
-rw-r--r-- | kfile-plugins/lnk/Makefile.am | 2 | ||||
-rw-r--r-- | konq-plugins/fsview/Makefile.am | 4 | ||||
-rw-r--r-- | ksig/Makefile.am | 2 | ||||
-rw-r--r-- | noatun-plugins/synaescope/Makefile.am | 2 | ||||
-rw-r--r-- | noatun-plugins/tippercanoe/Makefile.am | 2 | ||||
-rw-r--r-- | noatun-plugins/tyler/Makefile.am | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/atlantikdesigner/Makefile.am b/atlantikdesigner/Makefile.am index 1c6ba3d..886daf5 100644 --- a/atlantikdesigner/Makefile.am +++ b/atlantikdesigner/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -LDFLAGS = $(all_libraries) $(KDE_RPATH) +LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor LDADD = $(LIB_KSYCOCA) $(LIB_KFILE) SUBDIRS = designer pics diff --git a/atlantikdesigner/designer/Makefile.am b/atlantikdesigner/designer/Makefile.am index de53920..885a941 100644 --- a/atlantikdesigner/designer/Makefile.am +++ b/atlantikdesigner/designer/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = atlantikdesigner INCLUDES = -I$(kde_includes)/atlantic $(all_includes) -I$(kde_includes)/kde -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor LDADD = -latlantikui -lkdegames $(LIB_KIO) SUBDIRS = diff --git a/kfile-plugins/lnk/Makefile.am b/kfile-plugins/lnk/Makefile.am index 9d97978..a892327 100644 --- a/kfile-plugins/lnk/Makefile.am +++ b/kfile-plugins/lnk/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = lnkforward lnkforward_SOURCES = lnkforward.cpp lnkforward_LDADD = $(LIB_KDECORE) $(LIB_KIO) -lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH) +lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor lnkforward_METASOURCES = lnkforward.moc lnkforward_DATA = lnkforward.desktop diff --git a/konq-plugins/fsview/Makefile.am b/konq-plugins/fsview/Makefile.am index a400096..0d0e0e0 100644 --- a/konq-plugins/fsview/Makefile.am +++ b/konq-plugins/fsview/Makefile.am @@ -24,13 +24,13 @@ libfsview_la_SOURCES = treemap.cpp fsview.cpp scan.cpp inode.cpp bin_PROGRAMS = fsview -fsview_LDFLAGS = $(all_libraries) $(KDE_RPATH) +fsview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor fsview_SOURCES = main.cpp fsview_LDADD = libfsview.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT) check_PROGRAMS = scantest -scantest_LDFLAGS = $(all_libraries) $(KDE_RPATH) +scantest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor scantest_SOURCES = scantest.cpp scantest_LDADD = libfsview.la $(LIB_KIO) $(LIB_KDECORE) $(LIB_QT) diff --git a/ksig/Makefile.am b/ksig/Makefile.am index 733e65c..90452b8 100644 --- a/ksig/Makefile.am +++ b/ksig/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO KDE_ICON = AUTO -ksig_LDFLAGS = $(all_libraries) $(KDE_RPATH) +ksig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ksig_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) rcdir = $(kde_datadir)/ksig diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am index d49c733..d64a464 100644 --- a/noatun-plugins/synaescope/Makefile.am +++ b/noatun-plugins/synaescope/Makefile.am @@ -11,7 +11,7 @@ noatunsynaescope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm bin_PROGRAMS = noatunsynaescope.bin noatunsynaescope_bin_SOURCES = core.cpp main.cpp sdlwrap.cpp ui.cpp -noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) +noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor noatunsynaescope_bin_LDADD = $(LIB_KDEUI) -lnoatun $(SDL_LIBS) noatun_DATA = synaescope.plugin diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am index 4a673cd..64a327f 100644 --- a/noatun-plugins/tippercanoe/Makefile.am +++ b/noatun-plugins/tippercanoe/Makefile.am @@ -11,7 +11,7 @@ noatuntippecanoe_la_LIBADD = $(LIB_KFILE) -lnoatun -lm bin_PROGRAMS = noatuntippecanoe.bin noatuntippecanoe_bin_SOURCES = core.cpp main.cpp ui.cpp sdlwrap.cpp -noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) +noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor noatuntippecanoe_bin_LDADD = $(LIB_KDEUI) -lm $(SDL_LIBS) noatun_DATA = tippecanoe.plugin diff --git a/noatun-plugins/tyler/Makefile.am b/noatun-plugins/tyler/Makefile.am index c243d68..80b31cb 100644 --- a/noatun-plugins/tyler/Makefile.am +++ b/noatun-plugins/tyler/Makefile.am @@ -11,7 +11,7 @@ noatuntyler_la_LIBADD = $(LIB_KFILE) -lnoatun -lm bin_PROGRAMS = noatuntyler.bin noatuntyler_bin_SOURCES = main.cpp file.cpp compute.c display.c renderer.c -noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) +noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor noatuntyler_bin_LDADD = $(LIB_KDECORE) -lm $(SDL_LIBS) noatun_DATA = tyler.plugin tylerstates |