--- rpl/tools/Makefile.am	2011/09/15 20:58:06	1.46
+++ rpl/tools/Makefile.am	2011/09/16 14:14:12	1.47
@@ -1,7 +1,7 @@
 EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \
 		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
 		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \
-		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz \
+		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \
 		@NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \
 		@NCURSES@-20110423.patch.gz @NCURSES@-20110430.patch.gz \
 		@NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \
@@ -15,7 +15,7 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@NCURSES@-20110910.patch.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
 
 all:
 	TMP=$$(mktemp tmp.XXXXXXXXXX); \
@@ -47,6 +47,16 @@ all:
 			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
 		fi; \
 	fi
+	touch openmotif.lib && rm openmotif.lib;
+	if [ x@BUILD_OPENMOTIF@ = x ]; then \
+		echo LD_MOTIF_ > openmotif.lib; \
+		echo LD_MOTIF_ >> openmotif.lib; \
+	else \
+		echo -n LD_MOTIF_ > openmotif.lib; \
+		grep "^LIBS=" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
+		echo -n LD_MOTIF_ >> openmotif.lib; \
+		grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \
+	fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \