--- rpl/src/Attic/Makefile.in 2011/09/15 19:46:42 1.74 +++ rpl/src/Attic/Makefile.in 2011/09/16 14:42:03 1.75 @@ -400,7 +400,8 @@ rpl_DEPENDENCIES = $(top_builddir)/lapac $(top_builddir)/lapack/blas/libblas.a $(ldadd_libhistory) \ $(ldadd_libreadline) $(ldadd_libncurses) $(ldadd_libiconv) \ $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \ - $(ldadd_libsigsegv) $(ldadd_libgsl) $(am__DEPENDENCIES_1) + $(ldadd_libsigsegv) $(am__DEPENDENCIES_1) $(ldadd_libgsl) \ + $(am__DEPENDENCIES_1) rpl_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(rpl_LDFLAGS) \ $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -439,6 +440,7 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BSH_PATH = @BSH_PATH@ +BUILD_OPENMOTIF = @BUILD_OPENMOTIF@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -493,6 +495,7 @@ GSL = @GSL@ GV = @GV@ HOST = @HOST@ ICONV = @ICONV@ +INCMOTIF = @INCMOTIF@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -502,6 +505,7 @@ IPCS_SYSV = @IPCS_SYSV@ IPV6 = @IPV6@ LATEX = @LATEX@ LDFLAGS = @LDFLAGS@ +LIBMOTIF = @LIBMOTIF@ LIBOBJS = @LIBOBJS@ LIBRPLCAS = @LIBRPLCAS@ LIBS = @LIBS@ @@ -642,6 +646,8 @@ 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);}')\"" \ @@ -908,6 +914,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@ rpl_LDADD = -lgfortran \ @@ -916,6 +923,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@ all: $(BUILT_SOURCES) @@ -5908,6 +5916,7 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \ uninstall-libLIBRARIES +include $(top_builddir)/tools/openmotif.lib %-conv.c: %.c $(top_builddir)/rpliconv/rpliconv \ @@ -6046,6 +6055,7 @@ rpl.inc: $(ldadd_libsqlite) \ $(ldadd_librplcas) \ $(ldadd_libsigsegv) \ + $(ldadd_libmotif) \ >> $@ always: $(top_builddir)/src/rpl-conv.c @@ -6072,7 +6082,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