--- rpl/tools/Attic/Makefile.in 2011/07/22 07:37:20 1.50 +++ rpl/tools/Attic/Makefile.in 2011/10/04 19:32:36 1.66 @@ -37,7 +37,7 @@ target_triplet = @target@ subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -54,8 +54,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BROKEN_SIGINFO = @BROKEN_SIGINFO@ BSH_PATH = @BSH_PATH@ +BUILD_OPENMOTIF = @BUILD_OPENMOTIF@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -77,6 +77,7 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ELF = @ELF@ EXEEXT = @EXEEXT@ EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@ EXPORT_DYNAMIC = @EXPORT_DYNAMIC@ @@ -99,7 +100,9 @@ GREP = @GREP@ GS = @GS@ GSL = @GSL@ GV = @GV@ +HOST = @HOST@ ICONV = @ICONV@ +INCMOTIF = @INCMOTIF@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -109,9 +112,11 @@ IPCS_SYSV = @IPCS_SYSV@ IPV6 = @IPV6@ LATEX = @LATEX@ LDFLAGS = @LDFLAGS@ +LIBMOTIF = @LIBMOTIF@ LIBOBJS = @LIBOBJS@ LIBRPLCAS = @LIBRPLCAS@ LIBS = @LIBS@ +LIBXPM = @LIBXPM@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ @@ -124,6 +129,7 @@ NCURSES = @NCURSES@ NESTED_FUNCTIONS = @NESTED_FUNCTIONS@ NTL = @NTL@ OBJEXT = @OBJEXT@ +OPENMOTIF = @OPENMOTIF@ OPENSSL = @OPENSSL@ OS = @OS@ PACKAGE = @PACKAGE@ @@ -141,12 +147,15 @@ PROFILAGE = @PROFILAGE@ RANLIB = @RANLIB@ READLINE = @READLINE@ RPLCAS = @RPLCAS@ +RPLTOOLS = @RPLTOOLS@ RUNPATH = @RUNPATH@ SED = @SED@ SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@ SEMUN = @SEMUN@ SET_MAKE = @SET_MAKE@ +SHARED_MEMORY = @SHARED_MEMORY@ SHELL = @SHELL@ +SIGSEGV = @SIGSEGV@ SQLITE = @SQLITE@ STRIP = @STRIP@ TEX = @TEX@ @@ -214,7 +223,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ + @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ sysconfdir = @sysconfdir@ target = @target@ @@ -228,12 +237,18 @@ top_srcdir = @top_srcdir@ 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 @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@-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 all: all-am @@ -430,12 +445,21 @@ all: fi; \ done; if [ ! -f @OPENSSL@/tests_success ]; then \ - if [ @OS@ = "OS2" ]; then \ + if [ @OS@ = "OS2" -o @RPLTOOLS@ != '\$(top_builddir)' ]; then \ (cd @OPENSSL@ && touch tests_success); \ else \ (cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \ fi; \ fi + 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 \