Merge from emacs-23

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 439c373..4e21fc7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,7 +134,7 @@ MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
 infodir=@infodir@
 INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse  \
            ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
-          eshell eudc flymake forms gnus idlwave info mairix-el        \
+          ert eshell eudc flymake forms gnus idlwave info mairix-el    \
           message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc      \
           reftex remember sasl sc semantic ses sieve smtpmail speedbar \
           tramp url vip viper widget woman
@@ -260,14 +260,14 @@ 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.
 SUBDIR = lib lib-src src lisp
 
 # The subdir makefiles created by config.status.
-SUBDIR_MAKEFILES = lib/Makefile lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
+SUBDIR_MAKEFILES = lib/Makefile lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile test/automated/Makefile
 
 # Subdirectories to install, and where they'll go.
 # lib-src's makefile knows how to install it, so we don't do that here.
@@ -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.
@@ -330,7 +329,7 @@ $(gnulib_srcdir):
 # 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 = ftoastr getopt-gnu mktime
+GNULIB_MODULES = dtoastr getopt-gnu mktime
 GNULIB_TOOL_FLAGS = \
  --import --no-changelog --no-vc-files --makefile-name=gnulib.mk
 sync-from-gnulib: $(gnulib_srcdir)
@@ -344,6 +343,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'".
@@ -395,7 +395,8 @@ Makefile: config.status $(srcdir)/src/config.in \
           $(srcdir)/oldXMenu/Makefile.in \
           $(srcdir)/lwlib/Makefile.in \
           $(srcdir)/leim/Makefile.in \
-          $(srcdir)/lisp/Makefile.in
+          $(srcdir)/lisp/Makefile.in \
+          $(srcdir)/test/automated/Makefile.in
        ./config.status
 
 config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
@@ -406,14 +407,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
@@ -786,7 +788,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)
@@ -831,11 +833,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}
 
@@ -855,14 +855,14 @@ TAGS tags: lib lib-src src
        cd src; $(MAKE) tags
 
 check:
-       @echo "We don't have any tests for GNU Emacs yet."
+       cd test/automated; $(MAKE) check
 
 dist:
        cd ${srcdir}; ./make-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)