From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1214D138262 for ; Thu, 19 May 2016 13:20:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E13DE0854; Thu, 19 May 2016 13:20:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21CC9E0854 for ; Thu, 19 May 2016 13:20:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B6D4340B7E for ; Thu, 19 May 2016 13:20:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6E5633E for ; Thu, 19 May 2016 13:20:30 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: <1463664024.79d3e3a931cccc92e79a3a43aa037f6561c09042.dev-zero@gentoo> Subject: [gentoo-commits] dev/dev-zero:master commit in: sci-misc/cube/files/, sci-misc/cube/ X-VCS-Repository: dev/dev-zero X-VCS-Files: sci-misc/cube/cube-4.3.4.ebuild sci-misc/cube/files/cube-4.3.4-fix-guilib-linkage.patch X-VCS-Directories: sci-misc/cube/ sci-misc/cube/files/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: 79d3e3a931cccc92e79a3a43aa037f6561c09042 X-VCS-Branch: master Date: Thu, 19 May 2016 13:20:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 31e1bc31-9087-464b-9092-9e1097eae018 X-Archives-Hash: 184e7dee7398c001c919e81a1735ea1b commit: 79d3e3a931cccc92e79a3a43aa037f6561c09042 Author: Tiziano Müller gentoo org> AuthorDate: Thu May 19 13:20:24 2016 +0000 Commit: Tiziano Müller gentoo org> CommitDate: Thu May 19 13:20:24 2016 +0000 URL: https://gitweb.gentoo.org/dev/dev-zero.git/commit/?id=79d3e3a9 sci-misc/cube: fix linkage problems sci-misc/cube/cube-4.3.4.ebuild | 2 + .../cube/files/cube-4.3.4-fix-guilib-linkage.patch | 611 +++++++++++++++++++++ 2 files changed, 613 insertions(+) diff --git a/sci-misc/cube/cube-4.3.4.ebuild b/sci-misc/cube/cube-4.3.4.ebuild index f4cd92b..53f560b 100644 --- a/sci-misc/cube/cube-4.3.4.ebuild +++ b/sci-misc/cube/cube-4.3.4.ebuild @@ -20,6 +20,8 @@ DEPEND="qt4? ( dev-qt/qtgui:4 ) R? ( dev-lang/R )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-fix-guilib-linkage.patch" ) + src_configure() { econf \ $(use_enable static-libs static) \ diff --git a/sci-misc/cube/files/cube-4.3.4-fix-guilib-linkage.patch b/sci-misc/cube/files/cube-4.3.4-fix-guilib-linkage.patch new file mode 100644 index 0000000..59e48dd --- /dev/null +++ b/sci-misc/cube/files/cube-4.3.4-fix-guilib-linkage.patch @@ -0,0 +1,611 @@ +diff --git a/build-backend/Makefile.in b/build-backend/Makefile.in +index b489f29..3ac64ca 100644 +--- a/build-backend/Makefile.in ++++ b/build-backend/Makefile.in +@@ -884,7 +884,7 @@ LTLIBRARIES = $(editor_plugin_LTLIBRARIES) \ + $(paraver_plugin_LTLIBRARIES) $(statistic_plugin_LTLIBRARIES) \ + $(sysbox_plugin_LTLIBRARIES) $(topology_plugin_LTLIBRARIES) \ + $(vampir_plugin_LTLIBRARIES) +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_DEPENDENCIES = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__editor_plugin_la_SOURCES_DIST = $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/CPPSyntaxHighlighter.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/FortranSyntaxHighlighter.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/EditorPlugin.cpp \ +@@ -910,7 +910,7 @@ editor_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(editor_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@am_editor_plugin_la_rpath = -rpath \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@ $(editor_plugindir) +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_DEPENDENCIES = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__launch_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/launch/Launch.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/launch/LaunchInfo.cpp \ +@@ -933,7 +933,7 @@ launch_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(launch_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@am_launch_plugin_la_rpath = -rpath \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ $(launch_plugindir) +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_DEPENDENCIES = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__libadvancedcm_plugin_la_SOURCES_DIST = $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/AdvancedColorMaps.cpp \ + $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/AdvancedColorMaps.h \ + $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/AdvancedColorMapsSettings.cpp \ +@@ -985,6 +985,7 @@ libadvancedcm_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@am_libadvancedcm_plugin_la_rpath = -rpath \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(libadvancedcm_plugindir) + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@libbarplot_plugin_la_DEPENDENCIES = libcube4.la \ ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@ libcube4gui.la \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@ libgraphwidgetcommon-plugin.la + am__libbarplot_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/Barplot/Barplot.cpp \ +@@ -1538,7 +1539,7 @@ libcube4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(CXXFLAGS) $(libcube4_la_LDFLAGS) $(LDFLAGS) -o $@ + @CROSS_BUILD_FALSE@@WITH_CPP_LIB_TRUE@am_libcube4_la_rpath = -rpath \ + @CROSS_BUILD_FALSE@@WITH_CPP_LIB_TRUE@ $(libdir) +-libcube4gui_la_LIBADD = ++libcube4gui_la_LIBADD = libcube4.la $(QT_LIBS) + am__libcube4gui_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/display/SettingsToolBar.cpp \ + $(SRC_ROOT)src/GUI-qt/display/ScrollArea.cpp \ +@@ -1902,7 +1903,8 @@ libcube4w_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_C_WRITER_TRUE@ $(libdir) + @CROSS_BUILD_TRUE@@WITH_C_WRITER_TRUE@am_libcube4w_la_rpath = -rpath \ + @CROSS_BUILD_TRUE@@WITH_C_WRITER_TRUE@ $(libdir) +-libcubewriter4_la_LIBADD = ++libcubewriter4_la_LIBADD = libcube4w.la ++@CROSS_BUILD_FALSE@@WITH_C_WRITER_TRUE@libcubewriter4_la_DEPENDENCIES = libcube4w.la + am__libcubewriter4_la_SOURCES_DIST = \ + $(SRC_ROOT)src/cubew/cubew_cubew.c \ + $(SRC_ROOT)src/cubew/cubew_cubew.h +@@ -1974,6 +1976,7 @@ libgraphwidgetcommon_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_GRAPHWIDGET_COMMON_TRUE@@WITH_GUI_TRUE@am_libgraphwidgetcommon_plugin_la_rpath = -rpath \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_GRAPHWIDGET_COMMON_TRUE@@WITH_GUI_TRUE@ $(libdir) + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@libheatmap_plugin_la_DEPENDENCIES = libcube4.la \ ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@ libcube4gui.la \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@ libgraphwidgetcommon-plugin.la + am__libheatmap_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/Heatmap/Heatmap.cpp \ +@@ -2140,7 +2143,7 @@ am__libutils_io_la_SOURCES_DIST = \ + @CROSS_BUILD_FALSE@@WITH_TOOLS_TRUE@ libutils_io_la-UTILS_IO_Tools.lo + libutils_io_la_OBJECTS = $(am_libutils_io_la_OBJECTS) + @CROSS_BUILD_FALSE@@WITH_TOOLS_TRUE@am_libutils_io_la_rpath = +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_DEPENDENCIES = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__paraver_plugin_la_SOURCES_DIST = $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverConnecter.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverPlugin.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverConnecter.h \ +@@ -2157,7 +2160,7 @@ paraver_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(paraver_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@am_paraver_plugin_la_rpath = -rpath \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ $(paraver_plugindir) +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_DEPENDENCIES = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__statistic_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/Statistics/Statistics.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/Statistics/StatisticPlugin.cpp \ +@@ -2176,7 +2179,8 @@ statistic_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@am_statistic_plugin_la_rpath = -rpath \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ $(statistic_plugindir) + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@sysbox_plugin_la_DEPENDENCIES = \ +-@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ libcube4.la \ ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ libcube4gui.la + am__sysbox_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.h +@@ -2193,7 +2197,8 @@ sysbox_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@am_sysbox_plugin_la_rpath = -rpath \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ $(sysbox_plugindir) + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@topology_plugin_la_DEPENDENCIES = \ +-@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ libcube4.la \ ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ libcube4gui.la + am__topology_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/Point.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/Tetragon.cpp \ +@@ -2253,7 +2258,7 @@ topology_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(topology_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@am_topology_plugin_la_rpath = \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ -rpath $(topology_plugindir) +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_DEPENDENCIES = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__vampir_plugin_la_SOURCES_DIST = $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirConnecter.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirConnectionDialog.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirPlugin.cpp \ +@@ -3865,10 +3870,10 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_TRUE@@WITH_C_WRITER_TRUE@ $(SRC_ROOT)src/cubew/cubew_cubew.h + + +-#libcubewriter4_la_LIBADD = $(BACKEND_LIBZ) -lz ++@CROSS_BUILD_FALSE@@WITH_C_WRITER_TRUE@libcubewriter4_la_LIBADD = libcube4w.la + @CROSS_BUILD_FALSE@@WITH_C_WRITER_TRUE@libcubewriter4_la_LDFLAGS = -version-info @LIBRARY_INTERFACE_VERSION@ + +-#libcubewriter4_la_LIBADD = $(BACKEND_LIBZ) -lz ++@CROSS_BUILD_TRUE@@WITH_C_WRITER_TRUE@libcubewriter4_la_LIBADD = libcube4w.la + @CROSS_BUILD_TRUE@@WITH_C_WRITER_TRUE@libcubewriter4_la_LDFLAGS = -version-info @LIBRARY_INTERFACE_VERSION@ + @CROSS_BUILD_FALSE@@WITH_C_WRITER_TRUE@libcube4w_la_SOURCES = \ + @CROSS_BUILD_FALSE@@WITH_C_WRITER_TRUE@ $(SRC_ROOT)src/cubew/cubew_cartesian.c \ +@@ -4716,6 +4721,10 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ $(HMI_INSTRUMENTATION) \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ -I. + ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@libcube4gui_la_LIBADD = \ ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ libcube4.la \ ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ $(QT_LIBS) ++ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@libcube4gui_la_LDFLAGS = $(QT_LDFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@libcube4gui_moc_files = \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ ../src/GUI-qt/display/SettingsToolBar.moc.cpp \ +@@ -4768,7 +4777,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/launch/LaunchInfo.h \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/launch/LaunchPlugin.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_LIBADD = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_LIBADD = libcube4.la libcube4gui.la + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ $(OPENMP_CXXFLAGS) \ +@@ -4831,7 +4840,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/SystemTopologyWidget.h\ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/TopologyDimensionBar.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@topology_plugin_la_LIBADD = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@topology_plugin_la_LIBADD = libcube4.la libcube4gui.la + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@topology_plugin_la_LDFLAGS = \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -4866,7 +4875,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.cpp \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@sysbox_plugin_la_LIBADD = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_TRUE@sysbox_plugin_la_LIBADD = libcube4.la libcube4gui.la + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@sysbox_plugin_la_LDFLAGS = \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -4948,7 +4957,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Heatmap/HeatmapPlotArea.h \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Heatmap/HeatmapSettingsWidget.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@libheatmap_plugin_la_LIBADD = libcube4.la libgraphwidgetcommon-plugin.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@libheatmap_plugin_la_LIBADD = libcube4.la libcube4gui.la libgraphwidgetcommon-plugin.la + #libheatmap_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@libheatmap_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -5010,7 +5019,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Barplot/PlotsListController.h \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Barplot/SettingsWidget.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@libbarplot_plugin_la_LIBADD = libcube4.la libgraphwidgetcommon-plugin.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@libbarplot_plugin_la_LIBADD = libcube4.la libcube4gui.la libgraphwidgetcommon-plugin.la + #libbarplot_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@libbarplot_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -5068,7 +5077,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/FortranSyntaxHighlighter.h \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/CPPSyntaxHighlighter.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_LIBADD = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_LIBADD = libcube4.la libcube4gui.la + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@ $(OPENMP_CXXFLAGS) \ +@@ -5108,7 +5117,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Statistics/Statistics.h \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Statistics/StatisticPlugin.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_LIBADD = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_LIBADD = libcube4.la libcube4gui.la + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ $(OPENMP_CXXFLAGS) \ +@@ -5148,7 +5157,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirConnectionDialog.h \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirPlugin.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_LIBADD = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_LIBADD = libcube4.la libcube4gui.la + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@ $(OPENMP_CXXFLAGS) \ +@@ -5187,7 +5196,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverConnecter.h \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverPlugin.h + +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_LIBADD = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_LIBADD = libcube4.la libcube4gui.la + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ $(OPENMP_CXXFLAGS) \ +@@ -5242,7 +5251,7 @@ MOSTLYCLEANFILES = + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/maps/CubehelixColorMap.h \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/maps/ImprovedRainbowColorMap.cpp \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/maps/ImprovedRainbowColorMap.h +-@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_LIBADD = libcube4.la ++@CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_LIBADD = libcube4.la libcube4gui.la + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ + @CROSS_BUILD_FALSE@@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(OPENMP_CXXFLAGS) \ +diff --git a/build-frontend/Makefile.in b/build-frontend/Makefile.in +index 68cbd71..1bbe3b6 100644 +--- a/build-frontend/Makefile.in ++++ b/build-frontend/Makefile.in +@@ -779,7 +779,7 @@ LTLIBRARIES = $(editor_plugin_LTLIBRARIES) \ + $(paraver_plugin_LTLIBRARIES) $(statistic_plugin_LTLIBRARIES) \ + $(sysbox_plugin_LTLIBRARIES) $(topology_plugin_LTLIBRARIES) \ + $(vampir_plugin_LTLIBRARIES) +-@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_DEPENDENCIES = libcube4.la ++@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__editor_plugin_la_SOURCES_DIST = $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/CPPSyntaxHighlighter.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/FortranSyntaxHighlighter.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/EditorPlugin.cpp \ +@@ -807,7 +807,8 @@ editor_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@ -rpath \ + @WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@ $(editor_plugindir) + @WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_DEPENDENCIES = \ +-@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ libcube4.la ++@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ libcube4.la \ ++@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ libcube4gui.la + am__launch_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/launch/Launch.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/launch/LaunchInfo.cpp \ +@@ -833,7 +834,8 @@ launch_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ -rpath \ + @WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ $(launch_plugindir) + @WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_DEPENDENCIES = \ +-@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ libcube4.la ++@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ libcube4.la \ ++@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ libcube4gui.la + am__libadvancedcm_plugin_la_SOURCES_DIST = $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/AdvancedColorMaps.cpp \ + $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/AdvancedColorMaps.h \ + $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/AdvancedColorMapsSettings.cpp \ +@@ -887,6 +889,7 @@ libadvancedcm_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(libadvancedcm_plugindir) + @WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@libbarplot_plugin_la_DEPENDENCIES = \ + @WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@ libcube4.la \ ++@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@ libcube4gui.la \ + @WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@ libgraphwidgetcommon-plugin.la + am__libbarplot_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/Barplot/Barplot.cpp \ +@@ -1441,7 +1444,7 @@ libcube4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libcube4_la_CXXFLAGS) \ + $(CXXFLAGS) $(libcube4_la_LDFLAGS) $(LDFLAGS) -o $@ + @WITH_CPP_LIB_TRUE@am_libcube4_la_rpath = -rpath $(libdir) +-libcube4gui_la_LIBADD = ++libcube4gui_la_LIBADD = libcube4.la $(QT_LIBS) + am__libcube4gui_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/display/SettingsToolBar.cpp \ + $(SRC_ROOT)src/GUI-qt/display/ScrollArea.cpp \ +@@ -1789,7 +1792,8 @@ libcube4w_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcube4w_la_CFLAGS) \ + $(CFLAGS) $(libcube4w_la_LDFLAGS) $(LDFLAGS) -o $@ + @WITH_C_WRITER_TRUE@am_libcube4w_la_rpath = -rpath $(libdir) +-libcubewriter4_la_LIBADD = ++libcubewriter4_la_LIBADD = libcube4w.la ++@WITH_C_WRITER_TRUE@libcubewriter4_la_DEPENDENCIES = libcube4w.la + am__libcubewriter4_la_SOURCES_DIST = \ + $(SRC_ROOT)src/cubew/cubew_cubew.c \ + $(SRC_ROOT)src/cubew/cubew_cubew.h +@@ -1856,6 +1860,7 @@ libgraphwidgetcommon_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @WITH_GUI_PLUGIN_GRAPHWIDGET_COMMON_TRUE@@WITH_GUI_TRUE@ $(libdir) + @WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@libheatmap_plugin_la_DEPENDENCIES = \ + @WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@ libcube4.la \ ++@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@ libcube4gui.la \ + @WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@ libgraphwidgetcommon-plugin.la + am__libheatmap_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/Heatmap/Heatmap.cpp \ +@@ -2026,7 +2031,8 @@ am__libutils_io_la_SOURCES_DIST = \ + libutils_io_la_OBJECTS = $(am_libutils_io_la_OBJECTS) + @WITH_TOOLS_TRUE@am_libutils_io_la_rpath = + @WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_DEPENDENCIES = \ +-@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ libcube4.la ++@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ libcube4.la \ ++@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ libcube4gui.la + am__paraver_plugin_la_SOURCES_DIST = $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverConnecter.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverPlugin.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverConnecter.h \ +@@ -2045,7 +2051,8 @@ paraver_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ -rpath \ + @WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ $(paraver_plugindir) + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_DEPENDENCIES = \ +-@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ libcube4.la ++@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ libcube4.la \ ++@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ libcube4gui.la + am__statistic_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/Statistics/Statistics.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/Statistics/StatisticPlugin.cpp \ +@@ -2064,7 +2071,7 @@ statistic_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@am_statistic_plugin_la_rpath = \ + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ -rpath \ + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ $(statistic_plugindir) +-@WITH_GUI_TRUE@sysbox_plugin_la_DEPENDENCIES = libcube4.la ++@WITH_GUI_TRUE@sysbox_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__sysbox_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.h +@@ -2079,7 +2086,7 @@ sysbox_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(sysbox_plugin_la_CXXFLAGS) $(CXXFLAGS) \ + $(sysbox_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ + @WITH_GUI_TRUE@am_sysbox_plugin_la_rpath = -rpath $(sysbox_plugindir) +-@WITH_GUI_TRUE@topology_plugin_la_DEPENDENCIES = libcube4.la ++@WITH_GUI_TRUE@topology_plugin_la_DEPENDENCIES = libcube4.la libcube4gui.la + am__topology_plugin_la_SOURCES_DIST = \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/Point.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/Tetragon.cpp \ +@@ -2139,7 +2146,8 @@ topology_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + @WITH_GUI_TRUE@am_topology_plugin_la_rpath = -rpath \ + @WITH_GUI_TRUE@ $(topology_plugindir) + @WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_DEPENDENCIES = \ +-@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@ libcube4.la ++@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@ libcube4.la \ ++@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@ libcube4gui.la + am__vampir_plugin_la_SOURCES_DIST = $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirConnecter.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirConnectionDialog.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirPlugin.cpp \ +@@ -4386,6 +4394,10 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_TRUE@ $(HMI_INSTRUMENTATION) \ + @WITH_GUI_TRUE@ -I. + ++@WITH_GUI_TRUE@libcube4gui_la_LIBADD = \ ++@WITH_GUI_TRUE@ libcube4.la \ ++@WITH_GUI_TRUE@ $(QT_LIBS) ++ + @WITH_GUI_TRUE@libcube4gui_la_LDFLAGS = $(QT_LDFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ + @WITH_GUI_TRUE@libcube4gui_moc_files = \ + @WITH_GUI_TRUE@ ../src/GUI-qt/display/SettingsToolBar.moc.cpp \ +@@ -4438,7 +4450,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/launch/LaunchInfo.h \ + @WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/launch/LaunchPlugin.h + +-@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_LIBADD = libcube4.la ++@WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_LIBADD = libcube4.la libcube4gui.la + @WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@launch_plugin_la_LDFLAGS = \ + @WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ + @WITH_GUI_PLUGIN_LAUNCH_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -4495,7 +4507,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/SystemTopologyWidget.h\ + @WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/TopologyDimensionBar.h + +-@WITH_GUI_TRUE@topology_plugin_la_LIBADD = libcube4.la ++@WITH_GUI_TRUE@topology_plugin_la_LIBADD = libcube4.la libcube4gui.la + @WITH_GUI_TRUE@topology_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) \ + @WITH_GUI_TRUE@ $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) \ +@@ -4525,7 +4537,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.cpp \ + @WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.h + +-@WITH_GUI_TRUE@sysbox_plugin_la_LIBADD = libcube4.la ++@WITH_GUI_TRUE@sysbox_plugin_la_LIBADD = libcube4.la libcube4gui.la + @WITH_GUI_TRUE@sysbox_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) \ + @WITH_GUI_TRUE@ $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) \ +@@ -4602,7 +4614,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Heatmap/HeatmapPlotArea.h \ + @WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Heatmap/HeatmapSettingsWidget.h + +-@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@libheatmap_plugin_la_LIBADD = libcube4.la libgraphwidgetcommon-plugin.la ++@WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@libheatmap_plugin_la_LIBADD = libcube4.la libcube4gui.la libgraphwidgetcommon-plugin.la + #libheatmap_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + @WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@libheatmap_plugin_la_LDFLAGS = \ + @WITH_GUI_PLUGIN_HEATMAP_TRUE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ +@@ -4658,7 +4670,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Barplot/PlotsListController.h \ + @WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Barplot/SettingsWidget.h + +-@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@libbarplot_plugin_la_LIBADD = libcube4.la libgraphwidgetcommon-plugin.la ++@WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@libbarplot_plugin_la_LIBADD = libcube4.la libcube4gui.la libgraphwidgetcommon-plugin.la + #libbarplot_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + @WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@libbarplot_plugin_la_LDFLAGS = \ + @WITH_GUI_PLUGIN_BARPLOT_TRUE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ +@@ -4710,7 +4722,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/FortranSyntaxHighlighter.h \ + @WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/CPPSyntaxHighlighter.h + +-@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_LIBADD = libcube4.la ++@WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_LIBADD = libcube4.la libcube4gui.la + @WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@editor_plugin_la_LDFLAGS = $(QT_LDFLAGS) \ + @WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ + @WITH_GUI_PLUGIN_SOURCE_EDITOR_TRUE@@WITH_GUI_TRUE@ $(OPENMP_CXXFLAGS) \ +@@ -4747,7 +4759,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Statistics/Statistics.h \ + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/Statistics/StatisticPlugin.h + +-@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_LIBADD = libcube4.la ++@WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_LIBADD = libcube4.la libcube4gui.la + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@statistic_plugin_la_LDFLAGS = \ + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ + @WITH_GUI_PLUGIN_STATISTICS_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -4782,7 +4794,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirConnectionDialog.h \ + @WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirPlugin.h + +-@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_LIBADD = libcube4.la ++@WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_LIBADD = libcube4.la libcube4gui.la + @WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@vampir_plugin_la_LDFLAGS = \ + @WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ + @WITH_GUI_PLUGIN_VAMPIR_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -4815,7 +4827,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverConnecter.h \ + @WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@$(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverPlugin.h + +-@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_LIBADD = libcube4.la ++@WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_LIBADD = libcube4.la libcube4gui.la + @WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@paraver_plugin_la_LDFLAGS = \ + @WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ + @WITH_GUI_PLUGIN_PARAVER_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -4864,7 +4876,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/maps/CubehelixColorMap.h \ + @WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/maps/ImprovedRainbowColorMap.cpp \ + @WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/maps/ImprovedRainbowColorMap.h +-@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_LIBADD = libcube4.la ++@WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_LIBADD = libcube4.la libcube4gui.la + @WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@libadvancedcm_plugin_la_LDFLAGS = \ + @WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(QT_LDFLAGS) \ + @WITH_GUI_PLUGIN_ADVANCEDCM_TRUE@@WITH_GUI_TRUE@ $(OPENMP_LDFLAGS) \ +@@ -5387,7 +5399,7 @@ EXAMPLE_PLUGIN_CONTEXTFREE_IN = $(EXAMPLE_PLUGIN_CONTEXTFREE_) $(srcdir)/../exam + @WITH_C_WRITER_TRUE@ $(SRC_ROOT)src/cubew/cubew_cubew.h + + +-#libcubewriter4_la_LIBADD = $(BACKEND_LIBZ) -lz ++@WITH_C_WRITER_TRUE@libcubewriter4_la_LIBADD = libcube4w.la + @WITH_C_WRITER_TRUE@libcubewriter4_la_LDFLAGS = -version-info @LIBRARY_INTERFACE_VERSION@ + @WITH_C_WRITER_TRUE@libcube4w_la_SOURCES = \ + @WITH_C_WRITER_TRUE@ $(SRC_ROOT)src/cubew/cubew_cartesian.c \ +diff --git a/src/GUI-qt/Makefile.gui-qt4.inc.am b/src/GUI-qt/Makefile.gui-qt4.inc.am +index 2d4953f..4706302 100644 +--- a/src/GUI-qt/Makefile.gui-qt4.inc.am ++++ b/src/GUI-qt/Makefile.gui-qt4.inc.am +@@ -303,6 +303,10 @@ libcube4gui_la_CXXFLAGS = \ + $(HMI_INSTRUMENTATION) \ + -I. + ++libcube4gui_la_LIBADD = \ ++ libcube4.la \ ++ $(QT_LIBS) ++ + libcube4gui_la_LDFLAGS = $(QT_LDFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ + + libcube4gui_moc_files = \ +diff --git a/src/GUI-qt/plugins/AdvancedColorMaps/Makefile.advancedcm-plugin.inc.am b/src/GUI-qt/plugins/AdvancedColorMaps/Makefile.advancedcm-plugin.inc.am +index 7f9f904..0afb76c 100644 +--- a/src/GUI-qt/plugins/AdvancedColorMaps/Makefile.advancedcm-plugin.inc.am ++++ b/src/GUI-qt/plugins/AdvancedColorMaps/Makefile.advancedcm-plugin.inc.am +@@ -32,7 +32,7 @@ $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/ColorMapPlot.cpp \ + $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/RGBDefinerWidget.h \ + $(srcdir)/../src/GUI-qt/plugins/AdvancedColorMaps/RGBDefinerWidget.cpp + +-libadvancedcm_plugin_la_LIBADD = libcube4.la ++libadvancedcm_plugin_la_LIBADD = libcube4.la libcube4gui.la + libadvancedcm_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + libadvancedcm_plugin_la_LDFLAGS += -module -avoid-version -shared # don't generate static library and version number of shared library + +diff --git a/src/GUI-qt/plugins/Barplot/Makefile.barplot-plugin.inc.am b/src/GUI-qt/plugins/Barplot/Makefile.barplot-plugin.inc.am +index ffcb870..6bf3f51 100644 +--- a/src/GUI-qt/plugins/Barplot/Makefile.barplot-plugin.inc.am ++++ b/src/GUI-qt/plugins/Barplot/Makefile.barplot-plugin.inc.am +@@ -35,7 +35,7 @@ $(SRC_ROOT)src/GUI-qt/plugins/Barplot/BarplotController.h \ + $(SRC_ROOT)src/GUI-qt/plugins/Barplot/PlotsListController.h \ + $(SRC_ROOT)src/GUI-qt/plugins/Barplot/SettingsWidget.h + +-libbarplot_plugin_la_LIBADD = libcube4.la libgraphwidgetcommon-plugin.la ++libbarplot_plugin_la_LIBADD = libcube4.la libcube4gui.la libgraphwidgetcommon-plugin.la + #libbarplot_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + libbarplot_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + libbarplot_plugin_la_LDFLAGS += -module -avoid-version -shared # don't generate static library and version number of shared library +diff --git a/src/GUI-qt/plugins/Heatmap/Makefile.heatmap-plugin.inc.am b/src/GUI-qt/plugins/Heatmap/Makefile.heatmap-plugin.inc.am +index 04f3244..6e9d4a1 100644 +--- a/src/GUI-qt/plugins/Heatmap/Makefile.heatmap-plugin.inc.am ++++ b/src/GUI-qt/plugins/Heatmap/Makefile.heatmap-plugin.inc.am +@@ -31,7 +31,7 @@ $(SRC_ROOT)src/GUI-qt/plugins/Heatmap/HeatmapController.h \ + $(SRC_ROOT)src/GUI-qt/plugins/Heatmap/HeatmapPlotArea.h \ + $(SRC_ROOT)src/GUI-qt/plugins/Heatmap/HeatmapSettingsWidget.h + +-libheatmap_plugin_la_LIBADD = libcube4.la libgraphwidgetcommon-plugin.la ++libheatmap_plugin_la_LIBADD = libcube4.la libcube4gui.la libgraphwidgetcommon-plugin.la + #libheatmap_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) -version-info @LIBRARY_INTERFACE_VERSION@ $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + libheatmap_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + libheatmap_plugin_la_LDFLAGS += -module -avoid-version -shared # don't generate static library and version number of shared library +diff --git a/src/GUI-qt/plugins/ParaverPlugin/Makefile.paraver-plugin.inc.am b/src/GUI-qt/plugins/ParaverPlugin/Makefile.paraver-plugin.inc.am +index b4d4236..99929d0 100644 +--- a/src/GUI-qt/plugins/ParaverPlugin/Makefile.paraver-plugin.inc.am ++++ b/src/GUI-qt/plugins/ParaverPlugin/Makefile.paraver-plugin.inc.am +@@ -21,7 +21,7 @@ $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverPlugin.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverConnecter.h \ + $(SRC_ROOT)src/GUI-qt/plugins/ParaverPlugin/ParaverPlugin.h + +-paraver_plugin_la_LIBADD = libcube4.la ++paraver_plugin_la_LIBADD = libcube4.la libcube4gui.la + paraver_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + paraver_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_FOR_BUILD) $(OPENMP_CXXFLAGS) $(DBUS_CXXFLAGS) $(FRONTEND_LIBZ_HEADERS) \ + -I$(CUBE4_HEADERS_ROOT) $(QT_CXXFLAGS) $(QT_CPPFLAGS) -DCUBE_PREFIX='"$(prefix)"' $(CUBE_DEBUG_FLAGS) $(CUBE_INCLUDES) $(GUI_INCLUDES) \ +diff --git a/src/GUI-qt/plugins/SourceCodeEditor/Makefile.source-plugin.inc.am b/src/GUI-qt/plugins/SourceCodeEditor/Makefile.source-plugin.inc.am +index 2bdb57a..72e8137 100644 +--- a/src/GUI-qt/plugins/SourceCodeEditor/Makefile.source-plugin.inc.am ++++ b/src/GUI-qt/plugins/SourceCodeEditor/Makefile.source-plugin.inc.am +@@ -23,7 +23,7 @@ $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/EditorPlugin.h \ + $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/FortranSyntaxHighlighter.h \ + $(SRC_ROOT)src/GUI-qt/plugins/SourceCodeEditor/CPPSyntaxHighlighter.h + +-editor_plugin_la_LIBADD = libcube4.la ++editor_plugin_la_LIBADD = libcube4.la libcube4gui.la + editor_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + editor_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_FOR_BUILD) $(OPENMP_CXXFLAGS) $(DBUS_CXXFLAGS) $(FRONTEND_LIBZ_HEADERS) \ + -I$(CUBE4_HEADERS_ROOT) $(QT_CXXFLAGS) $(QT_CPPFLAGS) $(CUBE_DEBUG_FLAGS) -DCUBE_PREFIX='"$(prefix)"' $(CUBE_INCLUDES) $(GUI_INCLUDES) $(HMI_INSTRUMENTATION) -I. +diff --git a/src/GUI-qt/plugins/Statistics/Makefile.statistics-plugin.inc.am b/src/GUI-qt/plugins/Statistics/Makefile.statistics-plugin.inc.am +index 3046f8a..2c59afa 100644 +--- a/src/GUI-qt/plugins/Statistics/Makefile.statistics-plugin.inc.am ++++ b/src/GUI-qt/plugins/Statistics/Makefile.statistics-plugin.inc.am +@@ -21,7 +21,7 @@ $(SRC_ROOT)src/GUI-qt/plugins/Statistics/StatisticPlugin.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/Statistics/Statistics.h \ + $(SRC_ROOT)src/GUI-qt/plugins/Statistics/StatisticPlugin.h + +-statistic_plugin_la_LIBADD = libcube4.la ++statistic_plugin_la_LIBADD = libcube4.la libcube4gui.la + statistic_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + statistic_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_FOR_BUILD) $(OPENMP_CXXFLAGS) $(DBUS_CXXFLAGS) $(FRONTEND_LIBZ_HEADERS) \ + -I$(CUBE4_HEADERS_ROOT) $(QT_CXXFLAGS) $(QT_CPPFLAGS) -DCUBE_PREFIX='"$(prefix)"' $(CUBE_DEBUG_FLAGS) $(CUBE_INCLUDES) $(GUI_INCLUDES) $(HMI_INSTRUMENTATION) -I. +diff --git a/src/GUI-qt/plugins/SystemBoxPlot/Makefile.system-boxplot.inc.am b/src/GUI-qt/plugins/SystemBoxPlot/Makefile.system-boxplot.inc.am +index 6b93538..6cb6f3e 100644 +--- a/src/GUI-qt/plugins/SystemBoxPlot/Makefile.system-boxplot.inc.am ++++ b/src/GUI-qt/plugins/SystemBoxPlot/Makefile.system-boxplot.inc.am +@@ -21,7 +21,7 @@ sysbox_plugin_la_SOURCES = \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.cpp \ + $(SRC_ROOT)src/GUI-qt/plugins/SystemBoxPlot/SystemBoxPlot.h + +-sysbox_plugin_la_LIBADD = libcube4.la ++sysbox_plugin_la_LIBADD = libcube4.la libcube4gui.la + sysbox_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + sysbox_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_FOR_BUILD) $(OPENMP_CXXFLAGS) $(DBUS_CXXFLAGS) $(FRONTEND_LIBZ_HEADERS) \ + -I$(CUBE4_HEADERS_ROOT) $(QT_CXXFLAGS) $(QT_CPPFLAGS) -DCUBE_PREFIX='"$(prefix)"' $(CUBE_INCLUDES) $(GUI_INCLUDES) $(HMI_INSTRUMENTATION) -I. +diff --git a/src/GUI-qt/plugins/SystemTopology/Makefile.system-topology.inc.am b/src/GUI-qt/plugins/SystemTopology/Makefile.system-topology.inc.am +index c7fff34..cbd4fd2 100644 +--- a/src/GUI-qt/plugins/SystemTopology/Makefile.system-topology.inc.am ++++ b/src/GUI-qt/plugins/SystemTopology/Makefile.system-topology.inc.am +@@ -43,7 +43,7 @@ $(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/SystemTopologyWidget.h\ + $(SRC_ROOT)src/GUI-qt/plugins/SystemTopology/TopologyDimensionBar.h + + +-topology_plugin_la_LIBADD = libcube4.la ++topology_plugin_la_LIBADD = libcube4.la libcube4gui.la + topology_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + topology_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_FOR_BUILD) $(OPENMP_CXXFLAGS) $(DBUS_CXXFLAGS) $(FRONTEND_LIBZ_HEADERS) \ + -I$(CUBE4_HEADERS_ROOT) $(QT_CXXFLAGS) $(QT_CPPFLAGS) -DCUBE_PREFIX='"$(prefix)"' $(CUBE_INCLUDES) $(GUI_INCLUDES) $(HMI_INSTRUMENTATION) -I. +diff --git a/src/GUI-qt/plugins/VampirPlugin/Makefile.vampir-plugin.inc.am b/src/GUI-qt/plugins/VampirPlugin/Makefile.vampir-plugin.inc.am +index 47ca741..ecebdef 100644 +--- a/src/GUI-qt/plugins/VampirPlugin/Makefile.vampir-plugin.inc.am ++++ b/src/GUI-qt/plugins/VampirPlugin/Makefile.vampir-plugin.inc.am +@@ -22,7 +22,7 @@ $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirConnecter.h \ + $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirConnectionDialog.h \ + $(SRC_ROOT)src/GUI-qt/plugins/VampirPlugin/VampirPlugin.h + +-vampir_plugin_la_LIBADD = libcube4.la ++vampir_plugin_la_LIBADD = libcube4.la libcube4gui.la + vampir_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + vampir_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_FOR_BUILD) $(OPENMP_CXXFLAGS) $(DBUS_CXXFLAGS) $(FRONTEND_LIBZ_HEADERS) \ + -I$(CUBE4_HEADERS_ROOT) $(QT_CXXFLAGS) $(QT_CPPFLAGS) -DCUBE_PREFIX='"$(prefix)"' $(CUBE_DEBUG_FLAGS) $(CUBE_INCLUDES) $(GUI_INCLUDES) $(HMI_INSTRUMENTATION) -I. +diff --git a/src/GUI-qt/plugins/launch/Makefile.launch-plugin.inc.am b/src/GUI-qt/plugins/launch/Makefile.launch-plugin.inc.am +index 6afd5e7..fe85e2a 100644 +--- a/src/GUI-qt/plugins/launch/Makefile.launch-plugin.inc.am ++++ b/src/GUI-qt/plugins/launch/Makefile.launch-plugin.inc.am +@@ -23,7 +23,7 @@ $(SRC_ROOT)src/GUI-qt/plugins/launch/Launch.h \ + $(SRC_ROOT)src/GUI-qt/plugins/launch/LaunchInfo.h \ + $(SRC_ROOT)src/GUI-qt/plugins/launch/LaunchPlugin.h + +-launch_plugin_la_LIBADD = libcube4.la ++launch_plugin_la_LIBADD = libcube4.la libcube4gui.la + launch_plugin_la_LDFLAGS = $(QT_LDFLAGS) $(OPENMP_LDFLAGS) $(OPENMP_CXXFLAGS) $(SUBLIBS) $(QT_LIBS) $(FRONTEND_LIBZ_LD) $(DBUS_LDFLAGS) + launch_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_FOR_BUILD) $(OPENMP_CXXFLAGS) $(DBUS_CXXFLAGS) $(FRONTEND_LIBZ_HEADERS) \ + -I$(CUBE4_HEADERS_ROOT) $(QT_CXXFLAGS) $(QT_CPPFLAGS) -DCUBE_PREFIX='"$(prefix)"' $(CUBE_DEBUG_FLAGS) $(CUBE_INCLUDES) $(GUI_INCLUDES) \ +diff --git a/src/cubew/Makefile.cubew.inc.am b/src/cubew/Makefile.cubew.inc.am +index 7639b59..51dfd80 100644 +--- a/src/cubew/Makefile.cubew.inc.am ++++ b/src/cubew/Makefile.cubew.inc.am +@@ -25,7 +25,7 @@ libcubewriter4_la_SOURCES = \ + $(SRC_ROOT)src/cubew/cubew_cubew.c \ + $(SRC_ROOT)src/cubew/cubew_cubew.h + +-#libcubewriter4_la_LIBADD = $(BACKEND_LIBZ) -lz ++libcubewriter4_la_LIBADD = libcube4w.la + libcubewriter4_la_LDFLAGS = -version-info @LIBRARY_INTERFACE_VERSION@ + + lib_LTLIBRARIES += libcube4w.la