From ad3832f1f536f3afea0d06650f354c3a4c25068f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 27 Jun 2017 20:29:04 +0200 Subject: Fix FTBFS on Mageia 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot (cherry picked from commit 8b39265336d6d9f2f845f6662c6799f95ddc4eff) --- knetworkconf/knetworkconf/Makefile.am | 2 +- lilo-config/kde/Makefile.am | 2 +- tdefile-plugins/deb/Makefile.am | 2 +- tdefile-plugins/rpm/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am index a0aea3b..2fe7ee1 100644 --- a/knetworkconf/knetworkconf/Makefile.am +++ b/knetworkconf/knetworkconf/Makefile.am @@ -10,7 +10,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_knetworkconfmodule.la -kcm_knetworkconfmodule_la_LIBADD = $(LIB_TDEUI) +kcm_knetworkconfmodule_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) -lDCOP # the library search path. kcm_knetworkconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/lilo-config/kde/Makefile.am b/lilo-config/kde/Makefile.am index af23803..ed4518e 100644 --- a/lilo-config/kde/Makefile.am +++ b/lilo-config/kde/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_lilo.la kcm_lilo_la_SOURCES = kcontrol.cpp Details.cpp InputBox.cpp kcm_lilo_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_lilo_la_LIBADD = ../kde-qt-common/libwidgets.la $(LIB_TDEIO) +kcm_lilo_la_LIBADD = ../kde-qt-common/libwidgets.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) kcm_lilo_la_METASOURCES = AUTO AM_CXXFLAGS = -DUSE_KDE diff --git a/tdefile-plugins/deb/Makefile.am b/tdefile-plugins/deb/Makefile.am index e874ae5..7104bc7 100644 --- a/tdefile-plugins/deb/Makefile.am +++ b/tdefile-plugins/deb/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_deb.la tdefile_deb_la_SOURCES = tdefile_deb.cpp tdefile_deb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_deb_la_LIBADD = $(LIB_TDESYCOCA) +tdefile_deb_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/rpm/Makefile.am b/tdefile-plugins/rpm/Makefile.am index bfed7ce..7315ab4 100644 --- a/tdefile-plugins/rpm/Makefile.am +++ b/tdefile-plugins/rpm/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_rpm.la tdefile_rpm_la_SOURCES = tdefile_rpm.cpp tdefile_rpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_rpm_la_LIBADD = $(LIB_TDESYCOCA) +tdefile_rpm_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO -- cgit v1.2.1