Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent f96e42380a
commit 8b44021a88

@ -16,7 +16,7 @@ noinst_HEADERS = latexexport.h
#check_PROGRAMS = texlauncher #check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc #texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la #texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries) #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -16,7 +16,7 @@ noinst_HEADERS = pngexport.h pngexportdia.h
#check_PROGRAMS = texlauncher #check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc #texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la #texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries) #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -16,7 +16,7 @@ noinst_HEADERS = svgexport.h
#check_PROGRAMS = texlauncher #check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc #texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la #texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries) #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -22,7 +22,7 @@ noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \
#check_PROGRAMS = texlauncher #check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc #texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la #texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries) #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -20,7 +20,7 @@ libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc file
#check_PROGRAMS = texlauncher #check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc #texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la #texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries) #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -19,7 +19,7 @@ noinst_HEADERS = config.h lateximport.h lateximportdia.h
#check_PROGRAMS = texlauncher #check_PROGRAMS = texlauncher
#texlauncher_SOURCES = texlauncher.cc #texlauncher_SOURCES = texlauncher.cc
#texlauncher_LDADD = liblatexexport.la #texlauncher_LDADD = liblatexexport.la
#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries) #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -25,7 +25,7 @@ texscaner.cc: $(srcdir)/texscaner.y
check_PROGRAMS = texlauncher check_PROGRAMS = texlauncher
texlauncher_SOURCES = texlauncher.cc texlauncher_SOURCES = texlauncher.cc
texlauncher_LDADD = liblatexexport.la texlauncher_LDADD = liblatexexport.la
texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries) texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/core \ -I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/core \
-I$(top_srcdir)/lib -I$(top_srcdir)/lib/kofficecore $(all_includes) -I$(top_srcdir)/lib -I$(top_srcdir)/lib/kofficecore $(all_includes)
kformdesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la

@ -53,5 +53,5 @@ keximigratetest_LDADD = libkeximigrate.la \
$(top_builddir)/kexi/main/libkeximain.la \ $(top_builddir)/kexi/main/libkeximain.la \
$(LIB_QT) $(LIB_KDECORE) $(LIB_QT) $(LIB_KDECORE)
keximigratetest_LDFLAGS = $(KDE_RPATH) $(all_libraries) keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor

@ -7,12 +7,12 @@ endif
bin_PROGRAMS = komacrotest $(GUIBINPROGRAM) bin_PROGRAMS = komacrotest $(GUIBINPROGRAM)
komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
komacrotest_LDFLAGS = $(KDE_RPATH) $(all_libraries) komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS) komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS)
if include_kunittestgui if include_kunittestgui
komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
komacrotestgui_LDFLAGS = $(KDE_RPATH) $(all_libraries) komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS) komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS)
endif endif

@ -18,5 +18,5 @@ kexialtertabletest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/
$(top_builddir)/kexi/main/libkeximain.la \ $(top_builddir)/kexi/main/libkeximain.la \
$(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor

@ -19,14 +19,14 @@ kexidbtest_SOURCES = main.cpp
kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
../../kexidb/parser/libkexidbparser.la \ ../../kexidb/parser/libkexidbparser.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
#kexidbmysqlcursor_SOURCES = mysqlcursor.cpp #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp
#kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ #kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
# ../../kexidb/parser/libkexidbparser.la # ../../kexidb/parser/libkexidbparser.la
#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) #kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
#kexidbfirebirdcursor_SOURCES = firebirdcursor.cpp #kexidbfirebirdcursor_SOURCES = firebirdcursor.cpp
#kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la #kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la
#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) #kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor

@ -8,7 +8,7 @@ kexidbdrivercombotest_SOURCES = kexidbdrivercombotest.cpp
kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_KDECORE) \ kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_KDECORE) \
$(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/kexidb/libkexidb.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -6,7 +6,7 @@ METASOURCES = AUTO
noinst_PROGRAMS = propertytest noinst_PROGRAMS = propertytest
propertytest_SOURCES = main.cpp test.cpp propertytest_SOURCES = main.cpp test.cpp
propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
propertytest_LDADD = $(LIB_KOPROPERTY) propertytest_LDADD = $(LIB_KOPROPERTY)
# this is where the shell's XML-GUI resource file goes # this is where the shell's XML-GUI resource file goes

@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest
kohyphentest_SOURCES = kohyphentest.cpp kohyphentest_SOURCES = kohyphentest.cpp
kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_KDECORE) kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_KDECORE)
kohyphentest_LDFLAGS = $(KDE_RPATH) $(all_libraries) kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor

@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest
TESTS = kotextformattertest kovariabletest TESTS = kotextformattertest kovariabletest
LDADD = ../libkotext.la LDADD = ../libkotext.la
AM_LDFLAGS = $(KDE_RPATH) $(all_libraries) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kobordertest_SOURCES = kobordertest.cpp kobordertest_SOURCES = kobordertest.cpp
kotextformattertest_SOURCES = kotextformattertest.cpp kotextformattertest_SOURCES = kotextformattertest.cpp

@ -6,6 +6,6 @@ bin_PROGRAMS = krossrunner
krossrunner_SOURCES = main.cpp krossrunner_SOURCES = main.cpp
krossrunner_LDADD = $(LIB_QT) $(LIB_KDECORE) ../api/libkrossapi.la ../main/libkrossmain.la krossrunner_LDADD = $(LIB_QT) $(LIB_KDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
INCLUDES = $(KROSS_INCLUDES) $(all_includes) INCLUDES = $(KROSS_INCLUDES) $(all_includes)
krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
SUBDIRS = . SUBDIRS = .
METASOURCES = AUTO METASOURCES = AUTO

@ -12,6 +12,6 @@ krosstest_LDADD = \
../main/libkrossmain.la ../main/libkrossmain.la
INCLUDES = $(KROSS_INCLUDES) $(all_includes) INCLUDES = $(KROSS_INCLUDES) $(all_includes)
krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
SUBDIRS = . SUBDIRS = .
METASOURCES = AUTO METASOURCES = AUTO

@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
bin_PROGRAMS = koconverter bin_PROGRAMS = koconverter
koconverter_SOURCES = koconverter.cpp koconverter_SOURCES = koconverter.cpp
koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la
METASOURCES = AUTO METASOURCES = AUTO

Loading…
Cancel
Save