--- rpl/src/Makefile.am	2017/06/05 14:30:49	1.110
+++ rpl/src/Makefile.am	2019/02/07 21:44:14	1.116
@@ -28,7 +28,7 @@ include_libsigsegv = @INCSIGSEGV@
 ldadd_libz = $(top_builddir)/tools/@ZLIB@/libz.a
 include_libz = -I$(top_builddir)/tools/@ZLIB@
 
-ldadd_librplcas = @LIBRPLCAS@
+ldadd_librplcas = @LIBRPLCAS@ @LIBGIAC@
 include_librplcas = @INCRPLCAS@
 
 ldadd_libmotif = @LIBMOTIF@
@@ -269,7 +269,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=@MALLOC@
+LIB=@MALLOC@ @OPENMP@
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -450,7 +450,7 @@ BUILT_SOURCES = librplprototypes.h gener
 		rpl.inc
 CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(SRCINCc) \
 		$(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
-		rpl.inc rpl-librpl-conv.$(OBJEXT)
+		rpl.inc
 
 nodist_rpl_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
@@ -517,7 +517,7 @@ always: $(top_builddir)/src/rpl-conv.c
 
 all-local: always
 
-install-exec-local: librpl s-rpl
+install-exec-local: s-librpl s-rpl
 
 s-rpl: install-binPROGRAMS
 	@if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
@@ -527,7 +527,10 @@ s-rpl: install-binPROGRAMS
 		fi; \
 	fi
 
-librpl: install-libLIBRARIES
+s-librpl: install-libLIBRARIES librpl
+	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a
+
+librpl:
 	@echo "  BUILD  $@"
 	@if [ -d $(top_builddir)/librpl ]; then \
 		rm -rf $(top_builddir)/librpl; \
@@ -582,4 +585,3 @@ librpl: install-libLIBRARIES
 			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
 				echo "  STRIP  librpl.a" && strip -d librpl.a; \
 			fi;);
-	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a