--- rpl/src/Makefile.am	2011/06/24 09:10:37	1.53
+++ rpl/src/Makefile.am	2011/08/29 07:43:01	1.58
@@ -20,7 +20,7 @@ include_libcrypto = -I$(top_builddir)/to
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
-ldadd_librplcas = $(top_builddir)/rplcas/lib/librplcas.a
+ldadd_librplcas = @LIBRPLCAS@
 include_librplcas = -I$(top_builddir)/rplcas/include/giac \
 		-I$(top_builddir)/rplcas/include
 
@@ -139,6 +139,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 +173,7 @@ SRCC=\
 	instructions_s8.c\
 	instructions_s9.c\
 	instructions_s10.c\
+	instructions_s11.c\
 	instructions_t1.c\
 	instructions_t2.c\
 	instructions_t3.c\
@@ -375,7 +377,7 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE=$(DEFS) | sed -e '1,$$s/"/\\"/g' | \
+	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)) \
@@ -392,6 +394,7 @@ rpl.inc:
 		$(ldadd_libcrypto) \
 		$(ldadd_libssl) \
 		$(ldadd_libsqlite) \
+		$(ldadd_librplcas) \
 		>> $@
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
@@ -437,7 +440,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
-		-D@OS@ @BSH_PATH@
+		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\"
 rpl_LDADD = -lgfortran \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \