--- rpl/src/Makefile.am 2014/06/09 08:26:29 1.95 +++ rpl/src/Makefile.am 2015/06/15 10:26:32 1.100 @@ -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 \ @@ -75,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\ @@ -209,6 +210,7 @@ SRCC=\ instructions_x2.c\ instructions_y1.c\ interface_gnuplot.c\ + interface_readline.c\ interface_tex.c\ interruptions.c\ messages.c\ @@ -497,7 +499,7 @@ rpl_LDADD = \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \ $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \ - $(ldadd_libsqlite) $(ldadd_libsigsegv) \ + $(ldadd_libsqlite) $(ldadd_libsigsegv) $(ldadd_libz) \ $(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@ \ -lgfortran @@ -526,7 +528,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) \ @@ -564,7 +566,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; \