summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2017-06-27 20:30:46 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-06-27 20:31:27 +0200
commit7d494aa17d90b5b36ec605d5909101fb99cbe79f (patch)
tree34577e942b2bcf1a198891ac2222a663191cbe3e
parent42861b07b908d5cbb2a5141e83b65855f1446fa6 (diff)
downloadtdebindings-7d494aa17d90b5b36ec605d5909101fb99cbe79f.zip
tdebindings-7d494aa17d90b5b36ec605d5909101fb99cbe79f.tar.gz
Fix FTBFS on Mageia 6
Signed-off-by: François Andriot <francois.andriot@free.fr> (cherry picked from commit eec5504d8c587c5f9061d62cf12c279e04abb7ea)
-rw-r--r--dcoppython/shell/Makefile.am2
-rw-r--r--korundum/rubylib/korundum/Makefile.am2
-rw-r--r--qtruby/rubylib/designer/uilib/Makefile.am2
-rw-r--r--qtruby/rubylib/qtruby/Makefile.am2
4 files changed, 4 insertions, 4 deletions
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 @@ pythlibdir = $(PYTHONMODDIR)/site-packages
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 @@ rubylib_LTLIBRARIES = korundum.la
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 @@ rubylibdir = $(RUBY_ARCHDIR)
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 @@ rubylibdir = $(RUBY_ARCHDIR)
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