--- rpl/src/Makefile.am	2017/06/05 14:30:49	1.110
+++ rpl/src/Makefile.am	2021/12/09 20:00:48	1.118
@@ -9,7 +9,8 @@ ldadd_libreadline = $(top_builddir)/tool
 include_libreadline = -I$(top_srcdir)/tools/@READLINE@ \
 		-I$(top_builddir)/tools/@READLINE@ -DREADLINE_LIBRARY
 
-ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a
+ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a \
+			   $(top_builddir)/tools/@GSL@/cblas/.libs/@LIB_PREFIX@gslcblas.a
 include_libgsl = -I$(top_builddir)/tools/@GSL@
 
 ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a
@@ -28,7 +29,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 +270,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=@MALLOC@
+LIB=@MALLOC@ @OPENMP@
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -450,7 +451,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) \
@@ -459,7 +460,7 @@ rpl_LDFLAGS = -g @PROFILAGE@ @EXPORT_DYN
 			  -Wl,--exclude-libs,libssl.a:libcrypto.a:libsqlite3.a:liblapack.a:libblas.a:librplcas.a:libncurses.a:libz.a:libgsl.a:libreadline.a:libhistory.a:libsigsegv.a
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ \
-		 -Wconversion
+		 -Wconversion -ftabstop=4
 rpl_CXXFLAGS = $(AM_CFLAGS) -Wall -Wextra
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
@@ -498,7 +499,7 @@ rpl_LDADD = \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
 		$(ldadd_libsqlite) $(ldadd_libsigsegv) $(ldadd_libz) \
-		$(ldadd_libgsl) $(ldadd_librplcas) @libMySQLlib@ @libPgSQLlib@ \
+		$(ldadd_librplcas) $(ldadd_libgsl) @libMySQLlib@ @libPgSQLlib@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		@WHOLE_LIB1@ \
@@ -517,7 +518,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 +528,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 +586,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