aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorPaul Eggert2011-03-20 22:34:48 -0700
committerPaul Eggert2011-03-20 22:34:48 -0700
commit6e5fa6bfce1362c2ebf049fcfa1e6f2a4762ccef (patch)
treef7ff137da14c352412ee3dc3fbcaf1316428fd97 /Makefile.in
parent81e56e612dab7d80485c640068531710a713d205 (diff)
parent77185bdf91d42fb19c02af0f51ce63280ce911a0 (diff)
downloademacs-6e5fa6bfce1362c2ebf049fcfa1e6f2a4762ccef.tar.gz
emacs-6e5fa6bfce1362c2ebf049fcfa1e6f2a4762ccef.zip
Merge from trunk and from gnulib stdio.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index bc8ae5a9589..4dd8cff1bbc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -332,7 +332,8 @@ DOS_gnulib_comp.m4 = gl-comp.m4
332# as per $(gnulib_srcdir)/DEPENDENCIES. 332# as per $(gnulib_srcdir)/DEPENDENCIES.
333GNULIB_MODULES = \ 333GNULIB_MODULES = \
334 crypto/md5 dtoastr filemode getloadavg getopt-gnu \ 334 crypto/md5 dtoastr filemode getloadavg getopt-gnu \
335 ignore-value intprops lstat mktime readlink socklen strftime symlink sys_stat 335 ignore-value intprops lstat mktime readlink \
336 socklen stdio strftime symlink sys_stat
336GNULIB_TOOL_FLAGS = \ 337GNULIB_TOOL_FLAGS = \
337 --import --no-changelog --no-vc-files --makefile-name=gnulib.mk 338 --import --no-changelog --no-vc-files --makefile-name=gnulib.mk
338sync-from-gnulib: $(gnulib_srcdir) 339sync-from-gnulib: $(gnulib_srcdir)