From 9b81b308254a1fea02dc01d939626d7b97eddf1f Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 10 Oct 2011 20:45:10 +0000 Subject: 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/kdegames@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kbattleship/kbattleship/Makefile.am | 2 +- kbattleship/kbattleship/dialogs/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kbattleship') diff --git a/kbattleship/kbattleship/Makefile.am b/kbattleship/kbattleship/Makefile.am index 6c59ddd5..df83b449 100644 --- a/kbattleship/kbattleship/Makefile.am +++ b/kbattleship/kbattleship/Makefile.am @@ -15,7 +15,7 @@ kbattleship_SOURCES = kbaiplayer.cpp kbstrategy.cpp kbverticalstepstrategy.cpp\ kbchooserstrategy.cpp kbattleship.cpp main.cpp kbattleship_LDADD = $(LIB_KDEGAMES) ./dialogs/libkbattleshipdialogs.la $(LIB_KFILE) $(LIB_KDNSSD) kbattleship_COMPILE_FIRST = dialogs/infoDlg.h dialogs/chatDlg.h dialogs/connectDlg.h dialogs/serverDlg.h dialogs/statDlg.h -kbattleship_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kbattleship_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kbattleship_DEPENDENCIES = $(LIB_KDEGAMES_DEP) services_DATA = _kbattleship._tcp diff --git a/kbattleship/kbattleship/dialogs/Makefile.am b/kbattleship/kbattleship/dialogs/Makefile.am index 6f7fa1ab..cae41a55 100644 --- a/kbattleship/kbattleship/dialogs/Makefile.am +++ b/kbattleship/kbattleship/dialogs/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO noinst_LTLIBRARIES = libkbattleshipdialogs.la libkbattleshipdialogs_la_SOURCES = dummy.cpp connectDlg.ui serverDlg.ui \ chatDlg.ui statDlg.ui infoDlg.ui -libkbattleshipdialogs_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +libkbattleshipdialogs_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libkbattleshipdialogs_la_LIBADD = $(LIB_KDEUI) dummy.cpp: -- cgit v1.2.1