--- rpl/src/Makefile.am	2013/10/26 14:17:53	1.93
+++ rpl/src/Makefile.am	2016/10/07 15:45:52	1.105
@@ -1,4 +1,4 @@
-include $(top_builddir)/tools/openmotif.lib
+-include $(top_builddir)/tools/openmotif.lib
 
 ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a
 include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \
@@ -29,8 +29,7 @@ ldadd_libz = $(top_builddir)/tools/@ZLIB
 include_libz = -I$(top_builddir)/tools/@ZLIB@
 
 ldadd_librplcas = @LIBRPLCAS@
-include_librplcas = -I$(top_builddir)/rplcas/include/giac \
-		-I$(top_builddir)/rplcas/include
+include_librplcas = @INCRPLCAS@
 
 ldadd_libmotif = @LIBMOTIF@
 include_libmotif = @INCMOTIF@
@@ -76,6 +75,7 @@ SRCC=\
 	algebre_lineaire2.c\
 	algebre_lineaire3.c\
 	algebre_lineaire4.c\
+	allocateur.c\
 	analyse.c\
 	analyse_notation_algebrique.c\
 	analyse_notation_rpn.c\
@@ -210,6 +210,7 @@ SRCC=\
 	instructions_x2.c\
 	instructions_y1.c\
 	interface_gnuplot.c\
+	interface_readline.c\
 	interface_tex.c\
 	interruptions.c\
 	messages.c\
@@ -454,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:libsqlite3.a:liblapack.a:libblas.a:librplcas.a:libncurses.a:libz.a:libgsl.a:libreadline.a:libhistory.a
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ \
 		 -Wconversion
@@ -491,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
@@ -513,7 +516,12 @@ always: $(top_builddir)/src/rpl-conv.c
 
 all-local: always
 
-install-exec-local: librpl
+install-exec-local: librpl s-rpl
+
+s-rpl: install-binPROGRAMS
+	@if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
+		echo "  STRIP  rpl" && strip -d $(DESTDIR)$(bindir)/rpl; \
+	fi
 
 librpl: install-libLIBRARIES
 	@echo "  BUILD  $@"
@@ -522,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) \
@@ -560,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; \
@@ -570,8 +578,4 @@ librpl: install-libLIBRARIES
 			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
 				echo "  STRIP  librpl.a" && strip -d librpl.a; \
 			fi;);
-	@if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
-		echo "  STRIP  rpl" && strip -d rpl; \
-	fi
 	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a
-