diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-20 19:33:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-20 19:33:13 -0700 |
| commit | 9b4ee6166fd8da5f8006a265f775d84e60c15be7 (patch) | |
| tree | 93ab66a914aecf8114ce919fab4cc34ed0ae0d5b /Makefile.in | |
| parent | b847032c75e0cb4041a8736886e7054beb6f8696 (diff) | |
| download | emacs-9b4ee6166fd8da5f8006a265f775d84e60c15be7.tar.gz | |
Make merging from gnulib a script, not a makefile action.
Putting it in a makefile has some problems with reflection, as
merging from gnulib updates 'configure', which can update the makefile.
Putting it in a standalone script breaks this loop.
* Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
(GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
Remove, moving the actions to the script admin/merge-gnulib.
* admin/merge-gnulib: New script, with actions moved here from
../Makefile.in.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/Makefile.in b/Makefile.in index 90afd2310dd..f978f19e974 100644 --- a/Makefile.in +++ b/Makefile.in @@ -309,43 +309,6 @@ src: lib-src FRC # and `leim'. lisp leim: src -# Maintainers can put a copy of gnulib into $(gnulib_srcdir). -gnulib_srcdir = ../gnulib -$(gnulib_srcdir): - git clone git://git.savannah.gnu.org/gnulib.git $@ - -# A shorter name that satisfies MS-DOS 8+3 constraints. -DOS_gnulib_comp.m4 = gl-comp.m4 - -# Update modules from gnulib, for maintainers, who should have it in -# $(gnulib_srcdir) (relative to $(srcdir) and should have build tools -# as per $(gnulib_srcdir)/DEPENDENCIES. -GNULIB_MODULES = \ - alloca-opt \ - careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr \ - dup2 \ - filemode getloadavg getopt-gnu ignore-value intprops lstat \ - manywarnings mktime pthread_sigmask readlink \ - socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat \ - warnings -GNULIB_TOOL_FLAGS = \ - --avoid=msvc-inval --avoid=msvc-nothrow \ - --avoid=raise --avoid=threadlib \ - --conditional-dependencies --import --no-changelog --no-vc-files \ - --makefile-name=gnulib.mk -sync-from-gnulib: $(gnulib_srcdir) - -cd $(srcdir)/m4 && cp $(DOS_gnulib_comp.m4) gnulib-comp.m4 - cd $(srcdir) && \ - $(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES) - cd $(srcdir)/m4 && rm gnulib-cache.m4 warn-on-use.m4 - cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS_gnulib_comp.m4) - cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc - cp \ - $(gnulib_srcdir)/build-aux/move-if-change \ - $(srcdir)/build-aux - cd $(srcdir) && autoreconf -i -I m4 -.PHONY: sync-from-gnulib - # These targets should be "${SUBDIR} without `src'". lib lib-src lisp leim: Makefile FRC cd $@ && $(MAKE) all $(MFLAGS) \ |