summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-11 07:13:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-11 07:13:47 +0000
commit34b141e9ffa83ad1bf0c1f4e10eab939131b40e8 (patch)
treeb91016421f5141d40b9cc7ef9330eb173d5f8569
parent9b81b308254a1fea02dc01d939626d7b97eddf1f (diff)
downloadtdegames-3.5.13.tar.gz
tdegames-3.5.13.zip
Fix kdegames compilation under oneiricv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1258286 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--atlantik/client/Makefile.am2
-rw-r--r--kbounce/Makefile.am2
-rw-r--r--kfouleggs/Makefile.am4
-rw-r--r--klickety/Makefile.am4
-rw-r--r--kmines/Makefile.am2
-rw-r--r--ksirtet/ksirtet/Makefile.am4
-rw-r--r--ktron/Makefile.am2
-rw-r--r--ktuberling/Makefile.am2
8 files changed, 11 insertions, 11 deletions
diff --git a/atlantik/client/Makefile.am b/atlantik/client/Makefile.am
index 46f71516..717ad0e3 100644
--- a/atlantik/client/Makefile.am
+++ b/atlantik/client/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = atlantik
INCLUDES = -I$(top_srcdir)/libkdegames -I$(srcdir)/../libatlantic -I$(srcdir)/../libatlantikclient -I$(srcdir)/../libatlantikui $(all_includes)
-atlantik_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+atlantik_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -L../libatlantic/.libs -latlantic
atlantik_LDADD = ../libatlantikui/libatlantikui.la ../libatlantikclient/libatlantikclient.la $(LIB_KDEGAMES) $(LIB_KIO)
atlantik_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
diff --git a/kbounce/Makefile.am b/kbounce/Makefile.am
index 25d0909b..d0502def 100644
--- a/kbounce/Makefile.am
+++ b/kbounce/Makefile.am
@@ -12,7 +12,7 @@ KDE_CXXFLAGS = $(KDE_USE_FPIE)
bin_PROGRAMS = kbounce
kbounce_SOURCES = main.cpp kbounce.cpp game.cpp highscores.cpp
-kbounce_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE)
+kbounce_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
kbounce_LDADD = $(LIB_KDEGAMES) $(LIB_KFILE) $(LIB_ARTS) $(artslib)
kbounce_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
diff --git a/kfouleggs/Makefile.am b/kfouleggs/Makefile.am
index a47789a4..a80ea7e6 100644
--- a/kfouleggs/Makefile.am
+++ b/kfouleggs/Makefile.am
@@ -5,8 +5,8 @@ SUBDIRS = pics
KDE_CXXFLAGS = $(KDE_USE_FPIE)
bin_PROGRAMS = kfouleggs
-kfouleggs_LDADD = $(top_builddir)/libksirtet/common/libksirtetcommon.la
-kfouleggs_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH)
+kfouleggs_LDADD = $(top_builddir)/libksirtet/common/libksirtetcommon.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+kfouleggs_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
kfouleggs_SOURCES = piece.cpp board.cpp ai.cpp field.cpp main.cpp prefs.kcfgc
METASOURCES = board.moc ai.moc field.moc main.moc
diff --git a/klickety/Makefile.am b/klickety/Makefile.am
index 5d9e6336..2c99a868 100644
--- a/klickety/Makefile.am
+++ b/klickety/Makefile.am
@@ -5,9 +5,9 @@ INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(top_srcdi
KDE_CXXFLAGS = $(KDE_USE_FPIE)
bin_PROGRAMS = klickety
-klickety_LDADD = $(top_builddir)/libksirtet/base/libksirtetbase.la
+klickety_LDADD = $(top_builddir)/libksirtet/base/libksirtetbase.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
klickety_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
-klickety_LDFLAGS = $(KDE_USE_PIE) $(LIB_KDEGAMES) $(all_libraries) $(KDE_RPATH)
+klickety_LDFLAGS = $(KDE_USE_PIE) $(LIB_KDEGAMES) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
klickety_SOURCES = piece.cpp board.cpp field.cpp highscores.cpp main.cpp
METASOURCES = board.moc field.moc main.moc
diff --git a/kmines/Makefile.am b/kmines/Makefile.am
index e49f6501..afa6e285 100644
--- a/kmines/Makefile.am
+++ b/kmines/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/libkdegames -I$(top_srcdir)/libkdegames/highscore $(a
KDE_CXXFLAGS = $(KDE_USE_FPIE)
bin_PROGRAMS = kmines
-kmines_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE)
+kmines_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
kmines_LDADD = ./solver/libsolver.la $(LIB_KDEGAMES)
kmines_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
kmines_SOURCES = kzoommainwindow.cpp defines.cpp highscores.cpp settings.kcfgc \
diff --git a/ksirtet/ksirtet/Makefile.am b/ksirtet/ksirtet/Makefile.am
index c0052134..bf32b764 100644
--- a/ksirtet/ksirtet/Makefile.am
+++ b/ksirtet/ksirtet/Makefile.am
@@ -3,9 +3,9 @@ INCLUDES = -I$(top_builddir)/libksirtet -I$(top_srcdir)/libksirtet -I$(top_srcdi
KDE_CXXFLAGS = $(KDE_USE_FPIE)
bin_PROGRAMS = ksirtet
-ksirtet_LDADD = $(top_builddir)/libksirtet/common/libksirtetcommon.la
+ksirtet_LDADD = $(top_builddir)/libksirtet/common/libksirtetcommon.la $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
ksirtet_DEPENDENCIES = $(top_builddir)/libksirtet/common/libksirtetcommon.la
-ksirtet_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH)
+ksirtet_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
ksirtet_SOURCES = piece.cpp board.cpp ai.cpp field.cpp settings.cpp main.cpp prefs.kcfgc
METASOURCES = board.moc ai.moc field.moc settings.moc main.moc
diff --git a/ktron/Makefile.am b/ktron/Makefile.am
index e7629bd2..6959bc3f 100644
--- a/ktron/Makefile.am
+++ b/ktron/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = ktron
INCLUDES = -I$(top_srcdir)/libkdegames $(all_includes)
ktron_SOURCES = ai.ui appearance.ui general.ui tron.cpp player.cpp ktron.cpp main.cpp settings.kcfgc
-ktron_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ktron_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
ktron_LDADD = $(LIB_KIO) $(LIB_KDEGAMES)
ktron_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
diff --git a/ktuberling/Makefile.am b/ktuberling/Makefile.am
index 55ed363e..64bedd78 100644
--- a/ktuberling/Makefile.am
+++ b/ktuberling/Makefile.am
@@ -19,7 +19,7 @@ bin_PROGRAMS = ktuberling
ktuberling_SOURCES = action.cpp main.cpp toplevel.cpp playground.cpp todraw.cpp soundfactory.cpp
ktuberling_METASOURCES = AUTO
-ktuberling_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ktuberling_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
ktuberling_LDADD = $(LIB_KDEGAMES) $(LIB_KFILE) -lkdeprint
ktuberling_DEPENDENCIES = $(LIB_KDEGAMES_DEP)