diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
| commit | 042dc76a36d755237893cc95628cf137b4f76543 (patch) | |
| tree | 5f66fef3dc529136ec3468f5574e9c672ca6c27f /kommander | |
| parent | e7d485fd091fd610bd8d6b3fae3627909ab4069a (diff) | |
| download | tdewebdev-042dc76a36d755237893cc95628cf137b4f76543.tar.gz tdewebdev-042dc76a36d755237893cc95628cf137b4f76543.zip | |
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
Diffstat (limited to 'kommander')
| -rw-r--r-- | kommander/editor/Makefile.am | 2 | ||||
| -rw-r--r-- | kommander/executor/Makefile.am | 2 | ||||
| -rw-r--r-- | kommander/pluginmanager/Makefile.am | 2 | ||||
| -rw-r--r-- | kommander/widgets/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kommander/editor/Makefile.am b/kommander/editor/Makefile.am index aad9e81d..7a059e14 100644 --- a/kommander/editor/Makefile.am +++ b/kommander/editor/Makefile.am @@ -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) # 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. kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \ diff --git a/kommander/executor/Makefile.am b/kommander/executor/Makefile.am index 7d9004fe..dc50f7c2 100644 --- a/kommander/executor/Makefile.am +++ b/kommander/executor/Makefile.am @@ -20,6 +20,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/widgets METASOURCES = AUTO # 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 diff --git a/kommander/pluginmanager/Makefile.am b/kommander/pluginmanager/Makefile.am index 5b3e56c8..59041582 100644 --- a/kommander/pluginmanager/Makefile.am +++ b/kommander/pluginmanager/Makefile.am @@ -13,6 +13,6 @@ INCLUDES = -I$(top_srcdir)/kommander/factory $(all_includes) METASOURCES = AUTO # 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 diff --git a/kommander/widgets/Makefile.am b/kommander/widgets/Makefile.am index 51b23251..179db6e8 100644 --- a/kommander/widgets/Makefile.am +++ b/kommander/widgets/Makefile.am @@ -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) # 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 # the libraries to link against. |