Commit fac0bb9c authored by Paul Eggert's avatar Paul Eggert

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.
parent 5a64d788
...@@ -57,9 +57,7 @@ src/epaths.h ...@@ -57,9 +57,7 @@ src/epaths.h
# C-level sources built by 'make'. # C-level sources built by 'make'.
lib/alloca.h lib/alloca.h
lib/arg-nonnull.h
lib/byteswap.h lib/byteswap.h
lib/c++defs.h
lib/dirent.h lib/dirent.h
lib/errno.h lib/errno.h
lib/execinfo.h lib/execinfo.h
...@@ -76,7 +74,6 @@ lib/string.h ...@@ -76,7 +74,6 @@ lib/string.h
lib/sys/ lib/sys/
lib/time.h lib/time.h
lib/unistd.h lib/unistd.h
lib/warn-on-use.h
src/buildobj.h src/buildobj.h
src/globals.h src/globals.h
src/lisp.mk src/lisp.mk
...@@ -274,7 +271,7 @@ etc/emacs.tmpdesktop ...@@ -274,7 +271,7 @@ etc/emacs.tmpdesktop
# Microsoft-related builds and installations. # Microsoft-related builds and installations.
*.in-h *.in-h
_* _*
!build-aux/snippet/_Noreturn.h !lib/_Noreturn.h
/bin/ /bin/
/BIN/ /BIN/
/data/ /data/
......
...@@ -980,7 +980,7 @@ Elements are (OLDNAME . NEWNAME).") ...@@ -980,7 +980,7 @@ Elements are (OLDNAME . NEWNAME).")
;; Cf authors-renamed-files-alist. ;; Cf authors-renamed-files-alist.
(defconst authors-renamed-files-regexps (defconst authors-renamed-files-regexps
'(("\\`\\(arg-nonnull\\|c\\+\\+defs\\|warn-on-use\\)\\.h\\'" '(("\\`\\(arg-nonnull\\|c\\+\\+defs\\|warn-on-use\\)\\.h\\'"
"build-aux/snippet/\\&") "lib/\\&")
("\\`\\(ebuild\\|emacs\\|install\\|fast-install\\)\\.cmd\\'" "\\1.bat") ("\\`\\(ebuild\\|emacs\\|install\\|fast-install\\)\\.cmd\\'" "\\1.bat")
("\\`\\(book-spine\\|cl\\|forms\\|functions\\|gnus\\|sc\\|texinfo\\|vip\\)\ ("\\`\\(book-spine\\|cl\\|forms\\|functions\\|gnus\\|sc\\|texinfo\\|vip\\)\
\\.texinfo\\'" "\\1.texi") \\.texinfo\\'" "\\1.texi")
......
...@@ -541,10 +541,6 @@ alone (may import them from Gnulib again). These are: ...@@ -541,10 +541,6 @@ alone (may import them from Gnulib again). These are:
build-aux/depcomp build-aux/depcomp
build-aux/missing build-aux/missing
build-aux/move-if-change build-aux/move-if-change
build-aux/snippet/_Noreturn.h
build-aux/snippet/arg-nonnull.h
build-aux/snippet/c++defs.h
build-aux/snippet/warn-on-use.h
doc/man/texinfo.tex doc/man/texinfo.tex
lib/*.[ch] lib/*.[ch]
lib/gnulib.mk lib/gnulib.mk
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
MOSTLYCLEANFILES += core *.stackdump MOSTLYCLEANFILES += core *.stackdump
# No GNU Make output.
noinst_LIBRARIES += libgnu.a noinst_LIBRARIES += libgnu.a
...@@ -873,81 +874,48 @@ EXTRA_DIST += signal.in.h ...@@ -873,81 +874,48 @@ EXTRA_DIST += signal.in.h
## begin gnulib module snippet/_Noreturn ## begin gnulib module snippet/_Noreturn
# Because this Makefile snippet defines a variable used by other # Because this Makefile snippet defines a variable used by other
# gnulib Makefile snippets, it must be present in all Makefile.am that # gnulib Makefile snippets, it must be present in all makefiles that
# need it. This is ensured by the applicability 'all' defined above. # 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
EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h EXTRA_DIST += _Noreturn.h
## end gnulib module snippet/_Noreturn ## end gnulib module snippet/_Noreturn
## begin gnulib module snippet/arg-nonnull ## begin gnulib module snippet/arg-nonnull
# The BUILT_SOURCES created by this Makefile snippet are not used via #include # Because this Makefile snippet defines a variable used by other
# statements but through direct file reference. Therefore this snippet must be # gnulib Makefile snippets, it must be present in all makefiles that
# present in all Makefile.am that need it. This is ensured by the applicability # need it. This is ensured by the applicability 'all' defined above.
# 'all' defined above.
BUILT_SOURCES += arg-nonnull.h
# The arg-nonnull.h that gets inserted into generated .h files is the same as
# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
# off.
arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h
$(AM_V_GEN)rm -f $@-t $@ && \
sed -n -e '/GL_ARG_NONNULL/,$$p' \
< $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
> $@-t && \
mv $@-t $@
MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
ARG_NONNULL_H=arg-nonnull.h ARG_NONNULL_H=$(srcdir)/arg-nonnull.h
EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h EXTRA_DIST += arg-nonnull.h
## end gnulib module snippet/arg-nonnull ## end gnulib module snippet/arg-nonnull
## begin gnulib module snippet/c++defs ## begin gnulib module snippet/c++defs
# The BUILT_SOURCES created by this Makefile snippet are not used via #include # Because this Makefile snippet defines a variable used by other
# statements but through direct file reference. Therefore this snippet must be # gnulib Makefile snippets, it must be present in all makefiles that
# present in all Makefile.am that need it. This is ensured by the applicability # need it. This is ensured by the applicability 'all' defined above.
# 'all' defined above.
BUILT_SOURCES += c++defs.h
# The c++defs.h that gets inserted into generated .h files is the same as
# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h
$(AM_V_GEN)rm -f $@-t $@ && \
sed -n -e '/_GL_CXXDEFS/,$$p' \
< $(top_srcdir)/build-aux/snippet/c++defs.h \
> $@-t && \
mv $@-t $@
MOSTLYCLEANFILES += c++defs.h c++defs.h-t
CXXDEFS_H=c++defs.h CXXDEFS_H=$(srcdir)/c++defs.h
EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h EXTRA_DIST += c++defs.h
## end gnulib module snippet/c++defs ## end gnulib module snippet/c++defs
## begin gnulib module snippet/warn-on-use ## begin gnulib module snippet/warn-on-use
BUILT_SOURCES += warn-on-use.h # Because this Makefile snippet defines a variable used by other
# The warn-on-use.h that gets inserted into generated .h files is the same as # gnulib Makefile snippets, it must be present in all makefiles that
# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut # need it. This is ensured by the applicability 'all' defined above.
# off.
warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h
$(AM_V_GEN)rm -f $@-t $@ && \
sed -n -e '/^.ifndef/,$$p' \
< $(top_srcdir)/build-aux/snippet/warn-on-use.h \
> $@-t && \
mv $@-t $@
MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
WARN_ON_USE_H=warn-on-use.h WARN_ON_USE_H=$(srcdir)/warn-on-use.h
EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h EXTRA_DIST += warn-on-use.h
## end gnulib module snippet/warn-on-use ## end gnulib module snippet/warn-on-use
......
...@@ -787,6 +787,8 @@ changequote([, ])dnl ...@@ -787,6 +787,8 @@ changequote([, ])dnl
AC_SUBST([LIBGNU_LIBDEPS]) AC_SUBST([LIBGNU_LIBDEPS])
LIBGNU_LTLIBDEPS="$gl_ltlibdeps" LIBGNU_LTLIBDEPS="$gl_ltlibdeps"
AC_SUBST([LIBGNU_LTLIBDEPS]) AC_SUBST([LIBGNU_LTLIBDEPS])
LIBTESTS_LIBDEPS="$gltests_libdeps"
AC_SUBST([LIBTESTS_LIBDEPS])
]) ])
# Like AC_LIBOBJ, except that the module name goes # Like AC_LIBOBJ, except that the module name goes
...@@ -847,11 +849,8 @@ AC_DEFUN([gltests_LIBSOURCES], [ ...@@ -847,11 +849,8 @@ AC_DEFUN([gltests_LIBSOURCES], [
# gnulib-tool and may be removed by future gnulib-tool invocations. # gnulib-tool and may be removed by future gnulib-tool invocations.
AC_DEFUN([gl_FILE_LIST], [ AC_DEFUN([gl_FILE_LIST], [
build-aux/gitlog-to-changelog 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 build-aux/update-copyright
lib/_Noreturn.h
lib/acl-errno-valid.c lib/acl-errno-valid.c
lib/acl-internal.c lib/acl-internal.c
lib/acl-internal.h lib/acl-internal.h
...@@ -860,10 +859,12 @@ AC_DEFUN([gl_FILE_LIST], [ ...@@ -860,10 +859,12 @@ AC_DEFUN([gl_FILE_LIST], [
lib/alloca.in.h lib/alloca.in.h
lib/allocator.c lib/allocator.c
lib/allocator.h lib/allocator.h
lib/arg-nonnull.h
lib/at-func.c lib/at-func.c
lib/binary-io.c lib/binary-io.c
lib/binary-io.h lib/binary-io.h
lib/byteswap.in.h lib/byteswap.in.h
lib/c++defs.h
lib/c-ctype.c lib/c-ctype.c
lib/c-ctype.h lib/c-ctype.h
lib/c-strcase.h lib/c-strcase.h
...@@ -995,6 +996,7 @@ AC_DEFUN([gl_FILE_LIST], [ ...@@ -995,6 +996,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/utimens.h lib/utimens.h
lib/verify.h lib/verify.h
lib/vla.h lib/vla.h
lib/warn-on-use.h
lib/xalloc-oversized.h lib/xalloc-oversized.h
m4/00gnulib.m4 m4/00gnulib.m4
m4/absolute-header.m4 m4/absolute-header.m4
...@@ -1104,4 +1106,9 @@ AC_DEFUN([gl_FILE_LIST], [ ...@@ -1104,4 +1106,9 @@ AC_DEFUN([gl_FILE_LIST], [
m4/warnings.m4 m4/warnings.m4
m4/wchar_t.m4 m4/wchar_t.m4
m4/wint_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
]) ])
...@@ -366,7 +366,7 @@ ln aclocal.m4 CONTRIBUTE ${tempdir} ...@@ -366,7 +366,7 @@ ln aclocal.m4 CONTRIBUTE ${tempdir}
echo "Creating subdirectories" echo "Creating subdirectories"
for subdir in site-lisp \ for subdir in site-lisp \
leim leim/CXTERM-DIC leim/MISC-DIC leim/SKK-DIC \ leim leim/CXTERM-DIC leim/MISC-DIC leim/SKK-DIC \
build-aux build-aux/snippet \ build-aux \
src src/bitmaps lib lib-src oldXMenu lwlib \ src src/bitmaps lib lib-src oldXMenu lwlib \
nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
`find etc lisp admin test -type d` \ `find etc lisp admin test -type d` \
...@@ -424,10 +424,6 @@ echo "Making links to 'build-aux'" ...@@ -424,10 +424,6 @@ echo "Making links to 'build-aux'"
ln update-copyright update-subdirs ../${tempdir}/build-aux ln update-copyright update-subdirs ../${tempdir}/build-aux
ln dir_top make-info-dir ar-lib ../${tempdir}/build-aux) ln dir_top make-info-dir ar-lib ../${tempdir}/build-aux)
echo "Making links to 'build-aux/snippet'"
(cd build-aux/snippet
ln *.h ../../${tempdir}/build-aux/snippet)
echo "Making links to 'src'" echo "Making links to 'src'"
### Don't distribute the configured versions of ### Don't distribute the configured versions of
### config.in, paths.in, buildobj.h, or Makefile.in. ### config.in, paths.in, buildobj.h, or Makefile.in.
...@@ -446,13 +442,12 @@ echo "Making links to 'src/bitmaps'" ...@@ -446,13 +442,12 @@ echo "Making links to 'src/bitmaps'"
ln README *.xbm ../../${tempdir}/src/bitmaps) ln README *.xbm ../../${tempdir}/src/bitmaps)
echo "Making links to 'lib'" echo "Making links to 'lib'"
(snippet_h=`(cd build-aux/snippet && ls *.h)` (cd lib
cd lib ln [a-zA-Z_]*.[ch] ../${tempdir}/lib
ln [a-zA-Z]*.[ch] ../${tempdir}/lib
ln gnulib.mk Makefile.am Makefile.in ../${tempdir}/lib ln gnulib.mk Makefile.am Makefile.in ../${tempdir}/lib
cd ../${tempdir}/lib cd ../${tempdir}/lib
script='/[*]/d; s/\.in\.h$/.h/' script='/[*]/d; s/\.in\.h$/.h/'
rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`) rm -f `ls *.in.h | sed "$script"`)
echo "Making links to 'lib-src'" echo "Making links to 'lib-src'"
(cd lib-src (cd lib-src
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment