diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | admin/authors.el | 2 | ||||
| -rw-r--r-- | admin/notes/copyright | 4 | ||||
| -rw-r--r-- | lib/_Noreturn.h (renamed from build-aux/snippet/_Noreturn.h) | 0 | ||||
| -rw-r--r-- | lib/arg-nonnull.h (renamed from build-aux/snippet/arg-nonnull.h) | 0 | ||||
| -rw-r--r-- | lib/c++defs.h (renamed from build-aux/snippet/c++defs.h) | 0 | ||||
| -rw-r--r-- | lib/gnulib.mk | 70 | ||||
| -rw-r--r-- | lib/warn-on-use.h (renamed from build-aux/snippet/warn-on-use.h) | 0 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 15 | ||||
| -rwxr-xr-x | make-dist | 13 |
10 files changed, 36 insertions, 73 deletions
diff --git a/.gitignore b/.gitignore index e8eb4fdeaed..f5265ff1ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -57,9 +57,7 @@ src/epaths.h # C-level sources built by 'make'. lib/alloca.h -lib/arg-nonnull.h lib/byteswap.h -lib/c++defs.h lib/dirent.h lib/errno.h lib/execinfo.h @@ -76,7 +74,6 @@ lib/string.h lib/sys/ lib/time.h lib/unistd.h -lib/warn-on-use.h src/buildobj.h src/globals.h src/lisp.mk @@ -274,7 +271,7 @@ etc/emacs.tmpdesktop # Microsoft-related builds and installations. *.in-h _* -!build-aux/snippet/_Noreturn.h +!lib/_Noreturn.h /bin/ /BIN/ /data/ diff --git a/admin/authors.el b/admin/authors.el index 69f1c96983c..d8f56fd9258 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -980,7 +980,7 @@ Elements are (OLDNAME . NEWNAME).") ;; Cf authors-renamed-files-alist. (defconst authors-renamed-files-regexps '(("\\`\\(arg-nonnull\\|c\\+\\+defs\\|warn-on-use\\)\\.h\\'" - "build-aux/snippet/\\&") + "lib/\\&") ("\\`\\(ebuild\\|emacs\\|install\\|fast-install\\)\\.cmd\\'" "\\1.bat") ("\\`\\(book-spine\\|cl\\|forms\\|functions\\|gnus\\|sc\\|texinfo\\|vip\\)\ \\.texinfo\\'" "\\1.texi") diff --git a/admin/notes/copyright b/admin/notes/copyright index 16144fb8528..66c69ac0279 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -541,10 +541,6 @@ alone (may import them from Gnulib again). These are: build-aux/depcomp build-aux/missing 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 lib/*.[ch] lib/gnulib.mk diff --git a/build-aux/snippet/_Noreturn.h b/lib/_Noreturn.h index c44ad89b7c0..c44ad89b7c0 100644 --- a/build-aux/snippet/_Noreturn.h +++ b/lib/_Noreturn.h diff --git a/build-aux/snippet/arg-nonnull.h b/lib/arg-nonnull.h index 1e62cc89827..1e62cc89827 100644 --- a/build-aux/snippet/arg-nonnull.h +++ b/lib/arg-nonnull.h diff --git a/build-aux/snippet/c++defs.h b/lib/c++defs.h index f03f3591c35..f03f3591c35 100644 --- a/build-aux/snippet/c++defs.h +++ b/lib/c++defs.h diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 7a0de1b440d..4109e7f6af5 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -25,6 +25,7 @@ MOSTLYCLEANFILES += core *.stackdump +# No GNU Make output. noinst_LIBRARIES += libgnu.a @@ -873,81 +874,48 @@ EXTRA_DIST += signal.in.h ## begin gnulib module snippet/_Noreturn # 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. -_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 ## begin gnulib module snippet/arg-nonnull -# 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 += 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 +# 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. -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 ## begin gnulib module snippet/c++defs -# 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 += 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 +# 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. -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 ## begin gnulib module snippet/warn-on-use -BUILT_SOURCES += warn-on-use.h -# The warn-on-use.h that gets inserted into generated .h files is the same as -# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut -# 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 +# 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. -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 diff --git a/build-aux/snippet/warn-on-use.h b/lib/warn-on-use.h index 3c0eb579fa2..3c0eb579fa2 100644 --- a/build-aux/snippet/warn-on-use.h +++ b/lib/warn-on-use.h 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 ]) diff --git a/make-dist b/make-dist index 4054075e3aa..5370d03891e 100755 --- a/make-dist +++ b/make-dist @@ -366,7 +366,7 @@ ln aclocal.m4 CONTRIBUTE ${tempdir} echo "Creating subdirectories" for subdir in site-lisp \ 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 \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ `find etc lisp admin test -type d` \ @@ -424,10 +424,6 @@ echo "Making links to 'build-aux'" ln update-copyright update-subdirs ../${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'" ### Don't distribute the configured versions of ### config.in, paths.in, buildobj.h, or Makefile.in. @@ -446,13 +442,12 @@ echo "Making links to 'src/bitmaps'" ln README *.xbm ../../${tempdir}/src/bitmaps) echo "Making links to 'lib'" -(snippet_h=`(cd build-aux/snippet && ls *.h)` - cd lib - ln [a-zA-Z]*.[ch] ../${tempdir}/lib +(cd lib + ln [a-zA-Z_]*.[ch] ../${tempdir}/lib ln gnulib.mk Makefile.am Makefile.in ../${tempdir}/lib cd ../${tempdir}/lib 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'" (cd lib-src |