--- rpl/src/Makefile.am	2011/07/24 14:44:10	1.55
+++ rpl/src/Makefile.am	2011/09/10 20:45:05	1.60
@@ -20,6 +20,9 @@ include_libcrypto = -I$(top_builddir)/to
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
+ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/libsigsegv.a
+include_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src
+
 ldadd_librplcas = @LIBRPLCAS@
 include_librplcas = -I$(top_builddir)/rplcas/include/giac \
 		-I$(top_builddir)/rplcas/include
@@ -139,6 +142,7 @@ SRCC=\
 	instructions_l3.c\
 	instructions_l4.c\
 	instructions_l5.c\
+	instructions_l6.c\
 	instructions_m1.c\
 	instructions_m2.c\
 	instructions_m3.c\
@@ -172,6 +176,7 @@ SRCC=\
 	instructions_s8.c\
 	instructions_s9.c\
 	instructions_s10.c\
+	instructions_s11.c\
 	instructions_t1.c\
 	instructions_t2.c\
 	instructions_t3.c\
@@ -375,8 +380,8 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE=$(DEFS) | sed -e '1,$$s/"/\\"/g' | \
-		sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' @ABI@ >> $@
+	echo COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \
+		sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@
 	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@
 	echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
 			$(SRCF90c:.F90=.$(OBJEXT)) \
@@ -393,6 +398,7 @@ rpl.inc:
 		$(ldadd_libssl) \
 		$(ldadd_libsqlite) \
 		$(ldadd_librplcas) \
+		$(ldadd_libsigsegv) \
 		>> $@
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
@@ -409,7 +415,7 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc)
 nodist_rpl_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
@@ -429,7 +435,7 @@ include_HEADERS = rplexternals.h rpltype
 INCLUDES = -I$(srcdir) -I$(top_builddir) \
 		$(include_libreadline) $(include_libncurses) $(include_libgsl) \
 		$(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
-		$(include_librplcas) \
+		$(include_librplcas) $(include_libsigsegv) \
 		@includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
@@ -444,7 +450,7 @@ rpl_LDADD = -lgfortran \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
-		$(ldadd_libsqlite) \
+		$(ldadd_libsqlite) $(ldadd_libsigsegv) \
 		$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@
 
 always: $(top_builddir)/src/rpl-conv.c
@@ -471,7 +477,7 @@ librpl: install-libLIBRARIES
 			$(top_builddir)/lapack/blas/libblas.a \
 			$(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
 			$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \
-			$(ldadd_librplcas); \
+			$(ldadd_librplcas) $(ldadd_libsigsegv); \
 	do \
 		cp -f $$i $(top_builddir)/librpl; \
 	done