--- rpl/Makefile.am 2016/09/27 15:14:44 1.76 +++ rpl/Makefile.am 2017/07/11 21:17:18 1.82 @@ -1,5 +1,5 @@ SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack rplcas src \ - rpltags scripts man doc + rpltags scripts man doc modules/sets @MODULE_MOTIF@ include_HEADERS = rplconfig.h @@ -262,9 +262,11 @@ $(top_builddir)/rplcas/lib/librplcas.a: $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a $(MAKE) -C $(top_builddir)/rplcas $(AM_MAKEFLAGS) -$(top_builddir)/tools/@OPENMOTIF@/lib/Xm/.libs/libXm.a: \ +$(top_builddir)/tools/@OPENMOTIF@/install/lib/libXm.a : $(top_builddir)/tools/@LIBXPM@/src/.libs/libXpm.a $(MAKE) -C $(top_builddir)/tools/@OPENMOTIF@ -j1 + $(MAKE) -C $(top_builddir)/tools/@OPENMOTIF@ -j1 \ + prefix=$(abs_top_builddir)/tools/@OPENMOTIF@/install install $(top_builddir)/tools/@LIBXPM@/src/.libs/libXpm.a: $(MAKE) -C $(top_builddir)/tools/@LIBXPM@ $(AM_MAKEFLAGS) @@ -290,12 +292,15 @@ all-rpl: $(top_builddir)/tools/@NCURSES@ $(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@ + @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) + if [ x"@BUILD_OPENMOTIF@" != x ]; then \ + $(MAKE) -C $(top_builddir)/modules/motif $(AM_MAKEFLAGS); \ + fi debian: all $(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS) librpl