X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/121ff7117abe322aa9f0836bcf454cb835be66cf..bbdb68b67a9e467c4bd5ae8610665747b72a17ac:/Makefile.in diff --git a/Makefile.in b/Makefile.in index cb06114a88..12ef4befb4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,8 +2,8 @@ # DIST: make most of the changes to this file you might want, so try # DIST: that first. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,04,2005,2006 +# Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -19,8 +19,8 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # make all to compile and build Emacs. # make install to install it. @@ -34,25 +34,39 @@ # with them. # # Delete `.dvi' files here if they are not part of the distribution. -# +# # make distclean # Delete all files from the current directory that are created by # configuring or building the program. If you have unpacked the # source and built the program without creating any other files, # `make distclean' should leave only the files that were in the # distribution. -# +# # make maintainer-clean # Delete everything from the current directory that can be # reconstructed with this Makefile. This typically includes -# everything deleted by distclean, plus more: C source files -# produced by Bison, tags tables, info files, and so on. +# everything deleted by distclean, plus more: .elc files, +# C source files produced by Bison, tags tables, info files, +# and so on. # # make extraclean # Still more severe - delete backup and autosave files, too. +# +# make bootstrap +# Recompiles all the Emacs Lisp files using the latest source, +# then rebuilds Emacs. +# +# make bootfast +# Recompiles changed Emacs Lisp files using the latest C source, +# then rebuilds Emacs. This is faster than `make bootstrap' +# but once in a while an old .elc file can cause trouble. SHELL = /bin/sh +# This may not work with certain non-GNU make's. It only matters when +# inheriting a CDPATH not starting with the current directory. +CDPATH= + # If Make doesn't predefine MAKE, set it here. @SET_MAKE@ @@ -68,7 +82,7 @@ LDFLAGS=@LDFLAGS@ CPPFLAGS=@CPPFLAGS@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@ -YACC=@YACC@ +EXEEXT=@EXEEXT@ ### These help us choose version- and architecture-specific directories ### to install files in. @@ -120,6 +134,14 @@ man1dir=$(mandir)/man1 # 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 dired-x ebrowse ediff efaq \ + elisp eintr emacs emacs-mime emacs-xtra eshell eudc flymake \ + forms gnus idlwave info message mh-e newsticker org pcl-cvs \ + pgg reftex sc ses sieve speedbar tramp vip viper widget \ + woman smtpmail url rcirc erc + +# Directory for local state files for all programs. +localstatedir=@localstatedir@ # Where to look for bitmap files. bitmapdir=@bitmapdir@ @@ -138,6 +160,9 @@ VPATH=@srcdir@ # Where to find the application default. x_default_search_path=@x_default_search_path@ +# Location to install Emacs.app on Mac OS X +carbon_appdir=@carbon_appdir@ + # ==================== Emacs-specific directories ==================== # These variables hold the values Emacs will actually use. They are @@ -165,7 +190,7 @@ lisppath=@lisppath@ # building. This is only used during the process of # compiling Emacs, to help Emacs find its lisp files # before they've been installed in their final location. -# It's usually identical to lisppath, except that +# It's usually identical to lisppath, except that # it does not include locallisppath, and the # entry for the directory containing the installed lisp # files has been replaced with ../lisp. This should be a @@ -190,29 +215,38 @@ archlibdir=@archlibdir@ # Where to put the docstring file. docdir=@docdir@ +# Where to install Emacs game score files. +gamedir=@gamedir@ + # ==================== Utility Programs for the Build ==================== # Allow the user to specify the install program. INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_INFO = install-info +INSTALL_INFO = @INSTALL_INFO@ # By default, we uphold the dignity of our programs. INSTALL_STRIP = +# We use gzip to compress installed .el files. +GZIP_PROG = @GZIP_PROG@ + # ============================= Targets ============================== +# Program name transformation. +TRANSFORM = @program_transform_name@ + # What emacs should be called when installed. -EMACS = emacs +EMACS = `echo emacs${EXEEXT} | sed '$(TRANSFORM)'` +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 -# 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 # The makefiles of the directories in $SUBDIR. -SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile +SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/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. @@ -221,7 +255,7 @@ SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile # avoid nuking an existing dir file, so we don't do that here; # instead, we have written out explicit code in the `install' targets. COPYDIR = ${srcdir}/etc ${srcdir}/lisp -COPYDESTS = ${etcdir} ${lispdir} +COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} all: ${SUBDIR} leim @@ -232,15 +266,18 @@ epaths-force: FRC @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ x_default_search_path=`echo ${x_default_search_path}`; \ + gamedir=`echo ${gamedir}`; \ sed < ${srcdir}/src/epaths.in > epaths.h.$$$$ \ - -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ - -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ + -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'"$${lisppath}"'";' \ + -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'"$${buildlisppath}"'";' \ -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \ - -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ + -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \ + -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ + -e 's;/[*] *arch-tag:.*;/*;') && \ ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h # For parallel make, src should be build before leim. @@ -258,7 +295,7 @@ lib-src: FRC src/config.stamp .RECURSIVE: ${SUBDIR} leim -${SUBDIR}: ${SUBDIR_MAKEFILES} FRC +${SUBDIR}: maybe_bootstrap ${SUBDIR_MAKEFILES} FRC cd $@; $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' @@ -273,9 +310,18 @@ Makefile: $(srcdir)/Makefile.in config.status config.status: ${srcdir}/configure ./config.status --recheck -${srcdir}/configure: configure.in +AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4 + +$(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && autoconf +$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in + @true +$(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) + 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 @@ -289,6 +335,12 @@ lib-src/Makefile: $(srcdir)/lib-src/Makefile.in config.status man/Makefile: $(srcdir)/man/Makefile.in config.status ./config.status +lispref/Makefile: $(srcdir)/lispref/Makefile.in config.status + ./config.status + +lispintro/Makefile: $(srcdir)/lispintro/Makefile.in config.status + ./config.status + oldXMenu/Makefile: $(srcdir)/oldXMenu/Makefile.in config.status ./config.status @@ -328,16 +380,22 @@ install-arch-dep: mkdir exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \ INSTALL_STRIP=${INSTALL_STRIP}) - ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/emacs-${version} - -chmod 1755 ${bindir}/emacs-${version} - rm -f ${bindir}/$(EMACS) - -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS) + ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) + -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) + rm -f $(DESTDIR)${bindir}/$(EMACS) + -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) -unset CDPATH; \ for f in `cd lib-src && echo fns-*.el`; do \ if test -r lib-src/$$f ; then \ - ${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \ + ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \ else true; fi ; \ done + if test "${carbon_appdir}" != ""; then \ + umask 022; mkdir -p $(DESTDIR)${carbon_appdir}/Emacs.app; \ + (cd mac/Emacs.app; (tar -chf - . | \ + (cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \ + && cat > /dev/null))) || exit 1; \ + fi ### Install the files that are machine-independent. ### Most of them come straight from the distribution; @@ -346,6 +404,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; \ @@ -364,14 +425,16 @@ install-arch-indep: mkdir info [ -d $${dir} ] \ && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \ && (echo "Copying $${dir} to $${dest}..." ; \ - (cd $${dir}; tar -cf - . ) \ + (cd $${dir}; tar -chf - . ) \ | (cd $${dest}; umask 022; \ tar -xvf - && cat > /dev/null) || exit 1; \ + find $${dest} -exec chown $${LOGNAME:-$$USERNAME} {} ';' ;\ for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \ chmod a+rx $${subdir} ; \ rm -rf $${subdir}/RCS ; \ rm -rf $${subdir}/CVS ; \ rm -f $${subdir}/.cvsignore ; \ + rm -f $${subdir}/.arch-inventory ; \ rm -f $${subdir}/\#* ; \ rm -f $${subdir}/.\#* ; \ rm -f $${subdir}/*~ ; \ @@ -381,76 +444,87 @@ install-arch-indep: mkdir info rm -f $${subdir}/dired.todo ; \ done) ; \ done - -rm -f ${lispdir}/subdirs.el - $(srcdir)/update-subdirs ${lispdir} - if [ -f ${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \ + -rm -f $(DESTDIR)${lispdir}/subdirs.el + $(srcdir)/update-subdirs $(DESTDIR)${lispdir} + if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \ then true; \ else \ (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ echo " (normal-top-level-add-subdirs-to-load-path))") \ - > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \ + > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \ fi - chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el - -if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \ + chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el + -if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \ then true; \ else \ (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ echo " (normal-top-level-add-subdirs-to-load-path))") \ - > ${datadir}/emacs/site-lisp/subdirs.el; \ + > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \ fi - -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el + -chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el -unset CDPATH; \ - if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \ + if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \ then \ - echo "Copying etc/DOC-* to ${docdir} ..." ; \ - (cd ./etc; tar -cf - DOC*) \ - |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \ - (cd $(docdir); chmod a+r DOC*; rm DOC); \ + echo "Copying etc/DOC-* to $(DESTDIR)${docdir} ..." ; \ + (cd ./etc; tar -chf - DOC*) \ + |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ + (cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \ + if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \ else true; fi -unset CDPATH; \ if [ -r ./lisp ] \ && [ -r ./lisp/simple.el ] \ - && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \ + && [ x`(cd ./lisp; /bin/pwd)` != x`(cd $(DESTDIR)${lispdir}; /bin/pwd)` ] \ && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \ then \ - echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \ - (cd lisp; tar -cf - *.el *.elc) \ - |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \ + echo "Copying lisp/*.el and lisp/*.elc to $(DESTDIR)${lispdir} ..." ; \ + (cd lisp; tar -chf - *.el *.elc) \ + |(cd $(DESTDIR)${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \ + (cd $(DESTDIR)${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; \ + else true; fi + -unset CDPATH; \ + if [ -n "${GZIP_PROG}" ]; \ + then \ + echo "Compressing *.el ..." ; \ + (cd $(DESTDIR)${lispdir}; for f in `find . -name "*.elc" -print`; do \ + ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ + done) \ else true; fi -unset CDPATH; \ thisdir=`/bin/pwd`; \ - if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ + if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ then \ - (cd ${infodir}; \ + (cd $(DESTDIR)${infodir}; \ if [ -f dir ]; then true; \ else \ (cd $${thisdir}; \ - ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \ - chmod a+r ${infodir}/dir); \ + ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \ + chmod a+r $(DESTDIR)${infodir}/dir); \ fi; \ cd ${srcdir}/info ; \ - for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \ - (cd $${thisdir}; \ - ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ - chmod a+r ${infodir}/$$f); \ + for elt in $(INFO_FILES); do \ + for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ + ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ + chmod a+r $(DESTDIR)${infodir}/$$f; \ + done; \ done); \ else true; fi -unset CDPATH; \ thisdir=`/bin/pwd`; \ - if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ + if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ then \ - for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \ + for elt in $(INFO_FILES); do \ (cd $${thisdir}; \ - ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \ + ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ done; \ else true; fi - -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir} + -chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${infodir} thisdir=`/bin/pwd`; \ cd ${srcdir}/etc; \ - for page in emacs etags ctags gfdl ; do \ + for page in emacs emacsclient etags ctags ; do \ (cd $${thisdir}; \ - ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ - chmod a+r ${man1dir}/$${page}${manext}); \ + ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \ + chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \ done ### Install LEIM files. Although they are machine-independent, we @@ -469,15 +543,15 @@ install-strip: ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs ### instead of mkdir. Not all systems' mkdir programs have the `-p' flag. mkdir: FRC - if [ -d ${datadir} ]; then true; else \ - $(srcdir)/mkinstalldirs ${datadir}; \ - chmod a+r ${datadir};\ + if [ -d $(DESTDIR)${datadir} ]; then true; else \ + $(srcdir)/mkinstalldirs $(DESTDIR)${datadir}; \ + chmod a+r $(DESTDIR)${datadir};\ fi - $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \ - ${bindir} ${docdir} ${libexecdir} \ - ${datadir}/emacs/site-lisp \ - ${datadir}/emacs/${version}/site-lisp \ - `echo ${locallisppath} | sed 's/:/ /g'` + $(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \ + $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \ + $(DESTDIR)${datadir}/emacs/site-lisp \ + $(DESTDIR)${datadir}/emacs/${version}/site-lisp \ + $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` ### Delete all the installed files that the `install' target would ### create (but not the noninstalled files such as `make all' would @@ -490,24 +564,30 @@ uninstall: prefix=${prefix} exec_prefix=${exec_prefix} \ bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}) -unset CDPATH; \ - for dir in ${lispdir} ${etcdir} ; do \ + for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \ if [ -d $${dir} ]; then \ case `(cd $${dir} ; /bin/pwd)` in \ `(cd ${srcdir} ; /bin/pwd)`* ) ;; \ * ) rm -rf $${dir} ;; \ esac ; \ case $${dir} in \ - ${datadir}/emacs/${version}/* ) \ - rm -rf ${datadir}/emacs/${version} \ + $(DESTDIR)${datadir}/emacs/${version}/* ) \ + rm -rf $(DESTDIR)${datadir}/emacs/${version} \ ;; \ esac ; \ fi ; \ done - (cd ${archlibdir} && rm -f fns-*) - -rm -rf ${libexecdir}/emacs/${version} - (cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*) - (cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1) - (cd ${bindir} && rm -f emacs-${version} $(EMACS)) + (cd $(DESTDIR)${archlibdir} && rm -f fns-*) + -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} + (cd $(DESTDIR)${infodir} && \ + for elt in $(INFO_FILES); do \ + $(INSTALL_INFO) --remove --info-dir=. $$elt; \ + for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ + rm -f $$f; \ + done; \ + done;) + (cd $(DESTDIR)${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext}) + (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS)) FRC: @@ -527,6 +607,8 @@ mostlyclean: FRC (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) -(cd man && $(MAKE) $(MFLAGS) mostlyclean) + -(cd lispref && $(MAKE) $(MFLAGS) mostlyclean) + -(cd lispintro && $(MAKE) $(MFLAGS) mostlyclean) (cd leim; $(MAKE) $(MFLAGS) mostlyclean) ### `clean' @@ -535,7 +617,7 @@ mostlyclean: FRC ### record the configuration. Also preserve files that could be made ### by building, but normally aren't because the distribution comes ### with them. -### +### ### Delete `.dvi' files here if they are not part of the distribution. clean: FRC (cd src; $(MAKE) $(MFLAGS) clean) @@ -543,6 +625,8 @@ clean: FRC (cd lwlib; $(MAKE) $(MFLAGS) clean) (cd lib-src; $(MAKE) $(MFLAGS) clean) -(cd man && $(MAKE) $(MFLAGS) clean) + -(cd lispref && $(MAKE) $(MFLAGS) clean) + -(cd lispintro && $(MAKE) $(MFLAGS) clean) (cd leim; $(MAKE) $(MFLAGS) clean) ### `distclean' @@ -561,6 +645,8 @@ distclean: FRC (cd lwlib; $(MAKE) $(MFLAGS) distclean) (cd lib-src; $(MAKE) $(MFLAGS) distclean) (cd man && $(MAKE) $(MFLAGS) distclean) + (cd lispref && $(MAKE) $(MFLAGS) distclean) + (cd lispintro && $(MAKE) $(MFLAGS) distclean) (cd leim; $(MAKE) $(MFLAGS) distclean) (cd lisp; $(MAKE) $(MFLAGS) distclean) ${top_distclean} @@ -570,7 +656,7 @@ distclean: FRC ### reconstructed with this Makefile. This typically includes ### everything deleted by distclean, plus more: C source files ### produced by Bison, tags tables, info files, and so on. -### +### ### One exception, however: `make maintainer-clean' should not delete ### `configure' even if `configure' can be remade using a rule in the ### Makefile. More generally, `make maintainer-clean' should not delete @@ -582,7 +668,10 @@ maintainer-clean: FRC (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) -(cd man && $(MAKE) $(MFLAGS) maintainer-clean) + -(cd lispref && $(MAKE) $(MFLAGS) maintainer-clean) + -(cd lispintro && $(MAKE) $(MFLAGS) maintainer-clean) (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) + (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) ${top_distclean} ### This doesn't actually appear in the coding standards, but Karl @@ -605,7 +694,7 @@ extraclean: ### Note: it's no disaster if these productions miss a file or two; tar ### and VC will swiftly let you know if this happens, and it is easily ### corrected. -SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in \ +SOURCES = ChangeLog FTP INSTALL Makefile.in \ README configure make-dist move-if-change .PHONY: unlock relock @@ -618,6 +707,8 @@ unlock: (cd lisp; $(MAKE) $(MFLAGS) unlock) (cd lisp/term; chmod u+w README *.el) (cd man; chmod u+w *texi* ChangeLog split-man) + (cd lispref; chmod u+w *texi* ChangeLog) + (cd lispintro; chmod u+w *texi* ChangeLog) (cd oldXMenu; chmod u+w *.[ch] Makefile README) (cd lwlib; chmod u+w *.[ch] Makefile README) (cd src; $(MAKE) $(MFLAGS) unlock) @@ -630,6 +721,8 @@ relock: (cd lisp; $(MAKE) $(MFLAGS) relock) (cd lisp/term; chmod u+w README *.el) (cd man; chmod u+w *texi* ChangeLog split-man) + (cd lispref; chmod u+w *texi* ChangeLog) + (cd lispintro; chmod u+w *texi* ChangeLog) (cd oldXMenu; chmod u+w *.[ch] Makefile README) (cd lwlib; chmod u+w *.[ch] Makefile README) (cd src; $(MAKE) $(MFLAGS) relock) @@ -651,9 +744,13 @@ force-info: # put the info files in $(srcdir), # so we can do ok running make in the build dir. info: force-info - (cd man; $(MAKE) $(MFLAGS) info) + -(cd man; $(MAKE) $(MFLAGS) info) + -(cd lispref; $(MAKE) $(MFLAGS) info) + -(cd lispintro; $(MAKE) $(MFLAGS) info) dvi: (cd man; $(MAKE) $(MFLAGS) dvi) + (cd lispref; $(MAKE) $(MFLAGS) elisp.dvi) + (cd lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi) #### Bootstrapping. @@ -662,18 +759,46 @@ dvi: ### special emacs executable is built from Lisp sources, which is then ### used to compile Lisp files. The last step is a "normal" make. -.PHONY: bootstrap bootstrap-lisp-1 boostrap-src bootstrap-lisp bootstrap-clean - -bootstrap: clean bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean all info +.PHONY: bootstrap +.PHONY: bootstrap-build +.PHONY: bootfast +.PHONY: maybe_bootstrap + +maybe_bootstrap: + @bar="`echo $(srcdir)/lisp/*.elc`"; \ + if [ \( "$$bar" = '$(srcdir)/lisp/*.elc' \) -o \( "$$bar" = '' \) ]; then \ + echo "Your tree does not include the compiled Lisp files."; \ + echo "You need to do \`make bootstrap' to build Emacs."; \ + echo "Emacs now requires Texinfo version 4.2."; \ + exit 1;\ + fi -bootstrap-lisp-1: - (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) +bootstrap: bootstrap-clean-before FRC + $(MAKE) $(MFLAGS) info bootstrap-build -bootstrap-lisp: - -(cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs) +bootfast: bootstrap-clean-before-fast FRC + $(MAKE) $(MFLAGS) info bootstrap-build -bootstrap-src: +bootstrap-build: FRC + (cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare) (cd src; $(MAKE) $(MFLAGS) bootstrap) - -bootstrap-clean: - (cd src; $(MAKE) $(MFLAGS) clean) + (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs${EXEEXT}) + (cd src; $(MAKE) $(MFLAGS) mostlyclean) + $(MAKE) $(MFLAGS) all + (cd lisp; $(MAKE) $(MFLAGS) bootstrap-after) + +### Used for `bootstrap' to avoid deleting existing dumped Emacs executables. +bootstrap-clean-before: bootstrap-clean-before-fast FRC + (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) + +### Used for `bootfast' to avoid deleting existing dumped Emacs executables +### and compiled .elc files. +bootstrap-clean-before-fast: FRC + (cd src; $(MAKE) $(MFLAGS) mostlyclean) + (cd oldXMenu; $(MAKE) $(MFLAGS) clean) + (cd lwlib; $(MAKE) $(MFLAGS) clean) + (cd lib-src; $(MAKE) $(MFLAGS) clean) + -(cd man && $(MAKE) $(MFLAGS) clean) + -(cd lispref && $(MAKE) $(MFLAGS) clean) + -(cd lispintro && $(MAKE) $(MFLAGS) clean) + (cd leim; $(MAKE) $(MFLAGS) clean)