(change-log-mode-map): Add a menu.

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8425867ef298fa09bc6e32a94c1de44641aab392..4095976d7f9d59fe171c0583fe5c614d421e7c30 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # DIST: that first.
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -139,12 +139,12 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
 # since there are now many packages documented with the texinfo
 # system, it is inappropriate to imply that it is part of Emacs.
 infodir=@infodir@
-INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \
-           efaq eintr elisp emacs emacs-mime epa erc eshell eudc       \
+INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse  \
+           ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc \
            flymake forms gnus idlwave info mairix-el message mh-e      \
            newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember  \
-           sasl sc ses sieve speedbar tramp vip viper widget woman     \
-           smtpmail url
+           sasl sc ses sieve smtpmail speedbar tramp url vip viper     \
+           widget woman
 
 # Directory for local state files for all programs.
 localstatedir=@localstatedir@
@@ -320,6 +320,12 @@ src:       lib-src FRC
 # We need to build `emacs' in `src' to compile the *.elc files in `lisp'.
 lisp: src
 
+# These targets should be "${SUBDIR} without `src'".
+lib-src lisp: Makefile FRC
+       cd $@; $(MAKE) all $(MFLAGS)                           \
+         CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
+         LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
+
 # Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which
 # is either set to bootstrap-emacs (in case bootstrap-emacs has not been
 # constructed yet) or the empty string (otherwise).
@@ -329,12 +335,16 @@ lisp: src
 # file src/foo.c forces dumping a new bootstrap-emacs, then re-byte-compiling
 # all preloaded elisp files, and only then dump the actual src/emacs, which
 # is not wrong, but is overkill in 99.99% of the cases.
-${SUBDIR}: Makefile FRC
+src: Makefile FRC
        boot=bootstrap-emacs$(EXEEXT);                         \
-       if [ -x "src/$$boot" ]; then boot=""; fi;                   \
+       if [ ! -x "src/$$boot" ]; then                                     \
+           cd $@; $(MAKE) all $(MFLAGS)                                   \
+             CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'         \
+             LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"; \
+       fi;
        cd $@; $(MAKE) all $(MFLAGS)                           \
          CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
-         LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"
+         LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS=""
 
 blessmail: Makefile src FRC
        cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \
@@ -393,7 +403,7 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
 install: all install-arch-indep install-arch-dep install-leim blessmail
        @true
 
-MV_DIRS = for i in $$dir; do rm -fr $$(basename "$$i") ; mv "$$i" . ; done
+MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
 
 ### Install the executables that were compiled specifically for this machine.
 ### It would be nice to do something for a parallel make
@@ -477,6 +487,7 @@ install-arch-indep: mkdir info install-etc
                rm -rf $${subdir}/RCS ; \
                rm -rf $${subdir}/CVS ; \
                rm -f  $${subdir}/.cvsignore ; \
+               rm -f  $${subdir}/.gitignore ; \
                rm -f  $${subdir}/.arch-inventory ; \
                rm -f  $${subdir}/\#* ; \
                rm -f  $${subdir}/.\#* ; \