--- rpl/src/Makefile.am	2015/01/27 14:18:05	1.98
+++ rpl/src/Makefile.am	2016/09/29 13:08:22	1.104
@@ -455,9 +455,8 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc)
 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@ \
+		-Wl,--exclude-libs,libssl.a:libcrypto.a
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ \
 		 -Wconversion
@@ -492,15 +491,18 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-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 = \
+		$(LIB) \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(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_libgsl) $(ldadd_librplcas) @libMySQLlib@ @libPgSQLlib@ \
+		@WHOLE_LIB1@ \
+		$(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
+		@WHOLE_LIB2@ @libX@ \
 		-lgfortran
 
 always: $(top_builddir)/src/rpl-conv.c
@@ -528,7 +530,7 @@ librpl: install-libLIBRARIES
 	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 +568,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; \