diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-08-05 19:52:34 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-05 19:59:24 +0200 |
| commit | 095caa205c6827d024d6313c2c6b5851c1c40887 (patch) | |
| tree | a712e543cdad72ad825fa2fd6f3b2d07a8599b32 | |
| parent | a30de704f1cf6e764fb23e0ca948564e8815fa25 (diff) | |
| download | tdeutils-095caa205c6827d024d6313c2c6b5851c1c40887.tar.gz tdeutils-095caa205c6827d024d6313c2c6b5851c1c40887.zip | |
Update autotools for new DSO linkage style
Thanks to Francois Andriot for the patch
(cherry picked from commit 81a4c1343ffa5263bdca48d8166dba688f3b8651)
| -rw-r--r-- | kcalc/Makefile.am | 2 | ||||
| -rw-r--r-- | kedit/Makefile.am | 2 | ||||
| -rw-r--r-- | khexedit/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | kregexpeditor/Makefile.am | 2 | ||||
| -rw-r--r-- | ksim/library/Makefile.am | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kcalc/Makefile.am b/kcalc/Makefile.am index 551d7d4..ad96dde 100644 --- a/kcalc/Makefile.am +++ b/kcalc/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = kcalc.h kcalc_button.h kcalc_const_button.h \ kcalctype.h dlabel.h stats.h kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version -kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la +kcalc_la_LIBADD = $(LIB_KDEUI) knumber/libknumber.la $(LIB_QT) $(LIB_KDECORE) KDE_ICON = kcalc diff --git a/kedit/Makefile.am b/kedit/Makefile.am index 6870eb6..4cdba6a 100644 --- a/kedit/Makefile.am +++ b/kedit/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = kdeinit_LTLIBRARIES = kedit.la kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp misc.ui color.ui prefs.kcfgc -kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) +kedit_la_LIBADD = -lkdeprint $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) kedit_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) noinst_HEADERS = kedit.h ktextfiledlg.h\ diff --git a/khexedit/lib/Makefile.am b/khexedit/lib/Makefile.am index c0c92cc..4c494f4 100644 --- a/khexedit/lib/Makefile.am +++ b/khexedit/lib/Makefile.am @@ -7,7 +7,7 @@ METASOURCES = AUTO # this library is used by the kbytesedit part and the khepart part lib_LTLIBRARIES = libkhexeditcommon.la libkhexeditcommon_la_LDFLAGS = $(all_libraries) -no-undefined -libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE) +libkhexeditcommon_la_LIBADD = controller/libkcontroller.la codecs/libkhecodecs.la $(LIB_KDECORE) $(LIB_QT) libkhexeditcommon_la_SOURCES = kcolumn.cpp kbordercolumn.cpp koffsetcolumn.cpp \ kbuffercolumn.cpp kvaluecolumn.cpp kcharcolumn.cpp \ kcolumnsview.cpp khexedit.cpp kbytesedit.cpp \ diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am index 9a12b31..be379e8 100644 --- a/kregexpeditor/Makefile.am +++ b/kregexpeditor/Makefile.am @@ -29,7 +29,7 @@ libkregexpeditorcommon_la_SOURCES = \ libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \ - KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) + KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) METASOURCES = AUTO diff --git a/ksim/library/Makefile.am b/ksim/library/Makefile.am index f3b834f..1c9cc24 100644 --- a/ksim/library/Makefile.am +++ b/ksim/library/Makefile.am @@ -7,7 +7,7 @@ libksimcore_la_SOURCES = common.cpp themeloader.cpp \ pluginmodule.cpp ksimconfig.cpp libksimcore_la_LDFLAGS = $(all_libraries) -version-info 1:0 -no-undefined -libksimcore_la_LIBADD = $(LIB_KDEUI) +libksimcore_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lkdefx ksiminclude_HEADERS = common.h themeloader.h \ chart.h label.h \ |