Branch: r14.0.x

7d494aa1 2017-06-27 13:31:27 François Andriot
Fix FTBFS on Mageia 6

Signed-off-by: François Andriot <francois.andriot@...>
(cherry picked from commit eec5504d8c587c5f9061d62cf12c279e04abb7ea)
M dcoppython/shell/Makefile.am
M korundum/rubylib/korundum/Makefile.am
M qtruby/rubylib/designer/uilib/Makefile.am
M qtruby/rubylib/qtruby/Makefile.am
diff --git a/dcoppython/shell/Makefile.am b/dcoppython/shell/Makefile.am
index 57e9d51..288f871 100644
--- a/dcoppython/shell/Makefile.am
+++ b/dcoppython/shell/Makefile.am
@@ -17,7 +17,7 @@
 
 pcop_la_SOURCES = pcop.cpp marshaller.cpp importedmodules.cpp
 pcop_la_LDFLAGS = $(all_libraries) -module -avoid-version
-pcop_la_LIBADD = -lDCOP -ltdecore $(LIB_QT)
+pcop_la_LIBADD = -lDCOP -ltdecore $(LIB_QT) $(LIBPYTHON)
 
 noinst_HEADERS = pcop.h marshaller.h marshal_funcs.h importedmodules.h
 
diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
index 70a05dd..453718b 100644
--- a/korundum/rubylib/korundum/Makefile.am
+++ b/korundum/rubylib/korundum/Makefile.am
@@ -5,6 +5,6 @@
 korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
 korundum_la_METASOURCES = AUTO
 korundum_la_SOURCES = Korundum.cpp tdehandlers.cpp
-korundum_la_LIBADD = $(LIB_KDE) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
+korundum_la_LIBADD = $(LIB_KDE) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la $(RUBY_LIBRUBYARG)
 
 SUBDIRS = lib
diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
index 9900635..b7cc229 100644
--- a/qtruby/rubylib/designer/uilib/Makefile.am
+++ b/qtruby/rubylib/designer/uilib/Makefile.am
@@ -4,4 +4,4 @@
 rubylib_LTLIBRARIES = tqui.la
 tqui_la_SOURCES = tqui.cpp
 tqui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
-tqui_la_LIBADD = -ltqui
+tqui_la_LIBADD = -ltqui $(LIB_QT) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tqt/libsmoketqt.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
index 5561200..09ac6b0 100644
--- a/qtruby/rubylib/qtruby/Makefile.am
+++ b/qtruby/rubylib/qtruby/Makefile.am
@@ -10,6 +10,6 @@
 rubylib_LTLIBRARIES = qtruby.la
 qtruby_la_SOURCES = 
 qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
-qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT) $(top_builddir)/smoke/tqt/libsmoketqt.la
+qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QT) $(top_builddir)/smoke/tqt/libsmoketqt.la $(LIB_TDECORE) $(RUBY_LIBRUBYARG) -lstdc++
 
 SUBDIRS = lib