--- rpl/src/Makefile.am 2011/09/14 14:34:27 1.61 +++ rpl/src/Makefile.am 2011/09/16 14:42:03 1.62 @@ -1,3 +1,5 @@ +include $(top_builddir)/tools/openmotif.lib + ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \ -I$(top_srcdir)/tools/@NCURSES@/include @@ -27,6 +29,9 @@ ldadd_librplcas = @LIBRPLCAS@ include_librplcas = -I$(top_builddir)/rplcas/include/giac \ -I$(top_builddir)/rplcas/include +ldadd_libmotif = @LIBMOTIF@ +include_libmotif = @INCMOTIF@ + 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);}')\"" \ @@ -398,6 +403,7 @@ rpl.inc: $(ldadd_libsqlite) \ $(ldadd_librplcas) \ $(ldadd_libsigsegv) \ + $(ldadd_libmotif) \ >> $@ EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \ @@ -435,6 +441,7 @@ INCLUDES = -I$(srcdir) -I$(top_builddir) $(include_libreadline) $(include_libncurses) $(include_libgsl) \ $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \ $(include_librplcas) $(include_libsigsegv) \ + $(include_libmotif) \ @includeX@ @libMySQLinc@ @libPgSQLinc@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \ -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \ @@ -450,6 +457,7 @@ rpl_LDADD = -lgfortran \ $(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 @@ -476,7 +484,7 @@ librpl: install-libLIBRARIES $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \ $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \ - $(ldadd_librplcas) $(ldadd_libsigsegv); \ + $(ldadd_librplcas) $(ldadd_libsigsegv) $(ldadd_libmotif); \ do \ cp -f $$i $(top_builddir)/librpl; \ done