diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-08-12 11:34:39 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-12 11:34:39 +0200 |
| commit | d388dc54bbd88929907a71f9fc70ee0486cc99c1 (patch) | |
| tree | 45f3e7fc567d30b1f8bd291b559a2786adfb9da6 | |
| parent | 5ac0bbacaf0ad76cbc65972df498b2f1789cc0f5 (diff) | |
| download | koffice-d388dc54.tar.gz koffice-d388dc54.zip | |
Update autotools for new DSO linkage style
Thanks to Francois Andriot for the patch
| -rw-r--r-- | kpresenter/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/kofficecore/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/koproperty/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/kwmf/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/store/Makefile.am | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kpresenter/Makefile.am b/kpresenter/Makefile.am index 69f5b188..e24036b2 100644 --- a/kpresenter/Makefile.am +++ b/kpresenter/Makefile.am @@ -72,7 +72,7 @@ libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefin if include_ARTS ARTSKDE = -lartskde endif -libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE) +libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE) -lsoundserver_idl -lmcop ## The part kde_module_LTLIBRARIES = libkpresenterpart.la diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am index 681995b7..477fbe3b 100644 --- a/lib/kofficecore/Makefile.am +++ b/lib/kofficecore/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = . tests KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL) INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes) libkofficecore_la_LIBADD = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \ - $(LIB_TDEPRINT) $(LIB_KABC) $(LIB_KWMF) + $(LIB_TDEPRINT) $(LIB_KABC) $(LIB_KWMF) -lDCOP ####### Files diff --git a/lib/koproperty/Makefile.am b/lib/koproperty/Makefile.am index 90ead373..b36742ba 100644 --- a/lib/koproperty/Makefile.am +++ b/lib/koproperty/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/editors -I$(top_srcdir)/lib/kofficecore $(all_includes) lib_LTLIBRARIES = libkoproperty.la -libkoproperty_la_LIBADD = $(LIB_TDEUI) ./editors/libkopropertyeditors.la +libkoproperty_la_LIBADD = $(LIB_TDEUI) ./editors/libkopropertyeditors.la $(LIB_QT) $(LIB_TDECORE) libkoproperty_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 2:0:0 libkoproperty_la_SOURCES = property.cpp customproperty.cpp set.cpp editor.cpp \ editoritem.cpp factory.cpp widget.cpp diff --git a/lib/kwmf/Makefile.am b/lib/kwmf/Makefile.am index 4387792f..51bb4e26 100644 --- a/lib/kwmf/Makefile.am +++ b/lib/kwmf/Makefile.am @@ -3,7 +3,7 @@ INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes) libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined # We use tdecore for kdDebug :) -libkwmf_la_LIBADD = $(LIB_TDECORE) +libkwmf_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) ####### Files @@ -16,4 +16,4 @@ noinst_HEADERS = kwmf.h qwmf.h metafuncs.h wmfstruct.h kowmfreadprivate.h kowmfs libkowmf_la_SOURCES = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0 -no-undefined -libkowmf_la_LIBADD = $(LIB_TDECORE) +libkowmf_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) diff --git a/lib/store/Makefile.am b/lib/store/Makefile.am index ac6d5478..e1eb1402 100644 --- a/lib/store/Makefile.am +++ b/lib/store/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = $(KOFFICECORE_INCLUDES) $(all_includes) ####### Files -libkstore_la_LIBADD = $(LIB_KIO) +libkstore_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h |