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 /make-dist | |
| 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 'make-dist')
| -rwxr-xr-x | make-dist | 13 |
1 files changed, 4 insertions, 9 deletions
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 |