From 50ec787fcf438005acd4db51ca10bc9b25df35af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 7 Aug 2012 01:46:08 +0200 Subject: [PATCH] Update autotools for new DSO linkage style Thanks to Francois Andriot for the patch --- kdejava/koala/kdejava/Makefile.am | 2 +- smoke/kde/Makefile.am | 2 +- xparts/src/kde/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kdejava/koala/kdejava/Makefile.am b/kdejava/koala/kdejava/Makefile.am index d7fca3e0..b6b617a4 100644 --- a/kdejava/koala/kdejava/Makefile.am +++ b/kdejava/koala/kdejava/Makefile.am @@ -33,6 +33,6 @@ noinst_HEADERS = KDESupport.h KDEJavaSlot.h libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) -libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) +libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) $(LIB_TDECORE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_TDEPRINT) -lDCOP -ltdefx KDE_OPTIONS = qtonly nofinal diff --git a/smoke/kde/Makefile.am b/smoke/kde/Makefile.am index ed7a1d8f..d6034d66 100644 --- a/smoke/kde/Makefile.am +++ b/smoke/kde/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH) # the libraries to link against. -libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) +libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -ltdefx x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \ x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \ diff --git a/xparts/src/kde/Makefile.am b/xparts/src/kde/Makefile.am index acdfff7f..48e2e15d 100644 --- a/xparts/src/kde/Makefile.am +++ b/xparts/src/kde/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libkdexparts.la libkdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \ kbrowsersignals.cpp xbrowsersignals.skel xbrowserextension.stub -libkdexparts_la_LIBADD = $(LIB_KPARTS) +libkdexparts_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP libkdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0 xpart_DIR=$(srcdir)/../interfaces