I installed the attached patch to Gnulib on Savannah; please give it a try.
From 6100762d213cac9c23f4cf7328210e73c0dc98d2 Mon Sep 17 00:00:00 2001 From: Paul Eggert <eggert@cs.ucla.edu> Date: Tue, 14 Mar 2017 13:23:25 -0700 Subject: [PATCH] snippets: move unadjusted snippet sources to lib
Problem reported by Michal Privoznik in: http://lists.gnu.org/archive/html/bug-gnulib/2017-03/msg00039.html * lib/_Noreturn.h: Rename from build-aux/snippet/_Noreturn.h. * lib/arg-nonnull.h: Rename from build-aux/snippet/arg-nonnull.h. * lib/c++defs.h: Rename from build-aux/snippet/c++defs.h. * lib/unused-parameter.h: Rename from build-aux/snippet/unused-parameter.h. * lib/warn-on-use.h: Rename from build-aux/snippet/warn-on-use.h. * modules/snippet/_Noreturn (Files:, _NORETURN_H): * modules/snippet/arg-nonnull (Files:, ARG_NONNULL_H): * modules/snippet/c++defs (Files:, CXXDEFS_H): * modules/snippet/unused-parameter (Files:, UNUSED_PARAMETER_H): * modules/snippet/warn-on-use (Files: WARN_ON_USE_H): Adjust to file renamings. --- ChangeLog | 18 ++++++++++++++++++ {build-aux/snippet => lib}/_Noreturn.h | 0 {build-aux/snippet => lib}/arg-nonnull.h | 0 {build-aux/snippet => lib}/c++defs.h | 0 {build-aux/snippet => lib}/unused-parameter.h | 0 {build-aux/snippet => lib}/warn-on-use.h | 0 modules/snippet/_Noreturn | 4 ++-- modules/snippet/arg-nonnull | 4 ++-- modules/snippet/c++defs | 4 ++-- modules/snippet/unused-parameter | 4 ++-- modules/snippet/warn-on-use | 4 ++-- 11 files changed, 28 insertions(+), 10 deletions(-) rename {build-aux/snippet => lib}/_Noreturn.h (100%) rename {build-aux/snippet => lib}/arg-nonnull.h (100%) rename {build-aux/snippet => lib}/c++defs.h (100%) rename {build-aux/snippet => lib}/unused-parameter.h (100%) rename {build-aux/snippet => lib}/warn-on-use.h (100%) diff --git a/ChangeLog b/ChangeLog index 87d6a19..c237be4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2017-03-14 Paul Eggert <eggert@cs.ucla.edu> + + snippets: move unadjusted snippet sources to lib + Problem reported by Michal Privoznik in: + http://lists.gnu.org/archive/html/bug-gnulib/2017-03/msg00039.html + * lib/_Noreturn.h: Rename from build-aux/snippet/_Noreturn.h. + * lib/arg-nonnull.h: Rename from build-aux/snippet/arg-nonnull.h. + * lib/c++defs.h: Rename from build-aux/snippet/c++defs.h. + * lib/unused-parameter.h: Rename from + build-aux/snippet/unused-parameter.h. + * lib/warn-on-use.h: Rename from build-aux/snippet/warn-on-use.h. + * modules/snippet/_Noreturn (Files:, _NORETURN_H): + * modules/snippet/arg-nonnull (Files:, ARG_NONNULL_H): + * modules/snippet/c++defs (Files:, CXXDEFS_H): + * modules/snippet/unused-parameter (Files:, UNUSED_PARAMETER_H): + * modules/snippet/warn-on-use (Files: WARN_ON_USE_H): + Adjust to file renamings. + 2017-03-14 Mathieu Lirzin <mthl@gnu.org> gnulib-tool: don't automatically distribute files from top/ diff --git a/build-aux/snippet/_Noreturn.h b/lib/_Noreturn.h similarity index 100% rename from build-aux/snippet/_Noreturn.h rename to lib/_Noreturn.h diff --git a/build-aux/snippet/arg-nonnull.h b/lib/arg-nonnull.h similarity index 100% rename from build-aux/snippet/arg-nonnull.h rename to lib/arg-nonnull.h diff --git a/build-aux/snippet/c++defs.h b/lib/c++defs.h similarity index 100% rename from build-aux/snippet/c++defs.h rename to lib/c++defs.h diff --git a/build-aux/snippet/unused-parameter.h b/lib/unused-parameter.h similarity index 100% rename from build-aux/snippet/unused-parameter.h rename to lib/unused-parameter.h diff --git a/build-aux/snippet/warn-on-use.h b/lib/warn-on-use.h similarity index 100% rename from build-aux/snippet/warn-on-use.h rename to lib/warn-on-use.h diff --git a/modules/snippet/_Noreturn b/modules/snippet/_Noreturn index d5e8ff0..0aac813 100644 --- a/modules/snippet/_Noreturn +++ b/modules/snippet/_Noreturn @@ -5,7 +5,7 @@ Applicability: all Files: -build-aux/snippet/_Noreturn.h +lib/_Noreturn.h Depends-on: @@ -16,7 +16,7 @@ Makefile.am: # gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h +_NORETURN_H=$(srcdir)/_Noreturn.h Include: diff --git a/modules/snippet/arg-nonnull b/modules/snippet/arg-nonnull index 0eab137..a397ecb 100644 --- a/modules/snippet/arg-nonnull +++ b/modules/snippet/arg-nonnull @@ -5,7 +5,7 @@ Applicability: all Files: -build-aux/snippet/arg-nonnull.h +lib/arg-nonnull.h Depends-on: @@ -16,7 +16,7 @@ Makefile.am: # gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -ARG_NONNULL_H=$(top_srcdir)/build-aux/snippet/arg-nonnull.h +ARG_NONNULL_H=$(srcdir)/arg-nonnull.h Include: diff --git a/modules/snippet/c++defs b/modules/snippet/c++defs index 9612c8b..a952b01 100644 --- a/modules/snippet/c++defs +++ b/modules/snippet/c++defs @@ -5,7 +5,7 @@ Applicability: all Files: -build-aux/snippet/c++defs.h +lib/c++defs.h Depends-on: @@ -16,7 +16,7 @@ Makefile.am: # gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -CXXDEFS_H=$(top_srcdir)/build-aux/snippet/c++defs.h +CXXDEFS_H=$(srcdir)/c++defs.h Include: diff --git a/modules/snippet/unused-parameter b/modules/snippet/unused-parameter index 4a231fe..561b3e4 100644 --- a/modules/snippet/unused-parameter +++ b/modules/snippet/unused-parameter @@ -5,7 +5,7 @@ Applicability: all Files: -build-aux/snippet/unused-parameter.h +lib/unused-parameter.h Depends-on: @@ -16,7 +16,7 @@ Makefile.am: # gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -UNUSED_PARAMETER_H=$(top_srcdir)/build-aux/snippet/unused-parameter.h +UNUSED_PARAMETER_H=$(srcdir)/unused-parameter.h Include: diff --git a/modules/snippet/warn-on-use b/modules/snippet/warn-on-use index 2642bc2..4f91818 100644 --- a/modules/snippet/warn-on-use +++ b/modules/snippet/warn-on-use @@ -5,7 +5,7 @@ Applicability: all Files: -build-aux/snippet/warn-on-use.h +lib/warn-on-use.h m4/warn-on-use.m4 Depends-on: @@ -17,7 +17,7 @@ Makefile.am: # gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -WARN_ON_USE_H=$(top_srcdir)/build-aux/snippet/warn-on-use.h +WARN_ON_USE_H=$(srcdir)/warn-on-use.h Include: -- 2.9.3
