--- rpl/src/Makefile.am	2016/07/21 15:24:55	1.102
+++ rpl/src/Makefile.am	2016/10/11 12:40:10	1.107
@@ -22,8 +22,8 @@ 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@
@@ -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@ @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
@@ -490,16 +489,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@
 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_libz) \
-		$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@ \
+		$(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