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/kdewebdev@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent e7d485fd09
commit 042dc76a36

@ -7,7 +7,7 @@ bin_PROGRAMS = kmdr-editor
AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/widgets -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory -Ishared -Iinterfaces -Ipics $(all_includes) AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/widgets -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory -Ishared -Iinterfaces -Ipics $(all_includes)
# the library search path. # the library search path.
kmdr_editor_LDFLAGS = $(KDE_RPATH) $(all_libraries) kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
# the libraries to link against. # the libraries to link against.
kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \ kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \

@ -20,6 +20,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/widgets
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = dcopkommanderif.h noinst_HEADERS = dcopkommanderif.h

@ -13,6 +13,6 @@ INCLUDES = -I$(top_srcdir)/kommander/factory $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the library search path. # the library search path.
kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = mainwindow.h pluginmanager.h noinst_HEADERS = mainwindow.h pluginmanager.h

@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkommanderwidgets.la
INCLUDES = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/factory -I$(top_srcdir)/kommander/plugin $(all_includes) INCLUDES = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/factory -I$(top_srcdir)/kommander/plugin $(all_includes)
# the library search path. # the library search path.
#widgets_LDFLAGS = $(KDE_RPATH) $(all_libraries) #widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
# the libraries to link against. # the libraries to link against.

@ -50,7 +50,7 @@ INCLUDES= $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
# the application source, library search path, and link libraries # the application source, library search path, and link libraries
kxsldbg_LDFLAGS = $(KDE_RPATH) $(all_libraries) kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
# this is where the shell's XML-GUI resource file goes # this is where the shell's XML-GUI resource file goes
shellrcdir = $(kde_datadir)/kxsldbg shellrcdir = $(kde_datadir)/kxsldbg

@ -64,7 +64,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \
quanta_METASOURCES = AUTO quanta_METASOURCES = AUTO
# the library search path. # the library search path.
quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
# this is where the kdelnk file will go # this is where the kdelnk file will go
xdg_apps_DATA = quanta.desktop xdg_apps_DATA = quanta.desktop

Loading…
Cancel
Save