From 01829399a30dd94373f10540016afb06e02395fe Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 11 Feb 2008 21:51:43 +0000 Subject: [PATCH] * tests/mdemo/Makefile.am (@LIBLTDL@): Update outdated dependencies. ($(top_distdir)/libltdl/libtool): Remove. Fixes spurious mdemo-dryrun failure with OpenBSD make. --- ChangeLog | 7 +++++++ tests/mdemo/Makefile.am | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6088534b4..d92617b0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-11 Ralf Wildenhues + + * tests/mdemo/Makefile.am (@LIBLTDL@): Update outdated + dependencies. + ($(top_distdir)/libltdl/libtool): Remove. + Fixes spurious mdemo-dryrun failure with OpenBSD make. + 2008-02-09 Ralf Wildenhues * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) [linux] : diff --git a/tests/mdemo/Makefile.am b/tests/mdemo/Makefile.am index 3f53354b1..f73fc9bcb 100644 --- a/tests/mdemo/Makefile.am +++ b/tests/mdemo/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am -- Process this file with automake to produce Makefile.in ## -## Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation +## Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation ## Written by Gary V. Vaughan, 2003 ## ## This file is part of GNU Libtool. @@ -54,13 +54,12 @@ bin_PROGRAMS = mdemo mdemo_static ## use @LIBLTDL@ because some broken makes do not accept macros in targets ## we can only do this because our LIBLTDL does not contain ${top_builddir} top_distdir = ../.. -@LIBLTDL@: $(top_distdir)/libtool $(top_distdir)/libltdl/libtool \ - $(top_distdir)/libltdl/config.h $(srcdir)/$(top_distdir)/libltdl/ltdl.c \ +@LIBLTDL@: $(top_distdir)/libtool \ + $(top_distdir)/config.h $(srcdir)/$(top_distdir)/libltdl/ltdl.c \ $(srcdir)/$(top_distdir)/libltdl/ltdl.h (cd $(top_distdir); $(MAKE) `echo $(LIBLTDL) | sed 's,.*\.\./libltdl/,libltdl/,g'`) -# Without the following line, the check may fail if libltdl/libtool is -# removed after libltdl is configured -$(top_distdir)/libltdl/libtool $(top_distdir)/libltdl/config.h: +# Do not error out if toplevel config.h does not exist: +$(top_distdir)/config.h: # Create a version of mdemo that does dlopen. mdemo_SOURCES = main.c -- 2.47.2