--- rpl/src/Makefile.am 2011/10/10 16:38:29 1.69 +++ rpl/src/Makefile.am 2013/04/01 15:29:33 1.87 @@ -25,6 +25,9 @@ include_libsqlite = -I$(top_srcdir)/tool 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 @@ -73,6 +76,7 @@ SRCC=\ calcul_differentiel.c\ calcul_integral.c\ chainage.c\ + chiffrement.c\ compilation.c\ completion.c\ controle.c \ @@ -115,6 +119,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\ @@ -163,6 +169,7 @@ SRCC=\ instructions_p5.c\ instructions_p6.c\ instructions_p7.c\ + instructions_p8.c\ instructions_q1.c\ instructions_r1.c\ instructions_r2.c\ @@ -170,6 +177,7 @@ SRCC=\ instructions_r4.c\ instructions_r5.c\ instructions_r6.c\ + instructions_r7.c\ instructions_s1.c\ instructions_s2.c\ instructions_s3.c\ @@ -185,6 +193,7 @@ SRCC=\ instructions_t2.c\ instructions_t3.c\ instructions_u1.c\ + instructions_u2.c\ instructions_v1.c\ instructions_v2.c\ instructions_w1.c\ @@ -251,7 +260,7 @@ INIT_EXE=init.c INIT_LIB=librpl.c -LIB=-lz @MALLOC@ +LIB=@MALLOC@ bin_PROGRAMS = rpl lib_LIBRARIES = librpl.a @@ -266,49 +275,55 @@ INIT_LIBc=$(INIT_LIB:.c=-conv.c) INIT_EXEc=$(INIT_EXE:.c=-conv.c) %-conv.c: %.c - @RPLTOOLS@/rpliconv/rpliconv \ + @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 - @RPLTOOLS@/rpliconv/rpliconv \ + @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 - @RPLTOOLS@/rpliconv/rpliconv \ + @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 - @RPLTOOLS@/rpliconv/rpliconv \ + @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 - @RPLTOOLS@/rpliconv/rpliconv \ + @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 - @RPLTOOLS@/rpliconv/rpliconv \ + @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 @@ -328,7 +343,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;}' \ @@ -337,11 +352,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; \ @@ -349,11 +364,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; \ @@ -361,11 +376,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; \ @@ -373,23 +388,26 @@ 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 BUILDPATH=$(top_builddir)/.. > $@ + @echo 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)) \ + @echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ @ZLIB@ >> $@ + @echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \ $(SRCF90c:.F90=.$(OBJEXT)) \ librpl-conv.$(OBJEXT) >> $@ - echo EXTOBJECTS= @EXT_SQL@ \ + @echo EXTOBJECTS= @EXT_SQL@ \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) \ @@ -403,6 +421,7 @@ rpl.inc: $(ldadd_librplcas) \ $(ldadd_libsigsegv) \ $(ldadd_libmotif) \ + $(ldadd_libz) \ >> $@ EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \ @@ -420,10 +439,11 @@ nodist_rpl_SOURCES = \ $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \ $(SRCXPM) $(SRCINCc) rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ @WHOLE_LIB1@ \ - $(ldadd_libmotif) $(LD_MOTIF_LIBS) \ - $(LD_MOTIF_X_XMU) @WHOLE_LIB2@ + $(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_FFLAGS = $(AM_FFLAGS) -fno-f2c rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c @@ -431,7 +451,8 @@ 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_FFLAGS = $(AM_FFLAGS) -ff2c librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore @@ -442,8 +463,8 @@ INCLUDES = -I$(srcdir) -I$(top_builddir) $(include_libreadline) $(include_libncurses) $(include_libgsl) \ $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \ $(include_librplcas) $(include_libsigsegv) \ - $(include_libmotif) \ - @includeX@ @libMySQLinc@ @libPgSQLinc@ + $(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@ \ @@ -451,6 +472,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ @SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \ @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@ rpl_LDADD = -lgfortran \ @@ -462,8 +484,8 @@ rpl_LDADD = -lgfortran \ $(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@ always: $(top_builddir)/src/rpl-conv.c - touch $<; \ - if [ x$(shell which ctags) != x ]; then \ + @touch $<; + @if [ x$(shell which ctags) != x ]; then \ (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \ $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \ fi; @@ -475,11 +497,12 @@ all-local: always install-exec-local: librpl 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 \ @@ -489,10 +512,10 @@ librpl: install-libLIBRARIES 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; \ rm -f $$j; \ @@ -503,7 +526,7 @@ 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)"`; \ @@ -517,16 +540,16 @@ librpl: install-libLIBRARIES fi; \ done; \ if test -n "$$L"; then \ - echo -n "Adding files to librpl.a archive... "; \ + echo -n " Adding files to librpl.a archive... "; \ ar cru librpl.a $$L; \ rm -f $$L; \ echo "done"; \ fi; \ done; \ - echo Archive created; \ + echo " Archive created"; \ ar s librpl.a; \ if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \ - echo Stripping librpl.a && strip -d librpl.a; \ - fi;); \ + echo " STRIP librpl.a" && strip -d librpl.a; \ + fi;); $(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a