*** empty log message ***

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f40277410b877ed4924be5eec1dda813dc03693a..78e51fccdbe6fefe2b6c0b27e8c4884d6713a592 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 Free Software Foundation, Inc.
+#  2000, 2001, 2002 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -210,8 +210,7 @@ EMACS = `echo emacs | sed '$(TRANSFORM)'`
 EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`
 
 # Subdirectories to make recursively.  `lisp' is not included
-# because the compiled lisp files are part of the distribution
-# and you cannot remake them without installing Emacs first.
+# because the compiled lisp files are part of the distribution.
 # leim is not included because it needs special handling.
 SUBDIR = lib-src src
 
@@ -227,6 +226,9 @@ SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Make
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 
+# Set to FRC to force running autoconf and autoheader
+MAINT = 
+
 all: ${SUBDIR} leim
 
 removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
@@ -277,9 +279,16 @@ Makefile: $(srcdir)/Makefile.in config.status
 config.status: ${srcdir}/configure
        ./config.status --recheck
 
-${srcdir}/configure: configure.in
+${srcdir}/configure: $(MAINT)
        cd ${srcdir} && autoconf
 
+$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
+       @true
+$(srcdir)/src/stamp-h.in: $(MAINT)
+       cd ${srcdir} && autoheader
+       rm -f $(srcdir)/src/stamp-h.in
+       echo timestamp > $(srcdir)/src/stamp-h.in
+
 src/Makefile: $(srcdir)/src/Makefile.in config.status
        ./config.status
 
@@ -356,6 +365,9 @@ install-arch-dep: mkdir
 
 ## Note that we copy DOC* and then delete DOC
 ## as a workaround for a bug in tar on Ultrix 4.2.
+
+## If people complain about the h flag in tar command, take that out.
+## That flag is also used in leim/Makefile.in
 install-arch-indep: mkdir info
        -set ${COPYDESTS} ; \
        unset CDPATH; \
@@ -441,7 +453,7 @@ install-arch-indep: mkdir info
              chmod a+r ${infodir}/dir); \
           fi; \
           cd ${srcdir}/info ; \
-          for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \
+          for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* tramp* vip* widget* woman*; do \
             (cd $${thisdir}; \
              ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
              chmod a+r ${infodir}/$$f); \
@@ -451,7 +463,7 @@ install-arch-indep: mkdir info
        thisdir=`/bin/pwd`; \
        if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
        then \
-         for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \
+         for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar tramp vip viper widget woman; do \
            (cd $${thisdir}; \
             ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
          done; \
@@ -517,7 +529,7 @@ uninstall:
        done
        (cd ${archlibdir} && rm -f fns-*)
        -rm -rf ${libexecdir}/emacs/${version}
-       (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
+       (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
        (cd ${man1dir}  && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
        (cd ${bindir}  && rm -f $(EMACSFULL) $(EMACS))