--- rpl/src/Makefile.am 2011/09/10 20:45:05 1.60 +++ rpl/src/Makefile.am 2015/06/08 07:15:31 1.99 @@ -1,4 +1,6 @@ -ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a +-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 \ -I$(top_srcdir)/tools/@NCURSES@/include @@ -7,53 +9,65 @@ ldadd_libreadline = $(top_builddir)/tool include_libreadline = -I$(top_srcdir)/tools/@READLINE@ \ -I$(top_builddir)/tools/@READLINE@ -DREADLINE_LIBRARY -ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/libgsl.a +ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a include_libgsl = -I$(top_builddir)/tools/@GSL@ -ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a +ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a include_libiconv = -I$(top_builddir)/tools/@ICONV@/include -ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a -ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/libssl.a +ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a +ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/include -ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a +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/libsigsegv.a -include_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src +ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a +include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src + +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@ -date = -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \ - $(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \ - printf("%s\n", v);}')\"" \ - -Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \ - $(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \ - printf("%s\n", v);}')\"" +ldadd_libmotif = @LIBMOTIF@ +include_libmotif = @INCMOTIF@ +date = -Dd_date_rpl="\"$(shell LC_ALL=C date +'%A' | \ + $(AWK) '/Monday/ { printf("Lundi"); } \ + /Tuesday/ { printf("Mardi"); } \ + /Wednesday/ { printf("Mercredi"); } \ + /Thursday/ { printf("Jeudi"); } \ + /Friday/ { printf("Vendredi"); } \ + /Saturday/ { printf("Samedi"); } \ + /Sunday/ { printf("Dimanche"); }') \ + $(shell LC_ALL=C date +'%d/%m/%Y, %X %Z' | \ + $(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \ + printf("%s\n", v);}')\"" \ + -Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \ + $(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \ + printf("%s\n", v);}')\"" -hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \ +hash = -Drplpp_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \ $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \ - -Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \ + -Drplpp_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \ $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \ - -Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \ + -Drplfile_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \ $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \ - -Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \ + -Drplfile_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \ $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \ - -Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \ + -Drpliconv_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \ $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \ - -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \ + -Drpliconv_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \ $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \ - -Drplawk_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \ + -Drplawk_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \ $(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \ - -Drplawk_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \ + -Drplawk_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \ $(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \ - -Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \ + -Drplconvert_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \ $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \ - -Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \ + -Drplconvert_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \ $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" SRCC=\ @@ -61,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\ @@ -69,6 +84,7 @@ SRCC=\ calcul_differentiel.c\ calcul_integral.c\ chainage.c\ + chiffrement.c\ compilation.c\ completion.c\ controle.c \ @@ -111,6 +127,8 @@ SRCC=\ instructions_c5.c\ instructions_c6.c\ instructions_c7.c\ + instructions_c8.c\ + instructions_c9.c\ instructions_d1.c\ instructions_d2.c\ instructions_d3.c\ @@ -159,6 +177,7 @@ SRCC=\ instructions_p5.c\ instructions_p6.c\ instructions_p7.c\ + instructions_p8.c\ instructions_q1.c\ instructions_r1.c\ instructions_r2.c\ @@ -166,6 +185,7 @@ SRCC=\ instructions_r4.c\ instructions_r5.c\ instructions_r6.c\ + instructions_r7.c\ instructions_s1.c\ instructions_s2.c\ instructions_s3.c\ @@ -181,6 +201,7 @@ SRCC=\ instructions_t2.c\ instructions_t3.c\ instructions_u1.c\ + instructions_u2.c\ instructions_v1.c\ instructions_v2.c\ instructions_w1.c\ @@ -189,6 +210,7 @@ SRCC=\ instructions_x2.c\ instructions_y1.c\ interface_gnuplot.c\ + interface_readline.c\ interface_tex.c\ interruptions.c\ messages.c\ @@ -201,7 +223,6 @@ SRCC=\ rplcore.c\ semaphores.c\ sequenceur.c\ - siginfo.c\ simplification.c\ sommations.c\ sql.c\ @@ -248,7 +269,7 @@ INIT_EXE=init.c INIT_LIB=librpl.c -LIB=-lz @MALLOC@ +LIB=@MALLOC@ bin_PROGRAMS = rpl lib_LIBRARIES = librpl.a @@ -263,49 +284,55 @@ INIT_LIBc=$(INIT_LIB:.c=-conv.c) INIT_EXEc=$(INIT_EXE:.c=-conv.c) %-conv.c: %.c - $(top_builddir)/rpliconv/rpliconv \ - -f `$(top_builddir)/tools/@FILE@/src/rplfile \ - -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ + @echo " CONV $<" + @@RPLTOOLS@/rpliconv/rpliconv \ + -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \ + -m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \ $(AWK) -F= '{print $$2;}'` \ -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %-conv.cpp: %.cpp - $(top_builddir)/rpliconv/rpliconv \ - -f `$(top_builddir)/tools/@FILE@/src/rplfile \ - -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ + @echo " CONV $<" + @@RPLTOOLS@/rpliconv/rpliconv \ + -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \ + -m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \ $(AWK) -F= '{print $$2;}'` \ -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %-conv.h: %.h - $(top_builddir)/rpliconv/rpliconv \ - -f `$(top_builddir)/tools/@FILE@/src/rplfile \ - -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ + @echo " CONV $<" + @@RPLTOOLS@/rpliconv/rpliconv \ + -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \ + -m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \ $(AWK) -F= '{print $$2;}'` \ -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %-conv.f: %.f - $(top_builddir)/rpliconv/rpliconv \ - -f `$(top_builddir)/tools/@FILE@/src/rplfile \ - -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ + @echo " CONV $<" + @@RPLTOOLS@/rpliconv/rpliconv \ + -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \ + -m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \ $(AWK) -F= '{print $$2;}'` \ -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %-conv.F90: %.F90 - $(top_builddir)/rpliconv/rpliconv \ - -f `$(top_builddir)/tools/@FILE@/src/rplfile \ - -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ + @echo " CONV $<" + @@RPLTOOLS@/rpliconv/rpliconv \ + -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \ + -m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \ $(AWK) -F= '{print $$2;}'` \ -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %-conv.inc: %.inc - $(top_builddir)/rpliconv/rpliconv \ - -f `$(top_builddir)/tools/@FILE@/src/rplfile \ - -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ + @echo " CONV $<" + @@RPLTOOLS@/rpliconv/rpliconv \ + -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \ + -m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \ $(AWK) -F= '{print $$2;}'` \ -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ licences: - cat $(srcdir)/../COPYING > $(srcdir)/licence.h + cat $(srcdir)/../HEADER > $(srcdir)/licence.h echo >> $(srcdir)/licence.h echo >> $(srcdir)/licence.h echo "#ifndef INCLUSION_LICENCE" >> $(srcdir)/licence.h @@ -325,7 +352,7 @@ licences: echo "// vim: ts=4" >> $(srcdir)/licence.h for i in $(SRCC) $(SRCCPP) $(SRCH) $(INIT_EXE) $(INIT_LIB); \ do \ - cat $(srcdir)/../COPYING > $(srcdir)/tmp; \ + cat $(srcdir)/../HEADER > $(srcdir)/tmp; \ echo >> $(srcdir)/tmp; \ echo >> $(srcdir)/tmp; \ $(AWK) -F'\n' 'BEGIN {d=0;} /^#/ {d=1;} {if(d==1) print $$1;}' \ @@ -334,11 +361,11 @@ licences: done for i in $(SRCINC); \ do \ - iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \ - $(srcdir)/../COPYING | \ + iconv -f `file -i $(srcdir)/../HEADER | $(AWK) -F= '{print $$2;}'` \ + $(srcdir)/../HEADER | \ $(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \ {printf("!%s\n", substr($$1,2));}' | \ - iconv -t `file -i $(srcdir)/../COPYING | \ + iconv -t `file -i $(srcdir)/../HEADER | \ $(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \ $(AWK) -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \ $(srcdir)/$$i >> $(srcdir)/tmp; \ @@ -346,11 +373,11 @@ licences: done for i in $(SRCF); \ do \ - iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \ - $(srcdir)/../COPYING | \ + iconv -f `file -i $(srcdir)/../HEADER | $(AWK) -F= '{print $$2;}'` \ + $(srcdir)/../HEADER | \ $(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \ {printf("C%s\n", substr($$1,2));}' | \ - iconv -t `file -i $(srcdir)/../COPYING | \ + iconv -t `file -i $(srcdir)/../HEADER | \ $(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \ $(AWK) -F'\n' 'BEGIN {d=0;} ! /^C/ {d=1;} {if(d==1) print $$1;}' \ $(srcdir)/$$i >> $(srcdir)/tmp; \ @@ -358,11 +385,11 @@ licences: done for i in $(SRCF90); \ do \ - iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \ - $(srcdir)/../COPYING | \ + iconv -f `file -i $(srcdir)/../HEADER | $(AWK) -F= '{print $$2;}'` \ + $(srcdir)/../HEADER | \ $(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \ {printf("!%s\n", substr($$1,2));}' | \ - iconv -t `file -i $(srcdir)/../COPYING | \ + iconv -t `file -i $(srcdir)/../HEADER | \ $(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \ $(AWK) -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \ $(srcdir)/$$i >> $(srcdir)/tmp; \ @@ -370,36 +397,49 @@ licences: done librplprototypes.h: rpl.h conversion.awk - $(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \ + @echo " AWK $@" + @$(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \ $(top_builddir)/src/librplprototypes.h generateurs.c: generateurs_aleatoires.awk - $(AWK) -f $(srcdir)/generateurs_aleatoires.awk \ + @echo " AWK $@" + @$(AWK) -f $(srcdir)/generateurs_aleatoires.awk \ $(srcdir)/../tools/@GSL@/rng/gsl_rng.h > \ $(top_builddir)/src/generateurs.c rpl.inc: - echo BUILDPATH=$(top_builddir)/.. > $@ - echo COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \ + @echo " BUILD $@" + @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@ -lz >> $@ - 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) \ - >> $@ + @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) \ @@ -415,9 +455,13 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc) nodist_rpl_SOURCES = \ $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \ $(SRCXPM) $(SRCINCc) -rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ +rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ @WHOLE_LIB1@ \ + $(ldadd_libmotif) $(ldadd_libz) $(LD_MOTIF_LIBS) \ + $(LD_MOTIF_X_XMU) @WHOLE_LIB2@ rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \ - -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ + -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 @@ -425,7 +469,9 @@ nodist_librpl_a_SOURCES = \ $(SRCCc) $(SRCHc) $(SRCFc) $(SRCCPPc) $(SRCF90c) $(INIT_LIBc) \ $(SRCXPM) $(SRCINCc) librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \ - -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ + -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 @@ -436,27 +482,31 @@ INCLUDES = -I$(srcdir) -I$(top_builddir) $(include_libreadline) $(include_libncurses) $(include_libgsl) \ $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \ $(include_librplcas) $(include_libsigsegv) \ - @includeX@ @libMySQLinc@ @libPgSQLinc@ -DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \ + $(include_libmotif) $(include_libz) \ + @SYSROOT@ @includeX@ @libMySQLinc@ @libPgSQLinc@ +DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \ -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \ @MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \ @VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \ @SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \ @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \ -Dd_locale=\"@FINAL_ENCODING@\" \ - -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" -rpl_LDADD = -lgfortran \ + -Dd_forced_locale=@FORCED_FINAL_ENCODING@ \ + -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@ \ + @PSELECT@ +rpl_LDADD = \ $(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_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@ \ + -lgfortran always: $(top_builddir)/src/rpl-conv.c - touch $<; \ - if [ x$(shell which ctags) != x ]; then \ - (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \ + @touch $<; + @if [ x$(shell which ctags) != x ]; then \ + (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCCPP) \ $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \ fi; @@ -464,29 +514,35 @@ 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 - if [ -d $(top_builddir)/librpl ]; then \ + @echo " BUILD $@" + @if [ -d $(top_builddir)/librpl ]; then \ rm -rf $(top_builddir)/librpl; \ fi - mkdir -p $(top_builddir)/librpl; \ - for i in $(top_builddir)/src/librpl.a \ + @mkdir -p $(top_builddir)/librpl; + @for i in $(top_builddir)/src/librpl.a \ $(ldadd_libhistory) $(ldadd_libreadline) \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \ $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \ - $(ldadd_librplcas) $(ldadd_libsigsegv); \ + $(ldadd_librplcas) $(ldadd_libsigsegv) $(ldadd_libmotif); \ do \ cp -f $$i $(top_builddir)/librpl; \ done - (cd $(top_builddir)/librpl && n=0 && \ - echo Building standalone librpl.a; \ + @(cd $(top_builddir)/librpl && n=0 && \ + echo " Building standalone librpl.a"; \ for i in *.a; \ - do echo Extracting $$i; ar x $$i; \ + 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`; \ @@ -495,30 +551,29 @@ librpl: install-libLIBRARIES L="start"; \ while test -n "$$L"; \ do \ - echo -n "Remaining files "; \ + echo -n " Remaining files "; \ find . -name "*.$(OBJEXT)" | wc -l; \ L=""; j=0; \ for i in `find . -name "*.$(OBJEXT)"`; \ do \ k=`echo $$i | wc -c`; \ j=`expr $$j + $$k + 1`; \ - if test $$j -le 5000; then \ + if test $$j -le 8000; then \ L="$$L $$i"; \ else \ break; \ fi; \ done; \ if test -n "$$L"; then \ - echo -n "Adding files to librpl.a archive... "; \ - ar cru librpl.a $$L; \ + echo -n " Adding files to librpl.a archive... "; \ + ar cr librpl.a $$L; \ rm -f $$L; \ echo "done"; \ fi; \ done; \ - echo Archive created; \ + echo " Archive created"; \ ar s librpl.a; \ - if [ @OS@ != OS2 ]; then \ - echo Stripping librpl.a && strip -d librpl.a; \ - fi;); \ + if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \ + echo " STRIP librpl.a" && strip -d librpl.a; \ + fi;); $(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a -