From 2b25aaa07faf2c2959f89188d3972663c1aa6ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 6 Aug 2012 20:49:31 +0200 Subject: [PATCH] Update autotools for new DSO linkage style Thanks to Francois Andriot for the patch --- kiten/Makefile.am | 2 +- kvoctrain/kvoctrain/kvt-core/Makefile.am | 2 +- libtdeedu/extdate/Makefile.am | 2 +- libtdeedu/tdeeducore/Makefile.am | 2 +- libtdeedu/tdeeduui/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kiten/Makefile.am b/kiten/Makefile.am index 1768b5d7..d96a4ebb 100644 --- a/kiten/Makefile.am +++ b/kiten/Makefile.am @@ -13,7 +13,7 @@ bin_PROGRAMS = kiten kitengen lib_LTLIBRARIES = libkiten.la libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0 -libkiten_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPRINT) +libkiten_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_TDECORE) libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \ deinf.cpp kitenconfig.kcfgc diff --git a/kvoctrain/kvoctrain/kvt-core/Makefile.am b/kvoctrain/kvoctrain/kvt-core/Makefile.am index fe356907..70f055b6 100644 --- a/kvoctrain/kvoctrain/kvt-core/Makefile.am +++ b/kvoctrain/kvoctrain/kvt-core/Makefile.am @@ -12,6 +12,6 @@ libkvoctraincore_la_SOURCES = langset.cpp LineList.cpp kvoctrainexpr.cpp \ SUBDIRS = kvt-xml -libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la +libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI) -lDCOP noinst_HEADERS = grammarmanager.h diff --git a/libtdeedu/extdate/Makefile.am b/libtdeedu/extdate/Makefile.am index f02c4924..a877a28e 100644 --- a/libtdeedu/extdate/Makefile.am +++ b/libtdeedu/extdate/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = libextdate.la libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 -libextdate_la_LIBADD = $(LIB_TDEUI) +libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) test_extdate_SOURCES = test_extdate.cc test_extdate_LDADD = libextdate.la diff --git a/libtdeedu/tdeeducore/Makefile.am b/libtdeedu/tdeeducore/Makefile.am index 70907966..856037fd 100644 --- a/libtdeedu/tdeeducore/Makefile.am +++ b/libtdeedu/tdeeducore/Makefile.am @@ -11,7 +11,7 @@ libtdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 libtdeeducode_includedir = $(includedir)/libtdeedu libtdeeducode_include_HEADERS = keduvocdata.h -libtdeeducore_la_LIBADD = $(LIB_TDECORE) +libtdeeducore_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) METASOURCES = AUTO diff --git a/libtdeedu/tdeeduui/Makefile.am b/libtdeedu/tdeeduui/Makefile.am index 9ebedbab..c0863828 100644 --- a/libtdeedu/tdeeduui/Makefile.am +++ b/libtdeedu/tdeeduui/Makefile.am @@ -10,7 +10,7 @@ libtdeeduuiincludedir = $(includedir)/libtdeedu libtdeeduuiinclude_HEADERS = tdeeduglossary.h libtdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0 -libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI) $(LIB_KHTML) +libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_QT) METASOURCES = AUTO