--- rpl/src/Makefile.am 2010/04/21 13:45:43 1.17 +++ rpl/src/Makefile.am 2010/05/24 20:07:11 1.25 @@ -20,14 +20,14 @@ include_libcrypto = -I$(top_builddir)/to ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@ -date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \ +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);}')\"" -hash := -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \ +hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \ $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \ -Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \ $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \ @@ -132,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\ @@ -226,7 +227,7 @@ INIT_EXE=init.c INIT_LIB=librpl.c -LIB=-lz @LIBMTMALLOC@ +LIB=-lz bin_PROGRAMS = rpl lib_LIBRARIES = librpl.a @@ -240,6 +241,11 @@ INIT_LIBc=$(INIT_LIB:.c=.conv.c) INIT_EXEc=$(INIT_EXE:.c=.conv.c) %.conv.c: %.c + while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \ + -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \ + -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \ + do sleep 1; done $(top_builddir)/rpliconv/rpliconv \ -f `$(top_builddir)/tools/@FILE@/src/rplfile \ -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ @@ -247,6 +253,11 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c) -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %.conv.h: %.h + while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \ + -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \ + -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \ + do sleep 1; done $(top_builddir)/rpliconv/rpliconv \ -f `$(top_builddir)/tools/@FILE@/src/rplfile \ -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ @@ -254,6 +265,11 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c) -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %.conv.f: %.f + while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \ + -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \ + -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \ + do sleep 1; done $(top_builddir)/rpliconv/rpliconv \ -f `$(top_builddir)/tools/@FILE@/src/rplfile \ -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ @@ -261,6 +277,11 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c) -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %.conv.F90: %.F90 + while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \ + -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \ + -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \ + do sleep 1; done $(top_builddir)/rpliconv/rpliconv \ -f `$(top_builddir)/tools/@FILE@/src/rplfile \ -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ @@ -268,6 +289,11 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c) -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@ %.conv.inc: %.inc + while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \ + -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ + -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \ + -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \ + do sleep 1; done $(top_builddir)/rpliconv/rpliconv \ -f `$(top_builddir)/tools/@FILE@/src/rplfile \ -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \ @@ -349,12 +375,12 @@ generateurs.c: generateurs_aleatoires.aw $(top_builddir)/src/generateurs.c rpl.inc: - echo BUILDPATH=$(shell pwd)/.. > $@ + echo BUILDPATH=$(top_builddir)/.. > $@ 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= \ + echo EXTOBJECTS= @MALLOC@ \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) \ @@ -366,8 +392,6 @@ rpl.inc: $(ldadd_libssl) \ $(ldadd_libsqlite) \ >> $@ - gcc $(INCLUDES) $(DEFS) $(AM_CFLAGS) $(rpl_CFLAGS) librpl.conv.c \ - -c -o rpl-librpl.conv.o EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \ $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \ @@ -383,20 +407,20 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $ nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \ $(SRCXPM) $(SRCINCc) rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@ - -rpl_CFLAGS = $(AM_CFLAGS) -ULIBRPL -Wall -Wextra \ +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 \ +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 rpl.inc +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) \ @@ -410,7 +434,8 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \ -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_libssl) \ @@ -434,6 +459,7 @@ librpl: install-libLIBRARIES 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 \