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 | b69a4883748e967bfd7564a7a07c0f9d9832397b (patch) | |
tree | 63c8b1dc5c7e759f101b941dbfcad3b352181679 /kwin | |
parent | e179f15ee723f9c4978b78a2c87cf1b0449d49b4 (diff) | |
download | tdebase-b69a4883748e967bfd7564a7a07c0f9d9832397b.tar.gz tdebase-b69a4883748e967bfd7564a7a07c0f9d9832397b.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/kdebase@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin')
-rw-r--r-- | kwin/clients/keramik/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/clients/kwmtheme/cli_installer/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/killer/Makefile.am | 2 | ||||
-rw-r--r-- | kwin/tools/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kwin/clients/keramik/Makefile.am b/kwin/clients/keramik/Makefile.am index d5969643c..5474c6aae 100644 --- a/kwin/clients/keramik/Makefile.am +++ b/kwin/clients/keramik/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = tiles.h embedtool_SOURCES = embedtool.cpp embedtool_LDADD = $(LIB_QT) -embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) +embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kde_module_LTLIBRARIES = kwin3_keramik.la diff --git a/kwin/clients/kwmtheme/cli_installer/Makefile.am b/kwin/clients/kwmtheme/cli_installer/Makefile.am index feb31c424..89b661780 100644 --- a/kwin/clients/kwmtheme/cli_installer/Makefile.am +++ b/kwin/clients/kwmtheme/cli_installer/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = kwmtheme kwmtheme_SOURCES = main.cpp # the library search path. -kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kwin/killer/Makefile.am b/kwin/killer/Makefile.am index acbf5e77d..e31c88be6 100644 --- a/kwin/killer/Makefile.am +++ b/kwin/killer/Makefile.am @@ -4,6 +4,6 @@ bin_PROGRAMS = kwin_killer_helper kwin_killer_helper_SOURCES = killer.cpp kwin_killer_helper_LDADD = $(LIB_KDEUI) -kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/kwin/tools/Makefile.am b/kwin/tools/Makefile.am index da92d969d..444cde9dc 100644 --- a/kwin/tools/Makefile.am +++ b/kwin/tools/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = decobenchmark INCLUDES = $(all_includes) test_gravity_SOURCES = test_gravity.cpp -test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) +test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor test_gravity_LDADD = $(LIB_X11) METASOURCES = AUTO |