--- rpl/Makefile.am 2012/12/13 20:27:07 1.56 +++ rpl/Makefile.am 2017/06/30 13:11:25 1.79 @@ -1,33 +1,58 @@ SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack rplcas src \ - rpltags scripts man doc + rpltags scripts man doc modules/sets include_HEADERS = rplconfig.h EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \ - COPYING.in lapack/COPYING lapack/RELEASE autogen.sh \ + HEADER.in lapack/COPYING lapack/RELEASE autogen.sh \ tests/tests.tar.gz vim/indent/rpl.vim vim/ftplugin/rpl.vim \ vim/syntax/rpl.vim examples/obele.rpl examples/appel.tar.gz \ examples/external.tar.gz DEBIAN/control.in \ rplcas/@GMP@.tar.gz rplcas/@MPFR@.tar.gz rplcas/@NTL@.tar.gz \ - rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz + rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz \ + rplcas/@MPFI@.tar.gz + +all: + @if [ x"$(shell $(MAKE) -v | grep '^GNU Make')" = x ]; then \ + echo; \ + echo MAKE=$(MAKE); \ + echo "Please use GNU Make !"; \ + echo; \ + false; \ + fi + $(MAKE) all-rpl licences: - cp -f $(top_builddir)/COPYING $(srcdir) + cp -f $(top_builddir)/HEADER $(srcdir) $(MAKE) -C src $@ + $(MAKE) -C rplsums $@ -toolsdistclean: +purge: for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ @SQLITE@; \ + @FILE@ @ICONV@ @SQLITE@ @SIGSEGV@ @BUILD_OPENMOTIF@; \ do \ rm -rf $(srcdir)/tools/$$i; \ + rm -rf $(top_builddir)/tools/$$i; \ done; - -toolsclean: - for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ @SQLITE@; \ + for i in @GMP@ @MPFR@ @NTL@ @COCOA@ @PARI@ @GIAC@ @FLTK@; \ do \ - $(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \ + if [ -d $(srcdir)/rplcas/$$i ]; then \ + rm -rf $(srcdir)/rplcas/$$i; \ + fi; \ + if [ -d $(top_builddir)/rplcas/$$i ]; then \ + rm -rf $(top_builddir)/rplcas/$$i; \ + fi; \ done; + for i in bin lib include share; \ + do \ + if [ -d $(top_builddir)/rplcas/$$i ]; then \ + rm -rf $(top_builddir)/rplcas/$$i; \ + fi; \ + done; + test -f $(top_builddir)/tools/openmotif.lib && \ + rm -f $(top_builddir)/tools/openmotif.lib + rm -rf $(top_builddir)/tools/@OPENSSL@ + rm -rf $(top_builddir)/tools/@ZLIB@ $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a: for i in $(shell find tools/@NCURSES@ -name Makefile \ @@ -103,6 +128,9 @@ $(top_builddir)/tools/@READLINE@/libread $(top_builddir)/tools/@READLINE@/libhistory.a: $(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS) +$(top_builddir)/tools/@ZLIB@/libz.a: + $(MAKE) -C $(top_builddir)/tools/@ZLIB@ $(AM_MAKEFLAGS) + $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a: # Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"} # dans ltmain.sh et propager les modifications dans le script libtool. @@ -207,13 +235,12 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE $(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS) $(top_builddir)/tools/@UNITS@/units$(EXEEXT): - if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \ + if [ @OS@ = OpenBSD ]; then \ TMP=tmp.units; \ sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \ @UNITS@/Makefile > $$TMP; \ mv -f $$TMP @UNITS@/Makefile; \ fi; \ - cp -f $(srcdir)/tools/@UNITS@/units_cur $(top_builddir)/tools/@UNITS@ $(MAKE) -C $(top_builddir)/tools/@UNITS@ $(AM_MAKEFLAGS) .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ @@ -245,13 +272,14 @@ $(top_builddir)/tools/@LIBXPM@/src/.libs $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a: $(MAKE) -C $(top_builddir)/tools/@SIGSEGV@ $(AM_MAKEFLAGS) -all: $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a \ +all-rpl: $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a \ $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \ $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a \ $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a \ $(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a \ $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \ $(top_builddir)/tools/@OPENSSL@/libssl.a \ + $(top_builddir)/tools/@ZLIB@/libz.a \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \ @@ -262,19 +290,12 @@ all: $(top_builddir)/tools/@NCURSES@/lib $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \ $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \ $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \ - $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a \ - @LIBRPLCAS@ @LIBMOTIF@ - @if [ -n $(shell $(MAKE) -v | grep "^GNU Make") ]; then \ - echo; \ - echo MAKE=$(MAKE); \ - echo "Please use GNU Make !"; \ - echo; \ - false; \ - fi + @LIBSIGSEGV@ @LIBRPLCAS@ @LIBMOTIF@ # Cette règle n'est là que pour forcer la compilation de Gnuplot. $(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS) $(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS) $(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS) + $(MAKE) -C $(top_builddir)/modules/sets $(AM_MAKEFLAGS) debian: all $(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS) librpl @@ -300,24 +321,31 @@ debian: all done $(MKDIR_P) $(top_builddir)/debian/$(prefix)/lib cp -f $(top_builddir)/src/librpl.a $(top_builddir)/debian/$(prefix)/lib - for j in man/man1 man/fr_FR/man1; \ + for j in man man/fr_FR; \ do \ - $(MKDIR_P) $(top_builddir)/debian/$(prefix)/$$j; \ - for i in $(top_builddir)/$$j/gpp.1 $(top_builddir)/$$j/mkrplso.1 \ - $(top_builddir)/$$j/rpl.1 $(top_builddir)/$$j/rplcc.1 \ - $(top_builddir)/$$j/rpllink.1 $(top_builddir)/$$j/rplpp.1 \ + $(MKDIR_P) $(top_builddir)/debian/$(prefix)/$$j/man1; \ + for i in $(top_builddir)/$$j/gpp.1 \ + $(top_builddir)/$$j/mkrplso.1 \ + $(top_builddir)/$$j/rpl.1 \ + $(top_builddir)/$$j/rplcc.1 \ + $(top_builddir)/$$j/rpllink.1 \ + $(top_builddir)/$$j/rplpp.1 \ $(top_builddir)/$$j/rpltags.1; \ do \ if [ -f $$i ]; then \ - cp -f $$i $(top_builddir)/debian/$(prefix)/$$j; \ + cp -f $$i $(top_builddir)/debian/$(prefix)/$$j/man1; \ fi; \ done; \ done $(MKDIR_P) $(top_builddir)/debian/$(prefix)/share cp -f $(top_builddir)/tools/@FILE@/magic/magic.mgc \ $(top_builddir)/debian/$(prefix)/share/rplfiles.mgc - cp -f $(srcdir)/tools/@UNITS@/units.dat \ - $(top_builddir)/debian/$(prefix)/share + cp -f $(srcdir)/tools/@UNITS@/definitions.units \ + $(top_builddir)/debian/$(prefix)/share/rplunits.tmp + sed 's/^!include currency.units//g' \ + $(top_builddir)/debian/$(prefix)/share/rplunits.tmp \ + > $(top_builddir)/debian/$(prefix)/share/rplunits + rm -f $(top_builddir)/debian/$(prefix)/share/rplunits.tmp if [ -e $(top_builddir)/tools/@GNUPLOT@/src/gnuplot$(EXEEXT) ]; then \ if [ -e $(prefix)/bin/gnuplot$(EXEEXT) ]; then \ mv -f $(prefix)/bin/gnuplot$(EXEEXT) \