Do not use AM_LIBADD, that does not exist in automake

socl/src/Makefile.am

@@ -20,7 +20,7 @@ CLEANFILES = *.gcno *.gcda
 
 AM_CFLAGS = $(GLOBAL_AM_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(HWLOC_CFLAGS) $(FXT_CFLAGS)
 AM_CPPFLAGS = -DBUILDING_SOCL -I$(top_srcdir)/include/ -I$(top_builddir)/include -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/socl/src
-AM_LIBADD = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la \
+LIBS = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la \
 	    $(STARPU_OPENCL_LDFLAGS) $(FXT_LDFLAGS)
 
 SUBDIRS =
@@ -51,7 +51,6 @@ noinst_HEADERS =				\
   CL/cl_gl.h					\
   CL/opencl.h
 
-libsocl_@STARPU_EFFECTIVE_VERSION@_la_LIBADD = $(AM_LIBADD)
 libsocl_@STARPU_EFFECTIVE_VERSION@_la_LDFLAGS = $(ldflags) -no-undefined			\
   -version-info $(LIBSOCL_INTERFACE_CURRENT):$(LIBSOCL_INTERFACE_REVISION):$(LIBSOCL_INTERFACE_AGE)
 

starpurm/src/Makefile.am

@@ -24,16 +24,13 @@ AM_CPPFLAGS	= -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
 AM_CPPFLAGS	+= -I$(top_srcdir)/starpurm/include -I$(top_srcdir)/starpurm/src -I$(top_builddir)/starpurm/src -I$(top_builddir)/starpurm/include
 AM_CFLAGS	= -Wall -g $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(FXT_CFLAGS) $(MAGMA_CFLAGS) $(HWLOC_CFLAGS) $(GLOBAL_AM_CFLAGS) $(NMAD_CFLAGS)
 AM_LDFLAGS	= $(STARPU_OPENCL_LDFLAGS) $(STARPU_CUDA_LDFLAGS) $(STARPU_COI_LDFLAGS) $(STARPU_SCIF_LDFLAGS) $(NMAD_LDFLAGS)
-AM_LIBADD	=
 
 libstarpurm_so_version = $(LIBSTARPURM_INTERFACE_CURRENT):$(LIBSTARPURM_INTERFACE_REVISION):$(LIBSTARPURM_INTERFACE_AGE)
 
 lib_LTLIBRARIES = libstarpurm-@STARPU_EFFECTIVE_VERSION@.la
 
-libstarpurm_@STARPU_EFFECTIVE_VERSION@_la_CPPFLAGS	= $(AM_CPPFLAGS)
-libstarpurm_@STARPU_EFFECTIVE_VERSION@_la_CFLAGS	= $(AM_CFLAGS)
-libstarpurm_@STARPU_EFFECTIVE_VERSION@_la_LDFLAGS	= $(AM_LDFLAGS) -no-undefined -version-info $(libstarpurm_so_version)
-libstarpurm_@STARPU_EFFECTIVE_VERSION@_la_LIBADD	= $(AM_LIBADD) $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la $(HWLOC_LIBS)
+libstarpurm_@STARPU_EFFECTIVE_VERSION@_la_LDFLAGS	= $(ldflags) -no-undefined -version-info $(libstarpurm_so_version)
+libstarpurm_@STARPU_EFFECTIVE_VERSION@_la_LIBADD	= $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la $(HWLOC_LIBS)
 libstarpurm_@STARPU_EFFECTIVE_VERSION@_la_SOURCES	= \
 	starpurm.c