--- rpl/src/Makefile.am	2015/01/27 14:18:05	1.98
+++ 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
@@ -22,13 +23,13 @@ include_libcrypto = -I$(top_builddir)/to
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
-ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a
-include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src
+ldadd_libsigsegv = @LIBSIGSEGV@
+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,17 +451,16 @@ 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) \
 		$(SRCXPM) $(SRCINCc)
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ @WHOLE_LIB1@ \
-		$(ldadd_libmotif) $(ldadd_libz) $(LD_MOTIF_LIBS) \
-		$(LD_MOTIF_X_XMU) @WHOLE_LIB2@
+rpl_LDFLAGS = -g @PROFILAGE@ @EXPORT_DYNAMIC@ @ELF@ @CYGWIN_LDFLAGS@ \
+			  -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
@@ -490,17 +490,21 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
 		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
+		@BROKEN_SIGSEGV@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-Dd_forced_locale=@FORCED_FINAL_ENCODING@ \
-		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@ \
-		@PSELECT@
+		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@
 rpl_LDADD = \
-		$(top_builddir)/lapack/lapack/liblapack.a \
-		$(top_builddir)/lapack/blas/libblas.a \
+		$(LIB) \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
-		$(ldadd_libsqlite) $(ldadd_libsigsegv) \
-		$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@ \
+		$(ldadd_libsqlite) $(ldadd_libsigsegv) $(ldadd_libz) \
+		$(ldadd_librplcas) $(ldadd_libgsl) @libMySQLlib@ @libPgSQLlib@ \
+		$(top_builddir)/lapack/lapack/liblapack.a \
+		$(top_builddir)/lapack/blas/libblas.a \
+		@WHOLE_LIB1@ \
+		$(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
+		@WHOLE_LIB2@ @libX@ \
 		-lgfortran
 
 always: $(top_builddir)/src/rpl-conv.c
@@ -514,21 +518,27 @@ 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 \
 		echo "  STRIP  rpl" && strip -d $(DESTDIR)$(bindir)/rpl; \
+		if [ @OS@ = Cygwin ]; then \
+			cp $(top_builddir)/src/rpl.exe.a $(DESTDIR)$(libdir)/rpl.exe.a; \
+		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; \
 	fi
 	@mkdir -p $(top_builddir)/librpl;
 	@for i in $(top_builddir)/src/librpl.a \
-			$(ldadd_libhistory) $(ldadd_libreadline) \
+			$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libz) \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \
 			$(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
@@ -566,7 +576,7 @@ librpl: install-libLIBRARIES
 				done; \
 				if test -n "$$L"; then \
 					echo -n "    Adding files to librpl.a archive... "; \
-					ar cru librpl.a $$L; \
+					ar cr librpl.a $$L; \
 					rm -f $$L; \
 					echo "done"; \
 				fi; \
@@ -576,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