diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-14 13:44:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-14 14:50:02 -0700 |
| commit | fac0bb9cf76072941ae9dc9c7019929eb1a0f1dd (patch) | |
| tree | 1b9618b5eea568e8230b4348af3df1084bd63e67 /m4/gnulib-comp.m4 | |
| parent | 5a64d78854998c2ed6d9b8de1b593d8462b8fa39 (diff) | |
| download | emacs-fac0bb9cf76072941ae9dc9c7019929eb1a0f1dd.tar.gz | |
Merge from gnulib
This incorporates:
2017-03-14 snippets: move unadjusted snippet sources to lib
2017-03-14 gnulib-tool: fix typo in comment output
2017-03-14 snippets: work around GNU Make 3.82 VPATH
2017-03-13 gnulib-tool: minor --gnu-make fixups
2017-03-12 gnulib-tool: new option --gnu-make
* .gitignore: Remove lib/arg-nonnull.h, lib/c++defs.h,
lib/warn-on-use.h. Change exception from
build-aux/snippet/_Noreturn.h to lib/_Noreturn.h.
* admin/authors.el (authors-renamed-files-regexps):
* admin/notes/copyright, make-dist:
The snippet files moved from build-aux/snippet to lib.
* 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/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/warn-on-use.h: Rename from build-aux/snippet/warn-on-use.h.
Diffstat (limited to 'm4/gnulib-comp.m4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index a3e30fd736e..bf7afa51bf6 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -787,6 +787,8 @@ changequote([, ])dnl AC_SUBST([LIBGNU_LIBDEPS]) LIBGNU_LTLIBDEPS="$gl_ltlibdeps" AC_SUBST([LIBGNU_LTLIBDEPS]) + LIBTESTS_LIBDEPS="$gltests_libdeps" + AC_SUBST([LIBTESTS_LIBDEPS]) ]) # Like AC_LIBOBJ, except that the module name goes @@ -847,11 +849,8 @@ AC_DEFUN([gltests_LIBSOURCES], [ # gnulib-tool and may be removed by future gnulib-tool invocations. AC_DEFUN([gl_FILE_LIST], [ build-aux/gitlog-to-changelog - build-aux/snippet/_Noreturn.h - build-aux/snippet/arg-nonnull.h - build-aux/snippet/c++defs.h - build-aux/snippet/warn-on-use.h build-aux/update-copyright + lib/_Noreturn.h lib/acl-errno-valid.c lib/acl-internal.c lib/acl-internal.h @@ -860,10 +859,12 @@ AC_DEFUN([gl_FILE_LIST], [ lib/alloca.in.h lib/allocator.c lib/allocator.h + lib/arg-nonnull.h lib/at-func.c lib/binary-io.c lib/binary-io.h lib/byteswap.in.h + lib/c++defs.h lib/c-ctype.c lib/c-ctype.h lib/c-strcase.h @@ -995,6 +996,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/utimens.h lib/verify.h lib/vla.h + lib/warn-on-use.h lib/xalloc-oversized.h m4/00gnulib.m4 m4/absolute-header.m4 @@ -1104,4 +1106,9 @@ AC_DEFUN([gl_FILE_LIST], [ m4/warnings.m4 m4/wchar_t.m4 m4/wint_t.m4 + tests=lib/_Noreturn.h + tests=lib/arg-nonnull.h + tests=lib/c++defs.h + tests=lib/dummy.c + tests=lib/warn-on-use.h ]) |