--- rpl/src/Makefile.am 2013/04/27 08:56:25 1.88 +++ rpl/src/Makefile.am 2017/06/05 14:30:49 1.110 @@ -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 \ @@ -22,15 +22,14 @@ include_libcrypto = -I$(top_builddir)/to ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@ -ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a -include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src +ldadd_libsigsegv = @LIBSIGSEGV@ +include_libsigsegv = @INCSIGSEGV@ ldadd_libz = $(top_builddir)/tools/@ZLIB@/libz.a 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\ @@ -408,29 +409,37 @@ generateurs.c: generateurs_aleatoires.aw rpl.inc: @echo " BUILD $@" - @echo BUILDPATH=$(top_builddir)/.. > $@ - @echo COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \ + @echo RPL_BUILDPATH=$(top_builddir)/.. > $@ + @echo RPL_COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \ sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@ - @echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ @ZLIB@ >> $@ - @echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \ - $(SRCF90c:.F90=.$(OBJEXT)) \ + @echo -n RPL_LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ @LIBS@ -lgfortran >> $@ + @if [ -f $(top_builddir)/tools/openmotif.lib ]; then \ + $(AWK) -F= '/^LD_MOTIF_LIBS/ { printf(" %s", $$2); }' \ + $(top_builddir)/tools/openmotif.lib >> $@; \ + $(AWK) -F= '/^LD_MOTIF_X_XMU/ { printf(" %s", $$2); }' \ + $(top_builddir)/tools/openmotif.lib >> $@; \ + fi + @echo >> $@ + @echo RPL_FLAGS=-Wno-pointer-sign >> $@ + @echo RPL_OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \ + $(SRCF90c:.F90=.$(OBJEXT)) $(SRCCPPc:.cpp=.$(OBJEXT)) \ librpl-conv.$(OBJEXT) >> $@ - @echo EXTOBJECTS= @EXT_SQL@ \ - $(top_builddir)/lapack/lapack/liblapack.a \ - $(top_builddir)/lapack/blas/libblas.a \ - $(ldadd_libhistory) \ - $(ldadd_libreadline) \ - $(ldadd_libncurses) \ - $(ldadd_libgsl) \ - $(ldadd_libiconv) \ - $(ldadd_libcrypto) \ - $(ldadd_libssl) \ - $(ldadd_libsqlite) \ - $(ldadd_librplcas) \ - $(ldadd_libsigsegv) \ - $(ldadd_libmotif) \ - $(ldadd_libz) \ - >> $@ + @echo RPL_EXTOBJECTS= @EXT_SQL@ \ + $(top_builddir)/lapack/lapack/liblapack.a \ + $(top_builddir)/lapack/blas/libblas.a \ + $(ldadd_libhistory) \ + $(ldadd_libreadline) \ + $(ldadd_libncurses) \ + $(ldadd_libgsl) \ + $(ldadd_libiconv) \ + $(ldadd_libcrypto) \ + $(ldadd_libssl) \ + $(ldadd_libsqlite) \ + $(ldadd_librplcas) \ + $(ldadd_libsigsegv) \ + $(ldadd_libmotif) \ + $(ldadd_libz) \ + >> $@ EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \ $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \ @@ -446,12 +455,12 @@ 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@ @CYGWIN_LDFLAGS@ \ + -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:libsigsegv.a rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \ -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ \ -Wconversion +rpl_CXXFLAGS = $(AM_CFLAGS) -Wall -Wextra rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c @@ -461,6 +470,7 @@ nodist_librpl_a_SOURCES = \ librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \ -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ \ -Wconversion +librpl_a_CXXFLAGS = $(AM_CFLAGS) -Wall -Wextra librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore @@ -479,22 +489,27 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ @VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \ @SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \ @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \ + @BROKEN_SIGSEGV@ \ -Dd_locale=\"@FINAL_ENCODING@\" \ -Dd_forced_locale=@FORCED_FINAL_ENCODING@ \ - -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@ \ - @PSELECT@ -rpl_LDADD = -lgfortran \ - $(top_builddir)/lapack/lapack/liblapack.a \ - $(top_builddir)/lapack/blas/libblas.a \ + -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@ +rpl_LDADD = \ + $(LIB) \ $(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@ \ + $(top_builddir)/lapack/lapack/liblapack.a \ + $(top_builddir)/lapack/blas/libblas.a \ + @WHOLE_LIB1@ \ + $(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \ + @WHOLE_LIB2@ @libX@ \ + -lgfortran always: $(top_builddir)/src/rpl-conv.c @touch $<; @if [ x$(shell which ctags) != x ]; then \ - (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \ + (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCCPP) \ $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \ fi; @@ -502,7 +517,15 @@ 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; \ + if [ @OS@ = Cygwin ]; then \ + cp $(top_builddir)/src/rpl.exe.a $(DESTDIR)$(libdir)/rpl.exe.a; \ + fi; \ + fi librpl: install-libLIBRARIES @echo " BUILD $@" @@ -511,7 +534,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) \ @@ -525,7 +548,7 @@ librpl: install-libLIBRARIES for i in *.a; \ do echo " Extracting $$i"; ar x $$i; \ for j in `ar t $$i`; \ - do cp -f $$j $$n-$$j; \ + do cp -f $$j rpl-$$n-$$j; \ rm -f $$j; \ done; \ n=`expr $$n + 1`; \ @@ -549,7 +572,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; \ @@ -560,4 +583,3 @@ librpl: install-libLIBRARIES echo " STRIP librpl.a" && strip -d librpl.a; \ fi;); $(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a -