--- rpl/src/Makefile.am	2011/09/10 20:45:05	1.60
+++ rpl/src/Makefile.am	2011/09/26 15:57:08	1.64
@@ -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
@@ -21,12 +23,15 @@ ldadd_libsqlite = $(top_builddir)/tools/
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
 ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/libsigsegv.a
-include_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src
+include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src
 
 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);}')\"" \
@@ -201,7 +206,6 @@ SRCC=\
 	rplcore.c\
 	semaphores.c\
 	sequenceur.c\
-	siginfo.c\
 	simplification.c\
 	sommations.c\
 	sql.c\
@@ -290,7 +294,7 @@ INIT_EXEc=$(INIT_EXE:.c=-conv.c)
 			$(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 $< | \
@@ -399,6 +403,7 @@ rpl.inc:
 		$(ldadd_libsqlite) \
 		$(ldadd_librplcas) \
 		$(ldadd_libsigsegv) \
+		$(ldadd_libmotif) \
 		>> $@
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
@@ -415,7 +420,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@ -Wl,-whole-archive \
+			 $(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
+			 -Wl,-no-whole-archive
 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
@@ -436,8 +443,9 @@ 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@\" @BROKEN_SIGINFO@ \
+DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
@@ -477,7 +485,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
@@ -502,7 +510,7 @@ librpl: install-libLIBRARIES
 				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; \
@@ -517,7 +525,7 @@ librpl: install-libLIBRARIES
 			done; \
 			echo Archive created; \
 			ar s librpl.a; \
-			if [ @OS@ != OS2 ]; then \
+			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
 				echo Stripping librpl.a && strip -d librpl.a; \
 			fi;); \
 	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a