Merge: Remove HAVE_RAW_DECL_CHOWN etc. from config.h

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b9237edac885bc438ff6b92453323b8236d0a29f..c1d13a27554a6d163595b59ff85c959474cb73fa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -260,7 +260,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution.
 # leim is not included because it needs special handling.
-# 
+#
 # Actually, we now include `lisp' as well, since the compiled files
 # are not included any more in case of bootstrap or in case Emacs was
 # checked out from a VCS.
@@ -300,8 +300,7 @@ epaths-force: FRC
          -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'             \
          -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
          -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
-         -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
-         -e 's;/[*] *arch-tag:.*;/*;') &&              \
+         -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') &&                \
        ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
 
 # For parallel make, src should be built before leim.
@@ -336,6 +335,7 @@ GNULIB_TOOL_FLAGS = \
 sync-from-gnulib: $(gnulib_srcdir)
        cd $(srcdir) && \
          $(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES)
+       rm $(srcdir)/m4/warn-on-use.m4
        cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc
        cp \
          $(gnulib_srcdir)/build-aux/config.sub \
@@ -344,6 +344,7 @@ sync-from-gnulib: $(gnulib_srcdir)
          $(gnulib_srcdir)/build-aux/mkinstalldirs \
          $(gnulib_srcdir)/build-aux/move-if-change \
          $(srcdir)
+       cd $(srcdir) && autoreconf -I m4
 .PHONY: sync-from-gnulib
 
 # These targets should be "${SUBDIR} without `src'".
@@ -407,14 +408,15 @@ AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
 $(srcdir)/configure: $(AUTOCONF_INPUTS)
        cd ${srcdir} && autoconf
 
-ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4 
+ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4
 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
        cd $(srcdir) && aclocal -I m4
 
 AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am
 $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
        cd $(srcdir) && automake --gnu -a -c lib/Makefile
-am--refresh:
+am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in
+.PHONY: am--refresh
 
 $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
        @ # Usually, there's no need to rebuild src/config.in just
@@ -787,7 +789,7 @@ top_bootclean=\
 ###      distribution.
 top_distclean=\
        ${top_bootclean}; \
-       rm -f config.status Makefile ${SUBDIR_MAKEFILES}
+       rm -f config.status Makefile stamp-h1 ${SUBDIR_MAKEFILES}
 distclean: FRC
        (cd src;      $(MAKE) $(MFLAGS) distclean)
        (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
@@ -832,11 +834,9 @@ bootstrap-clean: FRC
 ###      begin to build the program.
 top_maintainer_clean=\
        ${top_distclean}; \
-       rm -fr autom4te.cache; \
-       rm -f aclocal.m4 lib/gnulib.mk m4/gnulib-cache.m4
+       rm -fr autom4te.cache
 maintainer-clean: bootstrap-clean FRC
        (cd src;      $(MAKE) $(MFLAGS) maintainer-clean)
-       (cd lib;      $(MAKE) $(MFLAGS) maintainer-clean)
        (cd lisp;     $(MAKE) $(MFLAGS) maintainer-clean)
        ${top_maintainer_clean}
 
@@ -863,7 +863,7 @@ dist:
 
 .PHONY: info dvi dist check html
 
-info-real: 
+info-real:
        (cd doc/emacs; $(MAKE) $(MFLAGS) info)
        (cd doc/misc; $(MAKE) $(MFLAGS) info)
        (cd doc/lispref; $(MAKE) $(MFLAGS) info)