--- rpl/tools/Makefile.am 2010/08/15 14:46:35 1.23 +++ rpl/tools/Makefile.am 2011/09/17 18:42:14 1.49 @@ -1,9 +1,21 @@ 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 @SQLITE@.diff.gz @OPENSSL@.tar.gz + @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.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 \ + @NCURSES@-20110521.patch.gz @NCURSES@-20110528.patch.gz \ + @NCURSES@-20110604.patch.gz @NCURSES@-20110611.patch.gz \ + @NCURSES@-20110625.patch.gz @NCURSES@-20110626.patch.gz \ + @NCURSES@-20110702.patch.gz @NCURSES@-20110716.patch.gz \ + @NCURSES@-20110723.patch.gz @NCURSES@-20110730.patch.gz \ + @NCURSES@-20110807.patch.gz @NCURSES@-20110813.patch.gz \ + @NCURSES@-20110820.patch.gz @NCURSES@-20110903.patch.gz \ + @NCURSES@-20110910.patch.gz openmotif.lib subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ + @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ all: TMP=$$(mktemp tmp.XXXXXXXXXX); \ @@ -32,13 +44,18 @@ all: if [ @OS@ = "OS2" ]; then \ (cd @OPENSSL@ && touch tests_success); \ else \ - (cd @OPENSSL@ && $(MAKE) test && touch tests_success); \ + (cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \ fi; \ fi - $(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \ - $(top_builddir)/tools/@FILE@/src/*.o \ - $(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \ - cut -d= -f2) $(LDFLAGS) + touch openmotif.lib && rm openmotif.lib; + if [ x@BUILD_OPENMOTIF@ = x ]; then \ + touch 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 \