[Emacs-diffs] Changes to emacs/lisp/Makefile.in

[Stefan Monnier]

Index: emacs/lisp/Makefile.in
diff -c emacs/lisp/Makefile.in:1.32 emacs/lisp/Makefile.in:1.33
*** emacs/lisp/Makefile.in:1.32 Thu Mar 21 21:27:41 2002
--- emacs/lisp/Makefile.in      Fri Mar 22 18:36:15 2002
***************
*** 148,156 ****
        echo Directories: $$wins; \
        $(EMACS) $(EMACSOPT) -l cus-dep -f custom-make-dependencies $$wins
  
! finder-inf.el:
!       echo "(provide 'finder-inf)" >> $@
! finder-data: finder-inf.el doit
        wd=$(lisp); $(finder_setwins); \
        echo Directories: $$wins; \
        $(EMACS) $(EMACSOPT) -l finder -f finder-compile-keywords-make-dist 
$$wins
--- 148,154 ----
        echo Directories: $$wins; \
        $(EMACS) $(EMACSOPT) -l cus-dep -f custom-make-dependencies $$wins
  
! finder-data: doit
        wd=$(lisp); $(finder_setwins); \
        echo Directories: $$wins; \
        $(EMACS) $(EMACSOPT) -l finder -f finder-compile-keywords-make-dist 
$$wins
***************
*** 212,223 ****
  # current directory and its subdirectories, to make sure require's and
  # load's in the files being compiled find the right files.
  
  compile: subdirs.el doit
        find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
        wd=$(lisp); $(setwins); \
        elpat=`echo $$wins | tr '       ' '\012\012' | \
                sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
!       els=`echo $$elpat $(DONTCOMPILE) $(COMPILE_FIRST) | \
                tr '     ' '\012\012' | sort | uniq -u`; \
        for el in $(COMPILE_FIRST) $$els; do \
          echo Compiling $$el; \
--- 210,225 ----
  # current directory and its subdirectories, to make sure require's and
  # load's in the files being compiled find the right files.
  
+ # NOTE about DONTCOMPILE: in the `echo <foo> | sort | uniq -u' we pass
+ # $(DONTCOMPILE) twice.  This is in case one of the files in DONTCOMPILE
+ # is absent.  -stef
+ 
  compile: subdirs.el doit
        find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
        wd=$(lisp); $(setwins); \
        elpat=`echo $$wins | tr '       ' '\012\012' | \
                sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
!       els=`echo $$elpat $(DONTCOMPILE) $(DONTCOMPILE) $(COMPILE_FIRST) | \
                tr '     ' '\012\012' | sort | uniq -u`; \
        for el in $(COMPILE_FIRST) $$els; do \
          echo Compiling $$el; \
***************
*** 231,237 ****
        wd=$(lisp); $(setwins); \
        elpat=`echo $$wins | tr '       ' '\012\012' | \
                sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
!       els=`echo $$elpat $(DONTCOMPILE) $(COMPILE_FIRST) | \
                tr '     ' '\012\012' | sort | uniq -u`; \
        for el in $(COMPILE_FIRST) $$els; do \
          echo Compiling $$el; \
--- 233,239 ----
        wd=$(lisp); $(setwins); \
        elpat=`echo $$wins | tr '       ' '\012\012' | \
                sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
!       els=`echo $$elpat $(DONTCOMPILE) $(DONTCOMPILE) $(COMPILE_FIRST) | \
                tr '     ' '\012\012' | sort | uniq -u`; \
        for el in $(COMPILE_FIRST) $$els; do \
          echo Compiling $$el; \
***************
*** 269,280 ****
  # bootstrap-emacs will be built from sources only.
  
  bootstrap-clean:
!       if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi
        -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
  
  # Generate/update files for the bootstrap process.
  
! bootstrap: subdirs.el autoloads compile-always custom-deps
  
  distclean:
        -rm -f ./Makefile
--- 271,282 ----
  # bootstrap-emacs will be built from sources only.
  
  bootstrap-clean:
!       if test -x $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi
        -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
  
  # Generate/update files for the bootstrap process.
  
! bootstrap: update-subdirs autoloads compile finder-data custom-deps
  
  distclean:
        -rm -f ./Makefile