diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-14 01:20:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-14 01:21:00 -0700 |
| commit | 1c2185b80a7ccc6c26a0dd880af81cb5713614e2 (patch) | |
| tree | e63f7b9e77599741feb2f9cad164fc5838fa2a73 /modules/snippet/unused-parameter | |
| parent | d6088547633af472625ab815452004c22fda6d58 (diff) | |
| download | gnulib-1c2185b80a7ccc6c26a0dd880af81cb5713614e2.tar.gz | |
snippets: work around GNU Make 3.82 VPATH
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.
Diffstat (limited to 'modules/snippet/unused-parameter')
| -rw-r--r-- | modules/snippet/unused-parameter | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/modules/snippet/unused-parameter b/modules/snippet/unused-parameter index a4376a0b8d..4a231fed0d 100644 --- a/modules/snippet/unused-parameter +++ b/modules/snippet/unused-parameter @@ -12,24 +12,11 @@ Depends-on: configure.ac: 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 -# 'all' defined above. - -BUILT_SOURCES += unused-parameter.h -# The unused-parameter.h that gets inserted into generated .h files is the same -# as build-aux/snippet/unused-parameter.h, except that it has the copyright -# header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ - < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t - -UNUSED_PARAMETER_H=unused-parameter.h +# Because this Makefile snippet defines a variable used by other +# 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 Include: |