From 7dd0ab0b5999db161ac1b96254ee5c7e0a074d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 22 Mar 2014 02:59:40 +0100 Subject: [PATCH] Add missing LDFLAGS causing FTBFS --- kdiff3plugin/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kdiff3plugin/Makefile.am b/kdiff3plugin/Makefile.am index fcc8798..7e71ad6 100644 --- a/kdiff3plugin/Makefile.am +++ b/kdiff3plugin/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkdiff3plugin.la libkdiff3plugin_la_SOURCES = kdiff3plugin.cpp -libkdiff3plugin_la_LIBADD = -lkonq +libkdiff3plugin_la_LIBADD = -lkonq $(LIB_TDECORE) $(LIB_TDEUI) libkdiff3plugin_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) #KDE_ICON = KDiff3 diff --git a/src/Makefile.am b/src/Makefile.am index 253e723..d949623 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,7 +47,7 @@ libkdiff3part_la_SOURCES = kdiff3_part.cpp kdiff3.cpp directorymergewindow.cpp \ mergeresultwindow.cpp fileaccess.cpp gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp \ common.cpp smalldialogs.cpp libkdiff3part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -libkdiff3part_la_LIBADD = $(LIB_TDEPRINT) $(LIB_TDEPARTS) $(LIB_TDEFILE) +libkdiff3part_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_TDEPARTS) $(LIB_TDEFILE) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir)