--- rpl/src/Makefile.am 2011/09/18 18:06:01 1.63 +++ rpl/src/Makefile.am 2011/11/18 09:51:32 1.71 @@ -1,6 +1,6 @@ include $(top_builddir)/tools/openmotif.lib -ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a +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 @@ -9,20 +9,20 @@ 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 +ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src ldadd_librplcas = @LIBRPLCAS@ @@ -39,26 +39,25 @@ date = -Dd_date_rpl="\"$(shell LC_ALL=fr $(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=\ @@ -267,44 +266,50 @@ 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 > $@ @@ -374,23 +379,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@ -lz >> $@ + @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) \ @@ -420,7 +428,9 @@ 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) $(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@ rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c @@ -450,19 +460,19 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ @SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \ @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \ -Dd_locale=\"@FINAL_ENCODING@\" \ - -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" + -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 \ $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \ $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \ $(ldadd_libsqlite) $(ldadd_libsigsegv) \ - $(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \ $(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; @@ -474,11 +484,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 \ @@ -488,10 +499,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; \ @@ -502,30 +513,30 @@ 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... "; \ + 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