lib/gnulib
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-08 17:22:05 +03:00
Code Activity

snippets: work around GNU Make 3.82 VPATH

Browse Source 
When using 'gnulib-tool --gnu-make' on Emacs, and building
the resulting tarball on Solaris 10 which bundles GNU Make 3.82,
an out-of-source (VPATH) build failed because the sans-copyright
snippet file was not built before the file that used it.
Presumably this is some sort of VPATH thing.  Work around the
problem by using the original snippet, i.e., don’t bother to
remove its copyright notice.
* modules/snippet/_Noreturn, modules/snippet/link-warning:
Don’t assume Automake in comments.  Omit long-incorrect comment.
* modules/snippet/arg-nonnull (BUILT_SOURCES, arg-nonnull.h)
(MOSTLYCLEANFILES):
* modules/snippet/c++defs (BUILT_SOURCES, c++defs.h)
(MOSTLYCLEANFILES):
* modules/snippet/unused-parameter (BUILT_SOURCES, unused-parameter.h)
(MOSTLYCLEANFILES):
* modules/snippet/warn-on-use (BUILT_SOURCES, warn-on-use.h)
(MOSTLYCLEANFILES):
Remove.
* modules/snippet/arg-nonnull (ARG_NONNULL_H):
* modules/snippet/c++defs (CXXDEFS_H):
* modules/snippet/unused-parameter (UNUSED_PARAMETER_H):
* modules/snippet/warn-on-use (WARN_ON_USE_H):
Don’t bother to remove the copyright notice; just use the
original snippet as-is.
This commit is contained in:
Paul Eggert
2017-03-14 01:20:11 -07:00
parent d608854763
commit 1c2185b80a
7 changed files with 50 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/snippet/link-warning
View File

@@ -15,13 +15,14 @@ AC_REQUIRE([gl_FEATURES_H])
Makefile.am:
# The BUILT_SOURCES created by this Makefile snippet are not used via #include
# statements but through direct file reference. Therefore this snippet must be
# present in all Makefile.am that need it. This is ensured by the applicability
# present in all Makefiles that need it. This is ensured by the applicability
# 'all' defined above.
# FIXME: The link-warning.h rule probably does not work if
# gnulib-tool's --gnu-make option is used, when the build is an
# out-of-source build that relies on VPATH.
BUILT_SOURCES += link-warning.h
# The link-warning.h that gets inserted into generated .h files is the same as
# build-aux/snippet/link-warning.h, except that it has the copyright header cut
# off.
link-warning.h: $(top_srcdir)/build-aux/snippet/link-warning.h
$(AM_V_GEN)rm -f $@-t $@ && \
sed -n -e '/HAVE_FEATURES_H/,$$p' \