--- rpl/src/Makefile.am 2010/03/05 11:20:08 1.7 +++ rpl/src/Makefile.am 2010/05/16 19:36:19 1.23 @@ -14,16 +14,17 @@ ldadd_libiconv = $(top_builddir)/tools/@ include_libiconv = -I$(top_builddir)/tools/@ICONV@/include ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a -include_libcrypto = -I$(top_builddir)/tools/@ICONV@/include +ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/libssl.a +include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/include ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a -include_libsqlite = -I$(top_builddir)/tools/@SQLITE@/include +include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@ date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \ - awk '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \ + $(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); \ + $(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \ printf("%s\n", v);}')\"" hash := -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \ @@ -131,6 +132,7 @@ SRCC=\ instructions_m2.c\ instructions_m3.c\ instructions_m4.c\ + instructions_m5.c\ instructions_n1.c\ instructions_n2.c\ instructions_o1.c\ @@ -181,6 +183,7 @@ SRCC=\ profilage.c\ rpl.c\ rplcore.c\ + semaphores.c\ sequenceur.c\ simplification.c\ sommations.c\ @@ -224,7 +227,7 @@ INIT_EXE=init.c INIT_LIB=librpl.c -LIB=-lz @LIBMTMALLOC@ +LIB=-lz bin_PROGRAMS = rpl lib_LIBRARIES = librpl.a @@ -241,35 +244,35 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c) $(top_builddir)/rpliconv/rpliconv \ -f `$(top_builddir)/tools/@FILE@/src/rplfile \ -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ - awk -F= '{print $$2;}'` \ + $(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 $< | \ - awk -F= '{print $$2;}'` \ + $(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 $< | \ - awk -F= '{print $$2;}'` \ + $(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 $< | \ - awk -F= '{print $$2;}'` \ + $(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 $< | \ - awk -F= '{print $$2;}'` \ + $(AWK) -F= '{print $$2;}'` \ -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ licences: @@ -280,12 +283,12 @@ licences: echo "# define INCLUSION_LICENCE" >> $(srcdir)/licence.h echo " unsigned char CeCILL_fr[] =" >> $(srcdir)/licence.h sed -e '1,$$s/"/\\"/g' $(srcdir)/../Licence_CeCILL_V2-fr.txt | \ - awk -F'\n' '{ printf("\"%s\\n\"\n", $$1);}' \ + $(AWK) -F'\n' '{ printf("\"%s\\n\"\n", $$1);}' \ >> $(srcdir)/licence.h echo " ;" >> $(srcdir)/licence.h echo " unsigned char CeCILL_en[] =" >> $(srcdir)/licence.h sed -e '1,$$s/"/\\"/g' $(srcdir)/../Licence_CeCILL_V2-en.txt | \ - awk -F'\n' '{ printf("\"%s\\n\"\n", $$1);}' \ + $(AWK) -F'\n' '{ printf("\"%s\\n\"\n", $$1);}' \ >> $(srcdir)/licence.h echo " ;" >> $(srcdir)/licence.h echo "#endif" >> $(srcdir)/licence.h @@ -296,82 +299,103 @@ licences: cat $(srcdir)/../COPYING > $(srcdir)/tmp; \ echo >> $(srcdir)/tmp; \ echo >> $(srcdir)/tmp; \ - awk -F'\n' 'BEGIN {d=0;} /^#/ {d=1;} {if(d==1) print $$1;}' \ + $(AWK) -F'\n' 'BEGIN {d=0;} /^#/ {d=1;} {if(d==1) print $$1;}' \ $(srcdir)/$$i >> $(srcdir)/tmp; \ mv -f $(srcdir)/tmp $(srcdir)/$$i; \ done for i in $(SRCINC); \ do \ - iconv -f `file -i $(srcdir)/../COPYING | awk -F= '{print $$2;}'` \ + iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \ $(srcdir)/../COPYING | \ - awk -F'\n' '! (/^\/\*/ || /^\*\//) \ + $(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \ {printf("!%s\n", substr($$1,2));}' | \ iconv -t `file -i $(srcdir)/../COPYING | \ - awk -F= '{print $$2;}'` > $(srcdir)/tmp; \ - awk -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \ + $(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \ + $(AWK) -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \ $(srcdir)/$$i >> $(srcdir)/tmp; \ mv -f $(srcdir)/tmp $(srcdir)/$$i; \ done for i in $(SRCF); \ do \ - iconv -f `file -i $(srcdir)/../COPYING | awk -F= '{print $$2;}'` \ + iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \ $(srcdir)/../COPYING | \ - awk -F'\n' '! (/^\/\*/ || /^\*\//) \ + $(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \ {printf("C%s\n", substr($$1,2));}' | \ iconv -t `file -i $(srcdir)/../COPYING | \ - awk -F= '{print $$2;}'` > $(srcdir)/tmp; \ - awk -F'\n' 'BEGIN {d=0;} ! /^C/ {d=1;} {if(d==1) print $$1;}' \ + $(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \ + $(AWK) -F'\n' 'BEGIN {d=0;} ! /^C/ {d=1;} {if(d==1) print $$1;}' \ $(srcdir)/$$i >> $(srcdir)/tmp; \ mv -f $(srcdir)/tmp $(srcdir)/$$i; \ done for i in $(SRCF90); \ do \ - iconv -f `file -i $(srcdir)/../COPYING | awk -F= '{print $$2;}'` \ + iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \ $(srcdir)/../COPYING | \ - awk -F'\n' '! (/^\/\*/ || /^\*\//) \ + $(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \ {printf("!%s\n", substr($$1,2));}' | \ iconv -t `file -i $(srcdir)/../COPYING | \ - awk -F= '{print $$2;}'` > $(srcdir)/tmp; \ - awk -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \ + $(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \ + $(AWK) -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \ $(srcdir)/$$i >> $(srcdir)/tmp; \ mv -f $(srcdir)/tmp $(srcdir)/$$i; \ done librplprototypes.h: rpl.h conversion.awk - awk -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \ + $(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \ $(top_builddir)/src/librplprototypes.h + generateurs.c: generateurs_aleatoires.awk - awk -f $(srcdir)/generateurs_aleatoires.awk \ + $(AWK) -f $(srcdir)/generateurs_aleatoires.awk \ $(srcdir)/../tools/@GSL@/rng/gsl_rng.h > \ $(top_builddir)/src/generateurs.c +rpl.inc: + echo BUILDPATH=$(shell pwd)/.. > $@ + echo COMPILE=$(DEFS) >> $@ + echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@ + echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \ + librpl.conv.o >> $@ + echo EXTOBJECTS= @MALLOC@ \ + $(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) \ + >> $@ + EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \ $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \ conversion.awk generateurs_aleatoires.awk BUILT_SOURCES = librplprototypes.h generateurs.c \ $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) \ - $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) + $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) \ + rpl.inc CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \ - $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h + $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \ + rpl.inc rpl-librpl.conv.o nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \ $(SRCXPM) $(SRCINCc) -#rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic -rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -export-dynamic - -rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \ - -Wno-pointer-sign -Wno-unused-parameter +rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@ +rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \ + -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \ $(SRCXPM) $(SRCINCc) -librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL \ - -Wall -Wextra -Wno-pointer-sign -Wno-unused-parameter +librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \ + -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore -include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h +include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h rpl.inc \ + librplprototypes.h INCLUDES = -I$(srcdir) -I$(top_builddir) \ $(include_libreadline) $(include_libncurses) $(include_libgsl) \ @@ -381,39 +405,47 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \ @MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \ @VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \ + @SEMAPHORES_NOMMES@ \ @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \ - -Dd_locale=\"$(shell locale charmap)\" \ + -Dd_locale=\"@FINAL_ENCODING@\" \ -D@OS@ -rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \ +rpl_LDADD = @MALLOC@ \ + $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \ - $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libsqlite) \ + $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \ + $(ldadd_libsqlite) \ $(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@ always: $(top_builddir)/src/rpl.conv.c touch $(top_builddir)/src/rpl.conv.c; \ - (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCH) $(SRCINC) \ - $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); + if [ x$(shell which ctags) != x ]; then \ + (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \ + $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \ + fi; -.PHONY: always librpl licences +.PHONY: always librpl licences rpl.inc all-local: always install-exec-local: librpl librpl: install-libLIBRARIES - echo \ - open $(libdir)/librpl.a+ \ - addlib $(top_builddir)/lapack/lapack/liblapack.a+ \ - addlib $(top_builddir)/lapack/blas/libblas.a+ \ - addlib $(ldadd_libhistory)+ \ - addlib $(ldadd_libreadline)+ \ - addlib $(ldadd_libncurses)+ \ - addlib $(ldadd_libgsl)+ \ - addlib $(ldadd_libiconv)+ \ - addlib $(ldadd_libcrypto)+ \ - addlib $(ldadd_libsqlite)+ \ - save+ \ - end \ - | tr '+' '\n' | ar -M; \ - $(RANLIB) $(libdir)/librpl.a + if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi + \rm -rf $(top_builddir)/librpl/* + for i in $(top_builddir)/src/librpl.a \ + @MALLOC@ \ + $(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); \ + do \ + \cp -f $$i $(top_builddir)/librpl; \ + done + (cd $(top_builddir)/librpl && \ + for i in *.a; do ar x $$i && \rm -f $$i; done; \ + ar cr librpl.a *) + \mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a + \rm -rf $(top_builddir)/librpl + $(RANLIB) $(top_builddir)/src/librpl.a