Pārlūkot izejas kodu

Fix compilation when FxT is not installed in a "standard" location.

Cyril Roelandt 12 gadi atpakaļ
vecāks
revīzija
a1a1d330de
2 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  1. 1 1
      mpi/src/Makefile.am
  2. 2 0
      tools/Makefile.am

+ 1 - 1
mpi/src/Makefile.am

@@ -31,7 +31,7 @@ lib_LTLIBRARIES = libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
 libstarpumpi_@STARPU_EFFECTIVE_VERSION@_la_LIBADD = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la
 libstarpumpi_@STARPU_EFFECTIVE_VERSION@_la_LDFLAGS = $(ldflags) -no-undefined					\
   -version-info $(LIBSTARPUMPI_INTERFACE_CURRENT):$(LIBSTARPUMPI_INTERFACE_REVISION):$(LIBSTARPUMPI_INTERFACE_AGE) \
-  $(MPICC_LDFLAGS)
+  $(MPICC_LDFLAGS) $(FXT_LDFLAGS)
 noinst_HEADERS =					\
 	starpu_mpi_private.h				\
 	starpu_mpi_fxt.h				\

+ 2 - 0
tools/Makefile.am

@@ -71,9 +71,11 @@ STARPU_TOOLS += 			\
 
 starpu_fxt_tool_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(FXT_CFLAGS)
 starpu_fxt_tool_LDADD = $(FXT_LIBS)
+starpu_fxt_tool_LDFLAGS = $(FXT_LDFLAGS)
 
 starpu_fxt_stats_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(FXT_CFLAGS)
 starpu_fxt_stats_LDADD = $(FXT_LIBS)
+starpu_fxt_stats_LDFLAGS = $(FXT_LDFLAGS)
 endif
 
 bin_PROGRAMS += 			\