Update autotools for new DSO linkage style

Thanks to Francois Andriot for the patch
(cherry picked from commit 50ec787fcf)
v3.5.13-sru
Slávek Banko 12 years ago
parent 7d7c5d1dc6
commit 5bfe96ba7e

@ -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_KDECORE) $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_KUTILS) $(LIB_KDEPRINT) -lDCOP -lkdefx
KDE_OPTIONS = qtonly nofinal

@ -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_KDEPRINT) $(GLLIB)
libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -lkdefx
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 \

@ -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_KDECORE) $(LIB_KDEUI) -lDCOP
libkdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0
xpart_DIR=$(srcdir)/../interfaces

Loading…
Cancel
Save