diff --git a/scalasca/build-backend/Makefile.in b/scalasca/build-backend/Makefile.in
index 61d430a..57fc6ef 100644
--- a/scalasca/build-backend/Makefile.in
+++ b/scalasca/build-backend/Makefile.in
@@ -251,14 +251,14 @@ XFAIL_TESTS =
 
 @CROSS_BUILD_TRUE@am__append_7 = libpearl.thread.common.la \
 @CROSS_BUILD_TRUE@	libscout.common.la libepik.la
-@CROSS_BUILD_TRUE@am__append_8 = \
+@CROSS_BUILD_TRUE@am__append_8 = libpearl.base.la \
 @CROSS_BUILD_TRUE@    libpearl.thread.ser.la
 
 @CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@am__append_9 = \
 @CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@    libpearl.thread.omp.la
 
 @CROSS_BUILD_TRUE@am__append_10 = libpearl.ipc.mockup.la \
-@CROSS_BUILD_TRUE@	libpearl.base.la libpearl.replay.la
+@CROSS_BUILD_TRUE@	libpearl.replay.la
 
 # Explicitly add internal OTF2 writer library as automake will not
 # generate a dependency for it automatically (due to using AC_SUBST)
@@ -425,14 +425,14 @@ XFAIL_TESTS =
 
 @CROSS_BUILD_FALSE@am__append_32 = libpearl.thread.common.la \
 @CROSS_BUILD_FALSE@	libscout.common.la libepik.la
-@CROSS_BUILD_FALSE@am__append_33 = \
+@CROSS_BUILD_FALSE@am__append_33 = libpearl.base.la \
 @CROSS_BUILD_FALSE@    libpearl.thread.ser.la
 
 @CROSS_BUILD_FALSE@@OPENMP_SUPPORTED_TRUE@am__append_34 = \
 @CROSS_BUILD_FALSE@@OPENMP_SUPPORTED_TRUE@    libpearl.thread.omp.la
 
 @CROSS_BUILD_FALSE@am__append_35 = libpearl.ipc.mockup.la \
-@CROSS_BUILD_FALSE@	libpearl.base.la libpearl.replay.la
+@CROSS_BUILD_FALSE@	libpearl.replay.la
 
 # Explicitly add internal OTF2 writer library as automake will not
 # generate a dependency for it automatically (due to using AC_SUBST)
@@ -1009,7 +1009,7 @@ libpearl_ipc_mockup_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(LDFLAGS) -o $@
 @CROSS_BUILD_FALSE@am_libpearl_ipc_mockup_la_rpath = -rpath $(libdir)
 @CROSS_BUILD_TRUE@am_libpearl_ipc_mockup_la_rpath = -rpath $(libdir)
-libpearl_replay_la_LIBADD =
+libpearl_replay_la_LIBADD = libpearl.base.la
 am__libpearl_replay_la_SOURCES_DIST =  \
 	$(PEARL_REPLAY_SRC)/CallbackData.cpp \
 	$(PEARL_REPLAY_SRC)/CallbackManager.cpp \
@@ -1066,8 +1066,8 @@ libpearl_thread_common_la_OBJECTS =  \
 	$(am_libpearl_thread_common_la_OBJECTS)
 @CROSS_BUILD_FALSE@am_libpearl_thread_common_la_rpath =
 @CROSS_BUILD_TRUE@am_libpearl_thread_common_la_rpath =
-@CROSS_BUILD_FALSE@@OPENMP_SUPPORTED_TRUE@libpearl_thread_omp_la_DEPENDENCIES = libpearl.thread.common.la
-@CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@libpearl_thread_omp_la_DEPENDENCIES = libpearl.thread.common.la
+@CROSS_BUILD_FALSE@@OPENMP_SUPPORTED_TRUE@libpearl_thread_omp_la_DEPENDENCIES = libpearl.base.la libpearl.thread.common.la
+@CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@libpearl_thread_omp_la_DEPENDENCIES = libpearl.base.la libpearl.thread.common.la
 am__libpearl_thread_omp_la_SOURCES_DIST =  \
 	$(PEARL_THREAD_SRC)/Threading.h \
 	$(PEARL_THREAD_SRC)/Threading.cpp \
@@ -2248,10 +2248,10 @@ COMPUTE_MPI_LOG_COMPILER = $(srcdir)/../vendor/common/build-config/test-runner-m
 @CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@    $(AM_LDFLAGS) \
 @CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@    -version-info @PEARL_INTERFACE_VERSION@
 
-@CROSS_BUILD_FALSE@@OPENMP_SUPPORTED_TRUE@libpearl_thread_omp_la_LIBADD = \
+@CROSS_BUILD_FALSE@@OPENMP_SUPPORTED_TRUE@libpearl_thread_omp_la_LIBADD = -lgomp libpearl.base.la \
 @CROSS_BUILD_FALSE@@OPENMP_SUPPORTED_TRUE@    libpearl.thread.common.la
 
-@CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@libpearl_thread_omp_la_LIBADD = \
+@CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@libpearl_thread_omp_la_LIBADD = -lgomp libpearl.base.la \
 @CROSS_BUILD_TRUE@@OPENMP_SUPPORTED_TRUE@    libpearl.thread.common.la
 
 @CROSS_BUILD_FALSE@PEARL_IPC_SRC = $(SRC_ROOT)src/pearl/ipc
diff --git a/scalasca/build-mpi/Makefile.in b/scalasca/build-mpi/Makefile.in
index b50bf61..ceeac30 100644
--- a/scalasca/build-mpi/Makefile.in
+++ b/scalasca/build-mpi/Makefile.in
@@ -271,7 +271,7 @@ libpearl_ipc_mpi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libpearl_ipc_mpi_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-libpearl_mpi_la_LIBADD =
+libpearl_mpi_la_LIBADD = ${TOPDIR}/build-backend/libpearl.base.la
 am_libpearl_mpi_la_OBJECTS = libpearl_mpi_la-EventSet.lo \
 	libpearl_mpi_la-LocalData.lo libpearl_mpi_la-MpiAmListener.lo \
 	libpearl_mpi_la-MpiAmRequest.lo \
@@ -305,7 +305,10 @@ libpearl_mpi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libpearl_mpi_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-libpearl_writer_hyb_la_LIBADD =
+libpearl_writer_hyb_la_LIBADD = ${TOPDIR}/build-backend/libpearl.replay.la \
+	${TOPDIR}/build-backend/libpearl.base.la \
+	libpearl.mpi.la \
+	-lotf2
 am__libpearl_writer_hyb_la_SOURCES_DIST =  \
 	$(PEARL_WRITER_SRC)/Otf2Writer.cpp
 @OPENMP_SUPPORTED_TRUE@am_libpearl_writer_hyb_la_OBJECTS =  \
@@ -317,7 +320,8 @@ libpearl_writer_hyb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(libpearl_writer_hyb_la_LDFLAGS) $(LDFLAGS) -o $@
 @OPENMP_SUPPORTED_TRUE@am_libpearl_writer_hyb_la_rpath = -rpath \
 @OPENMP_SUPPORTED_TRUE@	$(libdir)
-libpearl_writer_mpi_la_LIBADD =
+libpearl_writer_mpi_la_LIBADD = ${TOPDIR}/build-backend/libpearl.replay.la \
+ libpearl.mpi.la -lotf2
 am_libpearl_writer_mpi_la_OBJECTS =  \
 	libpearl_writer_mpi_la-Otf2Writer.lo
 libpearl_writer_mpi_la_OBJECTS = $(am_libpearl_writer_mpi_la_OBJECTS)