(hs-set-up-overlay): New user var.

[gnu-emacs] / lisp / Makefile.in

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 49d3ffda651bddf47492b9828417ae940abac125..e87ffa6f26574d30a9e2523dab9f91d1a74acf37 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,5 +1,5 @@
 # Maintenance productions for the Lisp directory
-# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 01, 03, 2004  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -110,6 +110,13 @@ DONTCOMPILE = \
        $(lisp)/term/wyse50.el \
        $(lisp)/version.el
 
+# Elisp files auto-generated.
+AUTOGENEL = loaddefs.el \
+       cus-load.el \
+       finder-inf.el \
+       subdirs.el \
+       eshell/esh-groups.el
+
 # Files to compile before others during a bootstrap.  This is done to
 # speed up the bootstrap process.  The CC files are compiled first
 # because CC mode tweaks the compilation process, and requiring
@@ -129,17 +136,17 @@ emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
 
-setwins=subdirs=`find $$wd -type d -print`; \
+setwins=subdirs=`(cd $$wd; find . -type d -print)`; \
        for file in $$subdirs; do \
-          case $$file in */Old | */RCS | */CVS | */CVS/* | */.arch-ids | */.arch-ids/* | */=* ) ;; \
-               *) wins="$$wins $$file" ;; \
+          case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* ) ;; \
+               *) wins="$$wins $$wd/$$file" ;; \
           esac; \
         done
 
-setwins_almost=subdirs=`find $$wd -type d -print`; \
+setwins_almost=subdirs=`(cd $$wd; find . -type d -print)`; \
        for file in $$subdirs; do \
-          case $$file in */Old | */RCS | */CVS | */CVS/* | */=* | */obsolete | */term ) ;; \
-               *) wins="$$wins $$file" ;; \
+          case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */obsolete | */term ) ;; \
+               *) wins="$$wins $$wd/$$file" ;; \
           esac; \
         done
 
@@ -188,11 +195,11 @@ update-authors:
        $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir)
 
 TAGS: $(lisptagsfiles1) $(lisptagsfiles2)
-       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs.*\.el,,"`; \
+       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \
        ${ETAGS} $$els
 
 TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
-       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs.*\.el,,"`; \
+       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \
        ${ETAGS} -o TAGS-LISP $$els
 
 .SUFFIXES: .elc .el
@@ -273,14 +280,17 @@ compile-after-backup: backup-compiled-files compile-always
 # Note that this doesn't create .elc files.  It only recompiles if an
 # .elc is present.
 
-recompile: doit progmodes/cc-mode.elc
-       $(EMACS) $(EMACSOPT) -f batch-byte-recompile-directory $(lisp)
+recompile: doit $(lisp)/progmodes/cc-mode.elc
+       $(EMACS) $(EMACSOPT) --eval "(batch-byte-recompile-directory 0)" $(lisp)
 
 # CC Mode uses a compile time macro system which causes a compile time
 # dependency in cc-mode.elc on the macros in cc-langs.el and the
 # version string in cc-defs.el.
-progmodes/cc-mode.elc: progmodes/cc-mode.el progmodes/cc-langs.el progmodes/cc-defs.el
-       $(EMACS) $(EMACSOPT) -f batch-byte-compile progmodes/cc-mode.el
+$(lisp)/progmodes/cc-mode.elc: \
+       $(lisp)/progmodes/cc-mode.el \
+       $(lisp)/progmodes/cc-langs.el \
+       $(lisp)/progmodes/cc-defs.el
+       $(EMACS) $(EMACSOPT) -f batch-byte-compile $(lisp)/progmodes/cc-mode.el
 
 # Prepare a bootstrap in the lisp subdirectory.
 #
@@ -291,11 +301,8 @@ progmodes/cc-mode.elc: progmodes/cc-mode.el progmodes/cc-langs.el progmodes/cc-d
 # it's necessary for generating the binary (because loaddefs.el is an
 # automatically generated file, we don't want to store it in the source
 # repository).
-#
-# Remove compiled Lisp files so that bootstrap-emacs will be built from
-# sources only.
 
-bootstrap-clean:
+bootstrap-prepare:
        if test -x $(EMACS); then                               \
          $(MAKE) $(MFLAGS) autoloads;                          \
        else                                                    \
@@ -303,6 +310,11 @@ bootstrap-clean:
            cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el;       \
          fi                                                    \
        fi
+
+maintainer-clean: distclean
+       cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL)
+
+bootstrap-clean:
        cd $(lisp); rm -f *.elc */*.elc
 
 # Generate/update files for the bootstrap process.
@@ -317,5 +329,4 @@ bootstrap-after: finder-data custom-deps
 distclean:
        -rm -f ./Makefile
 
-# arch-tag: d4ea703a-b91c-405c-a171-8dde30b163a7
 # Makefile ends here.