--- rpl/src/Makefile.am 2013/10/28 08:09:03 1.94 +++ rpl/src/Makefile.am 2015/06/08 07:15:31 1.99 @@ -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\ @@ -565,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; \