Recent gnulib changes break the build of Bison's master branch, where we have a single top-level Makefile.am that includes local.mk from each subdirectory. There's no problem on Bison's branch-2.5, where we still have a Makefile.am in each subdirectory.
Make complains that it cannot find lib/link-warning.h and lib/arg-nonnull.h. Actually, it can't find their make file targets. The following patch fixes this for Bison's master and does not break branch-2.5. It's not clear to me yet that this is really the right solution. I haven't figured out why, without this patch, unistd.h is rewritten to lib/unistd.h in its target rule in Makefile.in but the same does not happen for link-warning.h. What performs this rewrite? >From fd846e35bc0584a4712b4076ccb3f253f9b7834b Mon Sep 17 00:00:00 2001 From: Joel E. Denny <[email protected]> Date: Tue, 15 Dec 2009 14:29:19 -0500 Subject: [PATCH] link-warning, arg-nonnull: fix Makefile.am target * modules/arg-nonnull (Makefile.am): Qualify the target file name with the correct directory by using the file name's shell variable. * modules/link-warning (Makefile.am): Likewise. --- ChangeLog | 8 ++++++++ modules/arg-nonnull | 2 +- modules/link-warning | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7655b07..0fc9b73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-12-15 Joel E. Denny <[email protected]> + + link-warning, arg-nonnull: fix Makefile.am target + * modules/arg-nonnull (Makefile.am): Qualify the target file + name with the correct directory by using the file name's shell + variable. + * modules/link-warning (Makefile.am): Likewise. + 2009-12-15 Jim Meyering <[email protected]> areadlink, areadlink-with-size: relax license to LGPLv2+ diff --git a/modules/arg-nonnull b/modules/arg-nonnull index ed224bf..510aad5 100644 --- a/modules/arg-nonnull +++ b/modules/arg-nonnull @@ -12,7 +12,7 @@ Makefile.am: BUILT_SOURCES += arg-nonnull.h # The arg-nonnull.h that gets inserted into generated .h files is the same as # build-aux/arg-nonnull.h, except that it has the copyright header cut off. -arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h +$(ARG_NONNULL_H): $(top_srcdir)/build-aux/arg-nonnull.h $(AM_V_GEN)rm -f $...@-t $@ && \ sed -n -e '/GL_ARG_NONNULL/,$$p' \ < $(top_srcdir)/build-aux/arg-nonnull.h \ diff --git a/modules/link-warning b/modules/link-warning index 6b998f5..32f4131 100644 --- a/modules/link-warning +++ b/modules/link-warning @@ -12,7 +12,7 @@ Makefile.am: BUILT_SOURCES += link-warning.h # The link-warning.h that gets inserted into generated .h files is the same as # build-aux/link-warning.h, except that it has the copyright header cut off. -link-warning.h: $(top_srcdir)/build-aux/link-warning.h +$(LINK_WARNING_H): $(top_srcdir)/build-aux/link-warning.h $(AM_V_GEN)rm -f $...@-t $@ && \ sed -n -e '/GL_LINK_WARNING/,$$p' \ < $(top_srcdir)/build-aux/link-warning.h \ -- 1.5.4.3
